Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-31 04:46:40 +00:00
Code Issues Releases 1 Activity

Updated to eco 3.8.0 and removed NMS + Proxy component

Browse Source
This commit is contained in:
Auxilor
2021-02-16 20:00:45 +00:00
parent a77251a6b2
commit 97ff8f4913
16 changed files with 5 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/build.gradle
View File

@@ -2,11 +2,5 @@ group 'com.willfp'
version rootProject.version
dependencies {
compileOnly project(":eco-core:core-proxy")
compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
compileOnly 'commons-io:commons-io:2.8.0'
compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
compileOnly 'net.ess3:EssentialsX:2.18.1'
compileOnly 'com.destroystokyo.paper:paper-api:1.16.3-R0.1-SNAPSHOT'
compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.157'
}

5
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java
View File

@@ -1,12 +1,11 @@
package com.willfp.ecoarmor.display;
import com.willfp.eco.util.SkullUtils;
import com.willfp.ecoarmor.config.EcoArmorConfigs;
import com.willfp.ecoarmor.proxy.proxies.SkullProxy;
import com.willfp.ecoarmor.sets.ArmorSet;
import com.willfp.ecoarmor.sets.meta.ArmorSlot;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import com.willfp.ecoarmor.upgrades.crystal.UpgradeCrystal;
import com.willfp.ecoarmor.util.ProxyUtils;
import lombok.experimental.UtilityClass;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@@ -122,7 +121,7 @@ public class ArmorDisplay {
if (meta instanceof SkullMeta && slotMeta instanceof SkullMeta) {
String base64 = EcoArmorConfigs.SETS.getString(set.getName() + "." + slot.name().toLowerCase() + ".skull-texture");
ProxyUtils.getProxy(SkullProxy.class).setTexture((SkullMeta) meta, base64);
SkullUtils.setSkullTexture((SkullMeta) meta, base64);
}
if (meta instanceof LeatherArmorMeta && slotMeta instanceof LeatherArmorMeta) {

5
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
View File

@@ -1,5 +1,6 @@
package com.willfp.ecoarmor.sets;
import com.willfp.eco.util.SkullUtils;
import com.willfp.eco.util.StringUtils;
import com.willfp.eco.util.recipe.EcoShapedRecipe;
import com.willfp.eco.util.recipe.lookup.RecipePartUtils;
@@ -9,10 +10,8 @@ import com.willfp.ecoarmor.config.EcoArmorConfigs;
import com.willfp.ecoarmor.display.ArmorDisplay;
import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.effects.Effects;
import com.willfp.ecoarmor.proxy.proxies.SkullProxy;
import com.willfp.ecoarmor.sets.meta.ArmorSlot;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import com.willfp.ecoarmor.util.ProxyUtils;
import lombok.Getter;
import org.bukkit.Color;
import org.bukkit.Material;
@@ -231,7 +230,7 @@ public class ArmorSet {
if (meta instanceof SkullMeta) {
String base64 = EcoArmorConfigs.SETS.getString(name + "." + pieceName + ".skull-texture");
ProxyUtils.getProxy(SkullProxy.class).setTexture((SkullMeta) meta, base64);
SkullUtils.setSkullTexture((SkullMeta) meta, base64);
}
if (meta instanceof LeatherArmorMeta) {

21
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/util/ProxyUtils.java
View File

@@ -1,21 +0,0 @@
package com.willfp.ecoarmor.util;
import com.willfp.eco.util.proxy.AbstractProxy;
import com.willfp.ecoarmor.EcoArmorPlugin;
import com.willfp.ecoarmor.proxy.util.ProxyFactory;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.NotNull;
@UtilityClass
public class ProxyUtils {
/**
* Get the implementation of a specified proxy.
*
* @param proxyClass The proxy interface.
* @param <T> The type of the proxy.
* @return The proxy implementation.
*/
public @NotNull <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
return new ProxyFactory<>(EcoArmorPlugin.getInstance(), proxyClass).getProxy();
}
}