diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargableItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargableItem.java index c34fcdc87..84cbafa3b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargableItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargableItem.java @@ -9,13 +9,13 @@ public class ChargableItem extends SlimefunItem { String chargeType; - public ChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType) { - super(category, item, name, recipeType, recipe); + public ChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) { + super(category, item, id, recipeType, recipe); this.chargeType = chargeType; } - public ChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, keys, values); + public ChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, keys, values); this.chargeType = chargeType; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargedItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargedItem.java index 5ce4192cf..255851dd3 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargedItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargedItem.java @@ -9,13 +9,13 @@ public class ChargedItem extends SlimefunItem { String chargeType; - public ChargedItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType) { - super(category, item, name, recipeType, recipe); + public ChargedItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) { + super(category, item, id, recipeType, recipe); this.chargeType = chargeType; } - public ChargedItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, keys, values); + public ChargedItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, keys, values); this.chargeType = chargeType; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java index a500c52c2..6fe190f1e 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java @@ -9,13 +9,13 @@ public class DamagableChargableItem extends SlimefunItem { String chargeType; - public DamagableChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType) { - super(category, item, name, recipeType, recipe); + public DamagableChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) { + super(category, item, id, recipeType, recipe); this.chargeType = chargeType; } - public DamagableChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, keys, values); + public DamagableChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, keys, values); this.chargeType = chargeType; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java index 734033d37..90a98e920 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java @@ -14,8 +14,8 @@ public class EnhancedFurnace extends SlimefunItem { int speed, efficiency, fortune; - public EnhancedFurnace(int speed, int efficiency, int fortune, ItemStack item, String name, ItemStack[] recipe) { - super(Categories.MACHINES_1, item, name, RecipeType.ENHANCED_CRAFTING_TABLE, recipe); + public EnhancedFurnace(int speed, int efficiency, int fortune, ItemStack item, String id, ItemStack[] recipe) { + super(Categories.MACHINES_1, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe); this.speed = speed - 1; this.efficiency = efficiency - 1; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedBlock.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedBlock.java index e960ac556..8a75fee13 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedBlock.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedBlock.java @@ -8,8 +8,8 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable; public class ExcludedBlock extends SlimefunItem implements NotPlaceable { - public ExcludedBlock(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public ExcludedBlock(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedGadget.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedGadget.java index 3c9b74243..6bd151202 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedGadget.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedGadget.java @@ -8,11 +8,11 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable; public class ExcludedGadget extends SlimefunGadget implements NotPlaceable { - public ExcludedGadget(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { - super(category, item, name, recipeType, recipe, machineRecipes); + public ExcludedGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { + super(category, item, id, recipeType, recipe, machineRecipes); } - public ExcludedGadget(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, machineRecipes, keys, values); + public ExcludedGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, machineRecipes, keys, values); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedSoulboundTool.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedSoulboundTool.java index 03b330c2d..8be575860 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedSoulboundTool.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedSoulboundTool.java @@ -8,12 +8,12 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable; public class ExcludedSoulboundTool extends SoulboundItem implements NotPlaceable { - public ExcludedSoulboundTool(Category category, ItemStack item, String name, RecipeType type, ItemStack[] recipe) { - super(category, item, name, type, recipe); + public ExcludedSoulboundTool(Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) { + super(category, item, id, type, recipe); } - public ExcludedSoulboundTool(Category category, ItemStack item, String name, ItemStack[] recipe) { - super(category, item, name, recipe); + public ExcludedSoulboundTool(Category category, ItemStack item, String id, ItemStack[] recipe) { + super(category, item, id, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedTool.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedTool.java index b8963f326..6f2e49c7d 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedTool.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedTool.java @@ -8,8 +8,8 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable; public class ExcludedTool extends SlimefunItem implements NotPlaceable { - public ExcludedTool(Category category, ItemStack item, String name,RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public ExcludedTool(Category category, ItemStack item, String id,RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java index be57ebca3..b910c7c79 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java @@ -7,8 +7,8 @@ import me.mrCookieSlime.Slimefun.Objects.Category; public class HandledBlock extends SlimefunItem { - public HandledBlock(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public HandledBlock(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java index a40ed237d..84a47d1d9 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java @@ -9,8 +9,8 @@ public class JetBoots extends DamagableChargableItem { double speed; - public JetBoots(ItemStack item, String name, ItemStack[] recipe, double speed) { - super(Categories.TECH, item, name, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jet Boots"); + public JetBoots(ItemStack item, String id, ItemStack[] recipe, double speed) { + super(Categories.TECH, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jet Boots"); this.speed = speed; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java index bd9b46ca5..b7093a53e 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java @@ -9,8 +9,8 @@ public class Jetpack extends DamagableChargableItem { double thrust; - public Jetpack(ItemStack item, String name, ItemStack[] recipe, double thrust) { - super(Categories.TECH, item, name, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jetpack"); + public Jetpack(ItemStack item, String id, ItemStack[] recipe, double thrust) { + super(Categories.TECH, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jetpack"); this.thrust = thrust; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Juice.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Juice.java index aca9f6676..c7492b517 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Juice.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Juice.java @@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack; public class Juice extends SlimefunItem { - public Juice(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public Juice(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java index d4e7ad9f7..133847d58 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java @@ -13,16 +13,16 @@ public class MultiTool extends DamagableChargableItem { List modes; - public MultiTool(ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { - super(Categories.TECH, item, name, recipeType, recipe, "Multi Tool", keys, values); + public MultiTool(ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { + super(Categories.TECH, item, id, recipeType, recipe, "Multi Tool", keys, values); } @Override public void create() { List list = new ArrayList(); for (int i = 0; i < 50; i++) { - if (Slimefun.getItemValue(this.getName(), "mode." + i + ".enabled") != null) { - if ((Boolean) Slimefun.getItemValue(this.getName(), "mode." + i + ".enabled")) list.add(i); + if (Slimefun.getItemValue(this.getID(), "mode." + i + ".enabled") != null) { + if ((Boolean) Slimefun.getItemValue(this.getID(), "mode." + i + ".enabled")) list.add(i); } } this.modes = list; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingAlloy.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingAlloy.java index 9a3ec4837..73c5f86b8 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingAlloy.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingAlloy.java @@ -8,12 +8,12 @@ import org.bukkit.inventory.ItemStack; public class ReplacingAlloy extends ReplacingItem { - public ReplacingAlloy(ItemStack item, String name, ItemStack[] recipe) { - super(Categories.RESOURCES, item, name, RecipeType.SMELTERY, recipe); + public ReplacingAlloy(ItemStack item, String id, ItemStack[] recipe) { + super(Categories.RESOURCES, item, id, RecipeType.SMELTERY, recipe); } - public ReplacingAlloy(Category category, ItemStack item, String name, ItemStack[] recipe) { - super(category, item, name, RecipeType.SMELTERY, recipe); + public ReplacingAlloy(Category category, ItemStack item, String id, ItemStack[] recipe) { + super(category, item, id, RecipeType.SMELTERY, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingItem.java index e7066d133..62d62ea22 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingItem.java @@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack; public class ReplacingItem extends SlimefunItem { - public ReplacingItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public ReplacingItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); this.setReplacing(true); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java index 5891085fd..5ed225ad5 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java @@ -10,13 +10,13 @@ public class SlimefunArmorPiece extends SlimefunItem { PotionEffect[] effects; - public SlimefunArmorPiece(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects) { - super(category, item, name, recipeType, recipe); + public SlimefunArmorPiece(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects) { + super(category, item, id, recipeType, recipe); this.effects = effects; } - public SlimefunArmorPiece(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, keys, values); + public SlimefunArmorPiece(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, keys, values); this.effects = effects; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBackpack.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBackpack.java index 7d074ddff..787845be8 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBackpack.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBackpack.java @@ -9,8 +9,8 @@ public class SlimefunBackpack extends SlimefunItem { public int size; - public SlimefunBackpack(int size, Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public SlimefunBackpack(int size, Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); this.size = size; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBow.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBow.java index 3ded107f4..a22471075 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBow.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBow.java @@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack; public class SlimefunBow extends SlimefunItem { - public SlimefunBow(ItemStack item, String name, ItemStack[] recipe) { - super(Categories.WEAPONS, item, name, RecipeType.MAGIC_WORKBENCH, recipe); + public SlimefunBow(ItemStack item, String id, ItemStack[] recipe) { + super(Categories.WEAPONS, item, id, RecipeType.MAGIC_WORKBENCH, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java index 1199b099c..678ead229 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java @@ -13,8 +13,8 @@ public class SlimefunGadget extends SlimefunItem { List recipes; List display_recipes; - public SlimefunGadget(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { - super(category, item, name, recipeType, recipe); + public SlimefunGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { + super(category, item, id, recipeType, recipe); this.recipes = new ArrayList(); this.display_recipes = new ArrayList(); for (ItemStack i: machineRecipes) { @@ -23,8 +23,8 @@ public class SlimefunGadget extends SlimefunItem { } } - public SlimefunGadget(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, keys, values); + public SlimefunGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, keys, values); this.recipes = new ArrayList(); this.display_recipes = new ArrayList(); for (ItemStack i: machineRecipes) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunMachine.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunMachine.java index ee786903c..327bc8070 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunMachine.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunMachine.java @@ -17,8 +17,8 @@ public class SlimefunMachine extends SlimefunItem { List shownRecipes; Material trigger; - public SlimefunMachine(Category category, ItemStack item, String name, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) { - super(category, item, name, RecipeType.MULTIBLOCK, recipe); + public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) { + super(category, item, id, RecipeType.MULTIBLOCK, recipe); this.recipes = new ArrayList(); this.shownRecipes = new ArrayList(); for (ItemStack i: machineRecipes) { @@ -27,8 +27,8 @@ public class SlimefunMachine extends SlimefunItem { this.trigger = trigger; } - public SlimefunMachine(Category category, ItemStack item, String name, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, boolean ghost) { - super(category, item, name, RecipeType.MULTIBLOCK, recipe, ghost); + public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, boolean ghost) { + super(category, item, id, RecipeType.MULTIBLOCK, recipe, ghost); this.recipes = new ArrayList(); this.shownRecipes = new ArrayList(); for (ItemStack i: machineRecipes) { @@ -37,8 +37,8 @@ public class SlimefunMachine extends SlimefunItem { this.trigger = trigger; } - public SlimefunMachine(Category category, ItemStack item, String name, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, String[] keys, Object[] values) { - super(category, item, name, RecipeType.MULTIBLOCK, recipe, keys, values); + public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, String[] keys, Object[] values) { + super(category, item, id, RecipeType.MULTIBLOCK, recipe, keys, values); this.recipes = new ArrayList(); this.shownRecipes = new ArrayList(); for (ItemStack i: machineRecipes) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SolarHelmet.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SolarHelmet.java index e41ff37e9..9751e723f 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SolarHelmet.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SolarHelmet.java @@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack; public class SolarHelmet extends SlimefunItem { - public SolarHelmet(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { - super(category, item, name, recipeType, recipe, keys, values); + public SolarHelmet(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { + super(category, item, id, recipeType, recipe, keys, values); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java index 2f01346bb..5aef09353 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java @@ -7,11 +7,11 @@ import org.bukkit.inventory.ItemStack; public class SoulboundBackpack extends SlimefunBackpack { - public SoulboundBackpack(int size, Category category, ItemStack item, String name, ItemStack[] recipe) { - super(size, category, item, name, RecipeType.MAGIC_WORKBENCH, recipe); + public SoulboundBackpack(int size, Category category, ItemStack item, String id, ItemStack[] recipe) { + super(size, category, item, id, RecipeType.MAGIC_WORKBENCH, recipe); } - public SoulboundBackpack(int size, Category category, ItemStack item, String name, RecipeType type, ItemStack[] recipe) { - super(size, category, item, name, type, recipe); + public SoulboundBackpack(int size, Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) { + super(size, category, item, id, type, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundItem.java index c61a1bdc6..b850bed87 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundItem.java @@ -7,11 +7,11 @@ import org.bukkit.inventory.ItemStack; public class SoulboundItem extends SlimefunItem { - public SoulboundItem(Category category, ItemStack item, String name, ItemStack[] recipe) { - super(category, item, name, RecipeType.MAGIC_WORKBENCH, recipe); + public SoulboundItem(Category category, ItemStack item, String id, ItemStack[] recipe) { + super(category, item, id, RecipeType.MAGIC_WORKBENCH, recipe); } - public SoulboundItem(Category category, ItemStack item, String name, RecipeType type, ItemStack[] recipe) { - super(category, item, name, type, recipe); + public SoulboundItem(Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) { + super(category, item, id, type, recipe); } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java index e7e313886..14d7b9e3c 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java @@ -31,8 +31,8 @@ public class Talisman extends SlimefunItem { String suffix; int chance; - public Talisman(ItemStack item, String name, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, PotionEffect... effects) { - super(Categories.TALISMANS_1, item, name, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1)); + public Talisman(ItemStack item, String id, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, PotionEffect... effects) { + super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1)); this.consumed = consumable; this.cancel = cancelEvent; this.suffix = messageSuffix; @@ -40,8 +40,8 @@ public class Talisman extends SlimefunItem { this.chance = 100; } - public Talisman(ItemStack item, String name, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, int chance, PotionEffect... effects) { - super(Categories.TALISMANS_1, item, name, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1)); + public Talisman(ItemStack item, String id, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, int chance, PotionEffect... effects) { + super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1)); this.consumed = consumable; this.cancel = cancelEvent; this.suffix = messageSuffix; @@ -49,8 +49,8 @@ public class Talisman extends SlimefunItem { this.chance = chance; } - public Talisman(ItemStack item, String name, ItemStack[] recipe, String messageSuffix, int chance, PotionEffect... effects) { - super(Categories.TALISMANS_1, item, name, RecipeType.MAGIC_WORKBENCH, recipe, item); + public Talisman(ItemStack item, String id, ItemStack[] recipe, String messageSuffix, int chance, PotionEffect... effects) { + super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, item); this.consumed = true; this.cancel = true; this.suffix = messageSuffix; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java index fc5cc8f17..bfe460322 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java @@ -46,10 +46,10 @@ public abstract class AContainer extends SlimefunItem { private static final int[] border_in = {9, 10, 11, 12, 18, 21, 27, 28, 29, 30}; private static final int[] border_out = {14, 15, 16, 17, 23, 26, 32, 33, 34, 35}; - public AContainer(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public AContainer(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -72,7 +72,7 @@ public abstract class AContainer extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { @@ -99,10 +99,10 @@ public abstract class AContainer extends SlimefunItem { this.registerDefaultRecipes(); } - public AContainer(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { - super(category, item, name, recipeType, recipe, recipeOutput); + public AContainer(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { + super(category, item, id, recipeType, recipe, recipeOutput); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -125,7 +125,7 @@ public abstract class AContainer extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java index 2f2fdbd90..2d7cf7cde 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java @@ -35,10 +35,10 @@ public abstract class ADrill extends AContainer { public abstract int getProcessingTime(); public abstract int getSpeed(); - public ADrill(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public ADrill(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java index 087a8bd61..c49da80ef 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java @@ -33,10 +33,10 @@ public abstract class AFarm extends SlimefunItem { private static final int[] border = {0, 1, 2, 3, 4, 5, 6, 7, 8, 36, 37, 38, 39, 40, 41, 42, 43, 44}; private static final int[] border_out = {9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35}; - public AFarm(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public AFarm(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -59,7 +59,7 @@ public abstract class AFarm extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { @@ -76,10 +76,10 @@ public abstract class AFarm extends SlimefunItem { }); } - public AFarm(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { - super(category, item, name, recipeType, recipe, recipeOutput); + public AFarm(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { + super(category, item, id, recipeType, recipe, recipeOutput); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -102,7 +102,7 @@ public abstract class AFarm extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java index 150f0548f..3d0341982 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java @@ -50,10 +50,10 @@ public abstract class AGenerator extends SlimefunItem { private static final int[] border_in = {9, 10, 11, 12, 18, 21, 27, 28, 29, 30}; private static final int[] border_out = {14, 15, 16, 17, 23, 26, 32, 33, 34, 35}; - public AGenerator(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public AGenerator(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -76,7 +76,7 @@ public abstract class AGenerator extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { @@ -103,10 +103,10 @@ public abstract class AGenerator extends SlimefunItem { this.registerDefaultRecipes(); } - public AGenerator(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { - super(category, item, name, recipeType, recipe, recipeOutput); + public AGenerator(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { + super(category, item, id, recipeType, recipe, recipeOutput); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -129,7 +129,7 @@ public abstract class AGenerator extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java index dd3d2a638..fb4271f82 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java @@ -67,10 +67,10 @@ public abstract class AReactor extends SlimefunItem { private static final int[] border_3 = {30, 31, 32, 39, 41, 48, 49, 50}; private static final int[] border_4 = {25, 34, 43}; //No coolant border - public AReactor(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public AReactor(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); - new BlockMenuPreset(name, getInventoryTitle()) { + new BlockMenuPreset(id, getInventoryTitle()) { @Override public void init() { @@ -122,7 +122,7 @@ public abstract class AReactor extends SlimefunItem { } }; - registerBlockHandler(name, new SlimefunBlockHandler() { + registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/Teleporter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/Teleporter.java index 27fc42183..5fcc59332 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/Teleporter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/Teleporter.java @@ -13,10 +13,10 @@ import org.bukkit.inventory.ItemStack; public abstract class Teleporter extends SlimefunItem { - public Teleporter(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, name, recipeType, recipe); + public Teleporter(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { + super(category, item, id, recipeType, recipe); - SlimefunItem.registerBlockHandler(name, new SlimefunBlockHandler() { + SlimefunItem.registerBlockHandler(id, new SlimefunBlockHandler() { @Override public void onPlace(Player p, Block b, SlimefunItem item) {