mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Made use of the "id" instead of "name" of a SlimefunItem

Browse Source
This commit is contained in:
Florian CUNY 2017-10-13 20:59:52 +02:00
parent 657fd4d112
commit 81c7bb169d
30 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargableItem.java
View File

@ -9,13 +9,13 @@ public class ChargableItem extends SlimefunItem {
String chargeType; String chargeType;
public ChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType) { public ChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.chargeType = chargeType; this.chargeType = chargeType;
} }
public ChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { public ChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, keys, values); super(category, item, id, recipeType, recipe, keys, values);
this.chargeType = chargeType; this.chargeType = chargeType;
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ChargedItem.java
View File

@ -9,13 +9,13 @@ public class ChargedItem extends SlimefunItem {
String chargeType; String chargeType;
public ChargedItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType) { public ChargedItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.chargeType = chargeType; this.chargeType = chargeType;
} }
public ChargedItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { public ChargedItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, keys, values); super(category, item, id, recipeType, recipe, keys, values);
this.chargeType = chargeType; this.chargeType = chargeType;
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java
View File

@ -9,13 +9,13 @@ public class DamagableChargableItem extends SlimefunItem {
String chargeType; String chargeType;
public DamagableChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType) { public DamagableChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.chargeType = chargeType; this.chargeType = chargeType;
} }
public DamagableChargableItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) { public DamagableChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, keys, values); super(category, item, id, recipeType, recipe, keys, values);
this.chargeType = chargeType; this.chargeType = chargeType;
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java
View File

@ -14,8 +14,8 @@ public class EnhancedFurnace extends SlimefunItem {
int speed, efficiency, fortune; int speed, efficiency, fortune;
public EnhancedFurnace(int speed, int efficiency, int fortune, ItemStack item, String name, ItemStack[] recipe) { public EnhancedFurnace(int speed, int efficiency, int fortune, ItemStack item, String id, ItemStack[] recipe) {
super(Categories.MACHINES_1, item, name, RecipeType.ENHANCED_CRAFTING_TABLE, recipe); super(Categories.MACHINES_1, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
this.speed = speed - 1; this.speed = speed - 1;
this.efficiency = efficiency - 1; this.efficiency = efficiency - 1;

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedBlock.java
View File

@ -8,8 +8,8 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable;
public class ExcludedBlock extends SlimefunItem implements NotPlaceable { public class ExcludedBlock extends SlimefunItem implements NotPlaceable {
public ExcludedBlock(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public ExcludedBlock(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedGadget.java
View File

@ -8,11 +8,11 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable;
public class ExcludedGadget extends SlimefunGadget implements NotPlaceable { public class ExcludedGadget extends SlimefunGadget implements NotPlaceable {
public ExcludedGadget(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { public ExcludedGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) {
super(category, item, name, recipeType, recipe, 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) { public ExcludedGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, machineRecipes, keys, values); super(category, item, id, recipeType, recipe, machineRecipes, keys, values);
} }
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedSoulboundTool.java
View File

@ -8,12 +8,12 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable;
public class ExcludedSoulboundTool extends SoulboundItem implements NotPlaceable { public class ExcludedSoulboundTool extends SoulboundItem implements NotPlaceable {
public ExcludedSoulboundTool(Category category, ItemStack item, String name, RecipeType type, ItemStack[] recipe) { public ExcludedSoulboundTool(Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) {
super(category, item, name, type, recipe); super(category, item, id, type, recipe);
} }
public ExcludedSoulboundTool(Category category, ItemStack item, String name, ItemStack[] recipe) { public ExcludedSoulboundTool(Category category, ItemStack item, String id, ItemStack[] recipe) {
super(category, item, name, recipe); super(category, item, id, recipe);
} }
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ExcludedTool.java
View File

@ -8,8 +8,8 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable;
public class ExcludedTool extends SlimefunItem implements NotPlaceable { public class ExcludedTool extends SlimefunItem implements NotPlaceable {
public ExcludedTool(Category category, ItemStack item, String name,RecipeType recipeType, ItemStack[] recipe) { public ExcludedTool(Category category, ItemStack item, String id,RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
} }
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java
View File

@ -7,8 +7,8 @@ import me.mrCookieSlime.Slimefun.Objects.Category;
public class HandledBlock extends SlimefunItem { public class HandledBlock extends SlimefunItem {
public HandledBlock(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public HandledBlock(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
} }
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java
View File

@ -9,8 +9,8 @@ public class JetBoots extends DamagableChargableItem {
double speed; double speed;
public JetBoots(ItemStack item, String name, ItemStack[] recipe, double speed) { public JetBoots(ItemStack item, String id, ItemStack[] recipe, double speed) {
super(Categories.TECH, item, name, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jet Boots"); super(Categories.TECH, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jet Boots");
this.speed = speed; this.speed = speed;
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java
View File

@ -9,8 +9,8 @@ public class Jetpack extends DamagableChargableItem {
double thrust; double thrust;
public Jetpack(ItemStack item, String name, ItemStack[] recipe, double thrust) { public Jetpack(ItemStack item, String id, ItemStack[] recipe, double thrust) {
super(Categories.TECH, item, name, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jetpack"); super(Categories.TECH, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jetpack");
this.thrust = thrust; this.thrust = thrust;
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Juice.java
View File

@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack;
public class Juice extends SlimefunItem { public class Juice extends SlimefunItem {
public Juice(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public Juice(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
} }
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java
View File

@ -13,16 +13,16 @@ public class MultiTool extends DamagableChargableItem {
List<Integer> modes; List<Integer> modes;
public MultiTool(ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public MultiTool(ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) {
super(Categories.TECH, item, name, recipeType, recipe, "Multi Tool", keys, values); super(Categories.TECH, item, id, recipeType, recipe, "Multi Tool", keys, values);
} }
@Override @Override
public void create() { public void create() {
List<Integer> list = new ArrayList<Integer>(); List<Integer> list = new ArrayList<Integer>();
for (int i = 0; i < 50; i++) { for (int i = 0; i < 50; i++) {
if (Slimefun.getItemValue(this.getName(), "mode." + i + ".enabled") != null) { if (Slimefun.getItemValue(this.getID(), "mode." + i + ".enabled") != null) {
if ((Boolean) Slimefun.getItemValue(this.getName(), "mode." + i + ".enabled")) list.add(i); if ((Boolean) Slimefun.getItemValue(this.getID(), "mode." + i + ".enabled")) list.add(i);
} }
} }
this.modes = list; this.modes = list;

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingAlloy.java
View File

@ -8,12 +8,12 @@ import org.bukkit.inventory.ItemStack;
public class ReplacingAlloy extends ReplacingItem { public class ReplacingAlloy extends ReplacingItem {
public ReplacingAlloy(ItemStack item, String name, ItemStack[] recipe) { public ReplacingAlloy(ItemStack item, String id, ItemStack[] recipe) {
super(Categories.RESOURCES, item, name, RecipeType.SMELTERY, recipe); super(Categories.RESOURCES, item, id, RecipeType.SMELTERY, recipe);
} }
public ReplacingAlloy(Category category, ItemStack item, String name, ItemStack[] recipe) { public ReplacingAlloy(Category category, ItemStack item, String id, ItemStack[] recipe) {
super(category, item, name, RecipeType.SMELTERY, recipe); super(category, item, id, RecipeType.SMELTERY, recipe);
} }
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/ReplacingItem.java
View File

@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack;
public class ReplacingItem extends SlimefunItem { public class ReplacingItem extends SlimefunItem {
public ReplacingItem(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public ReplacingItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.setReplacing(true); this.setReplacing(true);
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java
View File

@ -10,13 +10,13 @@ public class SlimefunArmorPiece extends SlimefunItem {
PotionEffect[] effects; PotionEffect[] effects;
public SlimefunArmorPiece(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects) { public SlimefunArmorPiece(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.effects = effects; this.effects = effects;
} }
public SlimefunArmorPiece(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects, String[] keys, Object[] values) { public SlimefunArmorPiece(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, keys, values); super(category, item, id, recipeType, recipe, keys, values);
this.effects = effects; this.effects = effects;
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBackpack.java
View File

@ -9,8 +9,8 @@ public class SlimefunBackpack extends SlimefunItem {
public int size; public int size;
public SlimefunBackpack(int size, Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public SlimefunBackpack(int size, Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.size = size; this.size = size;
} }

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunBow.java
View File

@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack;
public class SlimefunBow extends SlimefunItem { public class SlimefunBow extends SlimefunItem {
public SlimefunBow(ItemStack item, String name, ItemStack[] recipe) { public SlimefunBow(ItemStack item, String id, ItemStack[] recipe) {
super(Categories.WEAPONS, item, name, RecipeType.MAGIC_WORKBENCH, recipe); super(Categories.WEAPONS, item, id, RecipeType.MAGIC_WORKBENCH, recipe);
} }
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java
View File

@ -13,8 +13,8 @@ public class SlimefunGadget extends SlimefunItem {
List<ItemStack[]> recipes; List<ItemStack[]> recipes;
List<ItemStack> display_recipes; List<ItemStack> display_recipes;
public SlimefunGadget(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { public SlimefunGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
this.recipes = new ArrayList<ItemStack[]>(); this.recipes = new ArrayList<ItemStack[]>();
this.display_recipes = new ArrayList<ItemStack>(); this.display_recipes = new ArrayList<ItemStack>();
for (ItemStack i: machineRecipes) { 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) { public SlimefunGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, keys, values); super(category, item, id, recipeType, recipe, keys, values);
this.recipes = new ArrayList<ItemStack[]>(); this.recipes = new ArrayList<ItemStack[]>();
this.display_recipes = new ArrayList<ItemStack>(); this.display_recipes = new ArrayList<ItemStack>();
for (ItemStack i: machineRecipes) { for (ItemStack i: machineRecipes) {

12
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunMachine.java
View File

@ -17,8 +17,8 @@ public class SlimefunMachine extends SlimefunItem {
List<ItemStack> shownRecipes; List<ItemStack> shownRecipes;
Material trigger; Material trigger;
public SlimefunMachine(Category category, ItemStack item, String name, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) { public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) {
super(category, item, name, RecipeType.MULTIBLOCK, recipe); super(category, item, id, RecipeType.MULTIBLOCK, recipe);
this.recipes = new ArrayList<ItemStack[]>(); this.recipes = new ArrayList<ItemStack[]>();
this.shownRecipes = new ArrayList<ItemStack>(); this.shownRecipes = new ArrayList<ItemStack>();
for (ItemStack i: machineRecipes) { for (ItemStack i: machineRecipes) {
@ -27,8 +27,8 @@ public class SlimefunMachine extends SlimefunItem {
this.trigger = trigger; this.trigger = trigger;
} }
public SlimefunMachine(Category category, ItemStack item, String name, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, boolean ghost) { public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, boolean ghost) {
super(category, item, name, RecipeType.MULTIBLOCK, recipe, ghost); super(category, item, id, RecipeType.MULTIBLOCK, recipe, ghost);
this.recipes = new ArrayList<ItemStack[]>(); this.recipes = new ArrayList<ItemStack[]>();
this.shownRecipes = new ArrayList<ItemStack>(); this.shownRecipes = new ArrayList<ItemStack>();
for (ItemStack i: machineRecipes) { for (ItemStack i: machineRecipes) {
@ -37,8 +37,8 @@ public class SlimefunMachine extends SlimefunItem {
this.trigger = trigger; this.trigger = trigger;
} }
public SlimefunMachine(Category category, ItemStack item, String name, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, String[] keys, Object[] values) { public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, String[] keys, Object[] values) {
super(category, item, name, RecipeType.MULTIBLOCK, recipe, keys, values); super(category, item, id, RecipeType.MULTIBLOCK, recipe, keys, values);
this.recipes = new ArrayList<ItemStack[]>(); this.recipes = new ArrayList<ItemStack[]>();
this.shownRecipes = new ArrayList<ItemStack>(); this.shownRecipes = new ArrayList<ItemStack>();
for (ItemStack i: machineRecipes) { for (ItemStack i: machineRecipes) {

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SolarHelmet.java
View File

@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack;
public class SolarHelmet extends SlimefunItem { public class SolarHelmet extends SlimefunItem {
public SolarHelmet(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public SolarHelmet(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) {
super(category, item, name, recipeType, recipe, keys, values); super(category, item, id, recipeType, recipe, keys, values);
} }
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java
View File

@ -7,11 +7,11 @@ import org.bukkit.inventory.ItemStack;
public class SoulboundBackpack extends SlimefunBackpack { public class SoulboundBackpack extends SlimefunBackpack {
public SoulboundBackpack(int size, Category category, ItemStack item, String name, ItemStack[] recipe) { public SoulboundBackpack(int size, Category category, ItemStack item, String id, ItemStack[] recipe) {
super(size, category, item, name, RecipeType.MAGIC_WORKBENCH, recipe); super(size, category, item, id, RecipeType.MAGIC_WORKBENCH, recipe);
} }
public SoulboundBackpack(int size, Category category, ItemStack item, String name, RecipeType type, ItemStack[] recipe) { public SoulboundBackpack(int size, Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) {
super(size, category, item, name, type, recipe); super(size, category, item, id, type, recipe);
} }
} }

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundItem.java
View File

@ -7,11 +7,11 @@ import org.bukkit.inventory.ItemStack;
public class SoulboundItem extends SlimefunItem { public class SoulboundItem extends SlimefunItem {
public SoulboundItem(Category category, ItemStack item, String name, ItemStack[] recipe) { public SoulboundItem(Category category, ItemStack item, String id, ItemStack[] recipe) {
super(category, item, name, RecipeType.MAGIC_WORKBENCH, recipe); super(category, item, id, RecipeType.MAGIC_WORKBENCH, recipe);
} }
public SoulboundItem(Category category, ItemStack item, String name, RecipeType type, ItemStack[] recipe) { public SoulboundItem(Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) {
super(category, item, name, type, recipe); super(category, item, id, type, recipe);
} }
} }

12
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java
View File

@ -31,8 +31,8 @@ public class Talisman extends SlimefunItem {
String suffix; String suffix;
int chance; int chance;
public Talisman(ItemStack item, String name, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, PotionEffect... effects) { public Talisman(ItemStack item, String id, 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)); super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1));
this.consumed = consumable; this.consumed = consumable;
this.cancel = cancelEvent; this.cancel = cancelEvent;
this.suffix = messageSuffix; this.suffix = messageSuffix;
@ -40,8 +40,8 @@ public class Talisman extends SlimefunItem {
this.chance = 100; this.chance = 100;
} }
public Talisman(ItemStack item, String name, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, int chance, PotionEffect... effects) { public Talisman(ItemStack item, String id, 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)); super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1));
this.consumed = consumable; this.consumed = consumable;
this.cancel = cancelEvent; this.cancel = cancelEvent;
this.suffix = messageSuffix; this.suffix = messageSuffix;
@ -49,8 +49,8 @@ public class Talisman extends SlimefunItem {
this.chance = chance; this.chance = chance;
} }
public Talisman(ItemStack item, String name, ItemStack[] recipe, String messageSuffix, int chance, PotionEffect... effects) { public Talisman(ItemStack item, String id, ItemStack[] recipe, String messageSuffix, int chance, PotionEffect... effects) {
super(Categories.TALISMANS_1, item, name, RecipeType.MAGIC_WORKBENCH, recipe, item); super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, item);
this.consumed = true; this.consumed = true;
this.cancel = true; this.cancel = true;
this.suffix = messageSuffix; this.suffix = messageSuffix;

16
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
View File

@ -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_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}; 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) { public AContainer(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -72,7 +72,7 @@ public abstract class AContainer extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {
@ -99,10 +99,10 @@ public abstract class AContainer extends SlimefunItem {
this.registerDefaultRecipes(); this.registerDefaultRecipes();
} }
public AContainer(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { public AContainer(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
super(category, item, name, recipeType, recipe, recipeOutput); super(category, item, id, recipeType, recipe, recipeOutput);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -125,7 +125,7 @@ public abstract class AContainer extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {

6
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java
View File

@ -35,10 +35,10 @@ public abstract class ADrill extends AContainer {
public abstract int getProcessingTime(); public abstract int getProcessingTime();
public abstract int getSpeed(); public abstract int getSpeed();
public ADrill(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public ADrill(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {

16
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java
View File

@ -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 = {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}; 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) { public AFarm(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -59,7 +59,7 @@ public abstract class AFarm extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { 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) { public AFarm(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
super(category, item, name, recipeType, recipe, recipeOutput); super(category, item, id, recipeType, recipe, recipeOutput);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -102,7 +102,7 @@ public abstract class AFarm extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {

16
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java
View File

@ -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_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}; 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) { public AGenerator(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -76,7 +76,7 @@ public abstract class AGenerator extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {
@ -103,10 +103,10 @@ public abstract class AGenerator extends SlimefunItem {
this.registerDefaultRecipes(); this.registerDefaultRecipes();
} }
public AGenerator(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { public AGenerator(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
super(category, item, name, recipeType, recipe, recipeOutput); super(category, item, id, recipeType, recipe, recipeOutput);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -129,7 +129,7 @@ public abstract class AGenerator extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java
View File

@ -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_3 = {30, 31, 32, 39, 41, 48, 49, 50};
private static final int[] border_4 = {25, 34, 43}; //No coolant border private static final int[] border_4 = {25, 34, 43}; //No coolant border
public AReactor(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public AReactor(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
new BlockMenuPreset(name, getInventoryTitle()) { new BlockMenuPreset(id, getInventoryTitle()) {
@Override @Override
public void init() { public void init() {
@ -122,7 +122,7 @@ public abstract class AReactor extends SlimefunItem {
} }
}; };
registerBlockHandler(name, new SlimefunBlockHandler() { registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {

6
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/Teleporter.java
View File

@ -13,10 +13,10 @@ import org.bukkit.inventory.ItemStack;
public abstract class Teleporter extends SlimefunItem { public abstract class Teleporter extends SlimefunItem {
public Teleporter(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { public Teleporter(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe); super(category, item, id, recipeType, recipe);
SlimefunItem.registerBlockHandler(name, new SlimefunBlockHandler() { SlimefunItem.registerBlockHandler(id, new SlimefunBlockHandler() {
@Override @Override
public void onPlace(Player p, Block b, SlimefunItem item) { public void onPlace(Player p, Block b, SlimefunItem item) {