upkeep & custom models

Author: Simplicitee

.classpath

@@ -8,6 +8,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>project</groupId>
   <artifactId>items</artifactId>
-  <version>1.5.0</version>
+  <version>1.6.0</version>
   <name>BendingItems</name>
 
   <repositories>
@@ -23,7 +23,7 @@
 	<dependency>
 	  <groupId>com.projectkorra</groupId>
 	  <artifactId>projectkorra</artifactId>
-	  <version>1.9.0</version>
+	  <version>1.11.2</version>
 	  <scope>provided</scope>
 	</dependency>
   </dependencies>

src/me/simplicitee/project/items/BendingItem.java

@@ -13,10 +13,8 @@
 
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.ability.CoreAbility;
-import com.projectkorra.projectkorra.attribute.AttributePriority;
 
 import me.simplicitee.project.items.gui.DisplayItem;
-import net.md_5.bungee.api.ChatColor;
 
 public class BendingItem implements Listener {
 
@@ -77,7 +75,7 @@ public List<String> listMods() {
 		mods.add("Stats:");
 		for (CoreAbility ability : this.mods.keySet()) {
 			for (BendingModifier mod : this.mods.get(ability)) {
-				mods.add("- " + (ability != null ? ability.getName() : "Base") + mod.attribute() + ChatColor.RESET + ": " + mod.value());
+				mods.add("- " + (ability != null ? ability.getName() : "Base") + mod.toString());
 			}
 		}
 
@@ -101,11 +99,7 @@ public void applyMods(CoreAbility abil, ItemStack stack) {
 		}
 
 		for (BendingModifier mod : specific) {
-			try {
-				abil.addAttributeModifier(mod.attribute(), mod.num(), mod.method(), AttributePriority.LOW);
-			} catch (Exception e) {
-				continue;
-			}
+			mod.apply(abil);
 		}
 
 		ItemManager.use(abil.getPlayer(), stack);

src/me/simplicitee/project/items/BendingModifier.java

@@ -1,33 +1,44 @@
 package me.simplicitee.project.items;
 
+import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.attribute.AttributeModifier;
+import com.projectkorra.projectkorra.attribute.AttributePriority;
 
 public final class BendingModifier {
 
-	private String attribute, value;
+	private String attribute;
 	private AttributeModifier mod;
-	private Number num;
+	private Number scalar;
 
-	public BendingModifier(String attribute, String value) {
+	public BendingModifier(String attribute, AttributeModifier mod, Number scalar) {
 		this.attribute = attribute;
-		this.value = value;
-		this.mod = value.charAt(0) == 'x' ? AttributeModifier.MULTIPLICATION : AttributeModifier.ADDITION;
-		this.num = Double.parseDouble(value.substring(1, value.length()));
+		this.mod = mod;
+		this.scalar = scalar;
 	}
 
 	public String attribute() {
 		return attribute;
 	}
 
-	public AttributeModifier method() {
-		return mod;
+	public void apply(CoreAbility ability) {
+	    try {
+	        ability.addAttributeModifier(attribute, scalar, mod, AttributePriority.LOW);
+        } catch (Exception e) {}
 	}
 
-	public Number num() {
-		return num;
+	@Override
+	public String toString() {
+	    return attribute + ": " + (mod == AttributeModifier.MULTIPLICATION ? "x" : "+") + scalar.toString();
 	}
 
-	public String value() {
-		return value;
+	public static BendingModifier of(String attribute, String value) {
+	    if (!value.startsWith("x") || !value.startsWith("+")) {
+	        throw new IllegalArgumentException("Mods must start with 'x' or '+'");
+	    }
+	    
+	    AttributeModifier mod = value.startsWith("x") ? AttributeModifier.MULTIPLICATION : AttributeModifier.ADDITION;
+	    Number scalar = Double.parseDouble(value.substring(1));
+	    
+	    return new BendingModifier(attribute, mod, scalar);
 	}
 }

src/me/simplicitee/project/items/ItemManager.java

@@ -55,6 +55,7 @@ private ItemManager() {}
 	private static final String FLAGS_PATH = "Flags";
 	private static final String USES_PATH = "Uses";
 	private static final String RECIPE_PATH = "Recipe";
+	private static final String MODEL_PATH = "Model";
 
 	public static void equip(Player player, BendingItem item) {
 		EQUIPPED.put(player, item);
@@ -265,6 +266,10 @@ public static BendingItem register(File file) throws IllegalArgumentException {
 			}
 		}
 
+		if (config.contains(MODEL_PATH)) {
+		    meta.setCustomModelData(config.getInt(MODEL_PATH));
+		}
+		
 		int id = name.hashCode();
 		meta.setLore(lore);
 		meta.getPersistentDataContainer().set(ID_KEY, PersistentDataType.INTEGER, id);
@@ -370,7 +375,19 @@ private static List<BendingModifier> loadMods(ConfigurationSection section) {
 		List<BendingModifier> mods = new ArrayList<>();
 
 		for (String key : section.getKeys(false)) {
-			mods.add(new BendingModifier(key, section.getString(key)));
+		    BendingModifier mod = null;
+		    
+		    try {
+		        mod = BendingModifier.of(key, section.getString(key));
+		    } catch (Exception e) {
+		        e.printStackTrace();
+		    }
+		    
+		    if (mod == null) {
+		        continue;
+		    }
+		    
+			mods.add(mod);
 		}
 
 		return mods;

src/me/simplicitee/project/items/ItemsPlugin.java

@@ -26,7 +26,7 @@ public void onEnable() {
 		// register listener
 		this.getServer().getPluginManager().registerEvents(this, this);
 
-		// register command
+		// register commands
 		new ItemCommand();
 		new AttributesCommand();
 	}

src/plugin.yml

@@ -1,7 +1,7 @@
 name: BendingItems
 author: Simplicitee
 api-version: 1.16
-version: 1.5.0
+version: 1.6.0
 main: me.simplicitee.project.items.ItemsPlugin
 depend: [ProjectKorra]
 permissions: