diff --git a/pom.xml b/pom.xml index 07e1657..bb39bbd 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ - org.bstats.bukkit + org.bstats me.sfiguz7.extratools.bstats @@ -92,21 +92,21 @@ org.bstats bstats-bukkit - 1.7 + 3.1.0 compile org.spigotmc spigot-api - 1.18.1-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT provided com.github.TheBusyBiscuit Slimefun4 - RC-30 + experimental-SNAPSHOT provided diff --git a/src/main/java/me/sfiguz7/extratools/ExtraTools.java b/src/main/java/me/sfiguz7/extratools/ExtraTools.java index 5a47867..36dc687 100644 --- a/src/main/java/me/sfiguz7/extratools/ExtraTools.java +++ b/src/main/java/me/sfiguz7/extratools/ExtraTools.java @@ -42,12 +42,12 @@ public void onEnable() { new Hammer().register(this); new Research(new NamespacedKey(this, "HAMMER"), ++researchId, "Hammer", 3) - .addItems(ETItems.HAMMER).register(); + .addItems(ETItems.HAMMER.item()).register(); new GoldTransmuter().register(this); new Research(new NamespacedKey(this, "GOLD_TRANSMUTER"), ++researchId, "Gold Transmuter", 12) - .addItems(ETItems.GOLD_TRANSMUTER).register(); + .addItems(ETItems.GOLD_TRANSMUTER.item()).register(); new ElectricComposter(ElectricComposter.Tier.ONE) { @@ -64,7 +64,7 @@ public int getSpeed() { }.register(this); new Research(new NamespacedKey(this, "ELECTRIC_COMPOSTER"), ++researchId, "Electric Composter", 18) - .addItems(ETItems.ELECTRIC_COMPOSTER).register(); + .addItems(ETItems.ELECTRIC_COMPOSTER.item()).register(); new ElectricComposter(ElectricComposter.Tier.TWO) { @@ -81,27 +81,27 @@ public int getSpeed() { }.register(this); new Research(new NamespacedKey(this, "ELECTRIC_COMPOSTER_2"), ++researchId, "Electric Composter II", 18) - .addItems(ETItems.ELECTRIC_COMPOSTER_2).register(); + .addItems(ETItems.ELECTRIC_COMPOSTER_2.item()).register(); new CobblestoneGenerator().register(this); new Research(new NamespacedKey(this, "COBBLESTONE_GENERATOR"), ++researchId, "Cobblestone Generator", 40) - .addItems(ETItems.COBBLESTONE_GENERATOR).register(); + .addItems(ETItems.COBBLESTONE_GENERATOR.item()).register(); new Vaporizer().register(this); new Research(new NamespacedKey(this, "VAPORIZER"), ++researchId, "Vaporizer", 18) - .addItems(ETItems.VAPORIZER).register(); + .addItems(ETItems.VAPORIZER.item()).register(); new ConcreteFactory().register(this); new Research(new NamespacedKey(this, "CONCRETE_FACTORY"), ++researchId, "Concrete Factory", 12) - .addItems(ETItems.CONCRETE_FACTORY).register(); + .addItems(ETItems.CONCRETE_FACTORY.item()).register(); new Pulverizer().register(this); new Research(new NamespacedKey(this, "PULVERIZER"), ++researchId, "Pulverizer", 18) - .addItems(ETItems.PULVERIZER).register(); + .addItems(ETItems.PULVERIZER.item()).register(); } diff --git a/src/main/java/me/sfiguz7/extratools/implementation/machines/CobblestoneGenerator.java b/src/main/java/me/sfiguz7/extratools/implementation/machines/CobblestoneGenerator.java index c434fd2..cbb2fb1 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/CobblestoneGenerator.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/CobblestoneGenerator.java @@ -40,12 +40,12 @@ public class CobblestoneGenerator extends SimpleSlimefunItem implem public CobblestoneGenerator() { super(ETItems.extra_tools, ETItems.COBBLESTONE_GENERATOR, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {SlimefunItems.PROGRAMMABLE_ANDROID_MINER, SlimefunItems.MAGNESIUM_INGOT, - SlimefunItems.PROGRAMMABLE_ANDROID_MINER, - new ItemStack(Material.WATER_BUCKET), SlimefunItems.BLISTERING_INGOT_3, + new ItemStack[] {SlimefunItems.PROGRAMMABLE_ANDROID_MINER.item(), SlimefunItems.MAGNESIUM_INGOT.item(), + SlimefunItems.PROGRAMMABLE_ANDROID_MINER.item(), + new ItemStack(Material.WATER_BUCKET), SlimefunItems.BLISTERING_INGOT_3.item(), new ItemStack(Material.LAVA_BUCKET), - SlimefunItems.PROGRAMMABLE_ANDROID_MINER, SlimefunItems.BIG_CAPACITOR, - SlimefunItems.PROGRAMMABLE_ANDROID_MINER}); + SlimefunItems.PROGRAMMABLE_ANDROID_MINER.item(), SlimefunItems.BIG_CAPACITOR.item(), + SlimefunItems.PROGRAMMABLE_ANDROID_MINER.item()}); createPreset(this, this::constructMenu); @@ -54,15 +54,15 @@ public CobblestoneGenerator() { private void constructMenu(BlockMenuPreset preset) { for (int i : border) { - preset.addItem(i, new CustomItemStack(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "), + preset.addItem(i, CustomItemStack.create(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "), ChestMenuUtils.getEmptyClickHandler()); } for (int i : inputBorder) { - preset.addItem(i, new CustomItemStack(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "), + preset.addItem(i, CustomItemStack.create(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "), ChestMenuUtils.getEmptyClickHandler()); } for (int i : outputBorder) { - preset.addItem(i, new CustomItemStack(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "), + preset.addItem(i, CustomItemStack.create(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "), ChestMenuUtils.getEmptyClickHandler()); } diff --git a/src/main/java/me/sfiguz7/extratools/implementation/machines/ConcreteFactory.java b/src/main/java/me/sfiguz7/extratools/implementation/machines/ConcreteFactory.java index 97f2763..237c472 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/ConcreteFactory.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/ConcreteFactory.java @@ -21,11 +21,11 @@ public class ConcreteFactory extends AContainer implements RecipeDisplayItem { public ConcreteFactory() { super(ETItems.extra_tools, ETItems.CONCRETE_FACTORY, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {new ItemStack(Material.WATER_BUCKET), SlimefunItems.GILDED_IRON, + new ItemStack[] {new ItemStack(Material.WATER_BUCKET), SlimefunItems.GILDED_IRON.item(), new ItemStack(Material.WATER_BUCKET), - SlimefunItems.ADVANCED_CIRCUIT_BOARD, SlimefunItems.ELECTRIC_MOTOR, - SlimefunItems.ADVANCED_CIRCUIT_BOARD, - new ItemStack(Material.WATER_BUCKET), SlimefunItems.SMALL_CAPACITOR, + SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), SlimefunItems.ELECTRIC_MOTOR.item(), + SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), + new ItemStack(Material.WATER_BUCKET), SlimefunItems.SMALL_CAPACITOR.item(), new ItemStack(Material.WATER_BUCKET)}); addItemHandler(onBreak()); diff --git a/src/main/java/me/sfiguz7/extratools/implementation/machines/ElectricComposter.java b/src/main/java/me/sfiguz7/extratools/implementation/machines/ElectricComposter.java index 11abf2c..051da4f 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/ElectricComposter.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/ElectricComposter.java @@ -101,14 +101,14 @@ public void onPlayerBreak(BlockBreakEvent e, ItemStack item, List dro public enum Tier { ONE(new ItemStack[] { - SlimefunItems.GILDED_IRON, SlimefunItems.MAGNESIUM_INGOT, SlimefunItems.GILDED_IRON, - SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.COMPOSTER, SlimefunItems.ELECTRIC_MOTOR, - new ItemStack(Material.IRON_HOE), SlimefunItems.MEDIUM_CAPACITOR, new ItemStack(Material.IRON_HOE) } + SlimefunItems.GILDED_IRON.item(), SlimefunItems.MAGNESIUM_INGOT.item(), SlimefunItems.GILDED_IRON.item(), + SlimefunItems.ELECTRIC_MOTOR.item(), SlimefunItems.COMPOSTER.item(), SlimefunItems.ELECTRIC_MOTOR.item(), + new ItemStack(Material.IRON_HOE), SlimefunItems.MEDIUM_CAPACITOR.item(), new ItemStack(Material.IRON_HOE) } ), - TWO(new ItemStack[] { SlimefunItems.HARDENED_METAL_INGOT, SlimefunItems.BLISTERING_INGOT_3, - SlimefunItems.HARDENED_METAL_INGOT, - SlimefunItems.ELECTRIC_MOTOR, ETItems.ELECTRIC_COMPOSTER, SlimefunItems.ELECTRIC_MOTOR, - new ItemStack(Material.DIAMOND_HOE), SlimefunItems.LARGE_CAPACITOR, new ItemStack(Material.DIAMOND_HOE) } + TWO(new ItemStack[] { SlimefunItems.HARDENED_METAL_INGOT.item(), SlimefunItems.BLISTERING_INGOT_3.item(), + SlimefunItems.HARDENED_METAL_INGOT.item(), + SlimefunItems.ELECTRIC_MOTOR.item(), ETItems.ELECTRIC_COMPOSTER.item(), SlimefunItems.ELECTRIC_MOTOR.item(), + new ItemStack(Material.DIAMOND_HOE), SlimefunItems.LARGE_CAPACITOR.item(), new ItemStack(Material.DIAMOND_HOE) } ); private final ItemStack[] recipe; diff --git a/src/main/java/me/sfiguz7/extratools/implementation/machines/GoldTransmuter.java b/src/main/java/me/sfiguz7/extratools/implementation/machines/GoldTransmuter.java index 9e4d182..dc98ed1 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/GoldTransmuter.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/GoldTransmuter.java @@ -21,9 +21,9 @@ public class GoldTransmuter extends AContainer implements RecipeDisplayItem { public GoldTransmuter() { super(ETItems.extra_tools, ETItems.GOLD_TRANSMUTER, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {null, SlimefunItems.SILVER_INGOT, null, - SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.GOLD_24K_BLOCK, SlimefunItems.ELECTRIC_MOTOR, - new ItemStack(Material.GOLDEN_PICKAXE), SlimefunItems.MEDIUM_CAPACITOR, + new ItemStack[] {null, SlimefunItems.SILVER_INGOT.item(), null, + SlimefunItems.ELECTRIC_MOTOR.item(), SlimefunItems.GOLD_24K_BLOCK.item(), SlimefunItems.ELECTRIC_MOTOR.item(), + new ItemStack(Material.GOLDEN_PICKAXE), SlimefunItems.MEDIUM_CAPACITOR.item(), new ItemStack(Material.GOLDEN_PICKAXE)}); addItemHandler(onBreak()); @@ -32,32 +32,32 @@ public GoldTransmuter() { @Override protected void registerDefaultRecipes() { - registerRecipe(7, new ItemStack[] {SlimefunItems.GOLD_24K_BLOCK}, + registerRecipe(7, new ItemStack[] {SlimefunItems.GOLD_24K_BLOCK.item()}, new ItemStack[] {new ItemStack(Material.GOLD_BLOCK)}); - registerRecipe(2, new ItemStack[] {SlimefunItems.GOLD_4K}, + registerRecipe(2, new ItemStack[] {SlimefunItems.GOLD_4K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 4)}); - registerRecipe(2, new ItemStack[] {SlimefunItems.GOLD_6K}, + registerRecipe(2, new ItemStack[] {SlimefunItems.GOLD_6K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 9)}); - registerRecipe(3, new ItemStack[] {SlimefunItems.GOLD_8K}, + registerRecipe(3, new ItemStack[] {SlimefunItems.GOLD_8K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 13)}); - registerRecipe(3, new ItemStack[] {SlimefunItems.GOLD_10K}, + registerRecipe(3, new ItemStack[] {SlimefunItems.GOLD_10K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 18)}); - registerRecipe(4, new ItemStack[] {SlimefunItems.GOLD_12K}, + registerRecipe(4, new ItemStack[] {SlimefunItems.GOLD_12K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 22)}); - registerRecipe(4, new ItemStack[] {SlimefunItems.GOLD_14K}, + registerRecipe(4, new ItemStack[] {SlimefunItems.GOLD_14K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 27)}); - registerRecipe(5, new ItemStack[] {SlimefunItems.GOLD_16K}, + registerRecipe(5, new ItemStack[] {SlimefunItems.GOLD_16K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 31)}); - registerRecipe(5, new ItemStack[] {SlimefunItems.GOLD_18K}, + registerRecipe(5, new ItemStack[] {SlimefunItems.GOLD_18K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 36)}); - registerRecipe(6, new ItemStack[] {SlimefunItems.GOLD_20K}, + registerRecipe(6, new ItemStack[] {SlimefunItems.GOLD_20K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 40)}); - registerRecipe(6, new ItemStack[] {SlimefunItems.GOLD_22K}, + registerRecipe(6, new ItemStack[] {SlimefunItems.GOLD_22K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 45)}); - registerRecipe(7, new ItemStack[] {SlimefunItems.GOLD_24K}, + registerRecipe(7, new ItemStack[] {SlimefunItems.GOLD_24K.item()}, new ItemStack[] {new ItemStack(Material.GOLD_NUGGET, 49)}); registerRecipe(2, new ItemStack[] {new ItemStack(Material.GOLD_INGOT)}, - new ItemStack[] {SlimefunItems.GOLD_DUST}); + new ItemStack[] {SlimefunItems.GOLD_DUST.item()}); } @Override diff --git a/src/main/java/me/sfiguz7/extratools/implementation/machines/Pulverizer.java b/src/main/java/me/sfiguz7/extratools/implementation/machines/Pulverizer.java index 3296d8d..213e5ff 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/Pulverizer.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/Pulverizer.java @@ -21,9 +21,9 @@ public class Pulverizer extends AContainer implements RecipeDisplayItem { public Pulverizer() { super(ETItems.extra_tools, ETItems.PULVERIZER, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {SlimefunItems.SILICON, SlimefunItems.HARDENED_METAL_INGOT, SlimefunItems.SILICON, - SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.STEEL_PLATE, SlimefunItems.ELECTRIC_MOTOR, - new ItemStack(Material.IRON_PICKAXE), SlimefunItems.MEDIUM_CAPACITOR, + new ItemStack[] {SlimefunItems.SILICON.item(), SlimefunItems.HARDENED_METAL_INGOT.item(), SlimefunItems.SILICON.item(), + SlimefunItems.ELECTRIC_MOTOR.item(), SlimefunItems.STEEL_PLATE.item(), SlimefunItems.ELECTRIC_MOTOR.item(), + new ItemStack(Material.IRON_PICKAXE), SlimefunItems.MEDIUM_CAPACITOR.item(), new ItemStack(Material.IRON_PICKAXE)}); addItemHandler(onBreak()); diff --git a/src/main/java/me/sfiguz7/extratools/implementation/machines/Vaporizer.java b/src/main/java/me/sfiguz7/extratools/implementation/machines/Vaporizer.java index 56d96d2..f94cb61 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/Vaporizer.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/Vaporizer.java @@ -22,10 +22,10 @@ public class Vaporizer extends AContainer implements RecipeDisplayItem { public Vaporizer() { super(ETItems.extra_tools, ETItems.VAPORIZER, RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[] {new ItemStack(Material.MAGMA_BLOCK), SlimefunItems.ELECTRIC_MOTOR, + new ItemStack[] {new ItemStack(Material.MAGMA_BLOCK), SlimefunItems.ELECTRIC_MOTOR.item(), new ItemStack(Material.MAGMA_BLOCK), - SlimefunItems.HEATING_COIL, SlimefunItems.FLUID_PUMP, SlimefunItems.HEATING_COIL, - new ItemStack(Material.MAGMA_BLOCK), SlimefunItems.MEDIUM_CAPACITOR, + SlimefunItems.HEATING_COIL.item(), SlimefunItems.FLUID_PUMP.item(), SlimefunItems.HEATING_COIL.item(), + new ItemStack(Material.MAGMA_BLOCK), SlimefunItems.MEDIUM_CAPACITOR.item(), new ItemStack(Material.MAGMA_BLOCK)}); addItemHandler(onBreak()); @@ -36,14 +36,14 @@ protected void registerDefaultRecipes() { registerRecipe(8, new ItemStack[] {new ItemStack(Material.WATER_BUCKET)}, new ItemStack[] {new ItemStack(Material.BUCKET), - new CustomItemStack(SlimefunItems.SALT, 4) + new ItemStack(SlimefunItems.SALT.getType(), 4) }); registerRecipe(8, new ItemStack[] {new ItemStack(Material.LAVA_BUCKET)}, new ItemStack[] {new ItemStack(Material.BUCKET), - new CustomItemStack(SlimefunItems.SULFATE, 16) + new ItemStack(SlimefunItems.SULFATE.getType(), 16) }); registerRecipe(3, new ItemStack[] {new ItemStack(Material.MAGMA_BLOCK)}, - new ItemStack[] {SlimefunItems.SULFATE}); + new ItemStack[] {SlimefunItems.SULFATE.item()}); } diff --git a/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java b/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java index ad36e72..0e43d3d 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java @@ -59,15 +59,15 @@ public ItemStack getDrop(Block b) { } case IRON_ORE: case DEEPSLATE_IRON_ORE: { - return SlimefunItems.IRON_DUST; + return SlimefunItems.IRON_DUST.item(); } case GOLD_ORE: case DEEPSLATE_GOLD_ORE: { - return SlimefunItems.GOLD_DUST; + return SlimefunItems.GOLD_DUST.item(); } case COPPER_ORE: case DEEPSLATE_COPPER_ORE: { - return SlimefunItems.COPPER_DUST; + return SlimefunItems.COPPER_DUST.item(); } case NETHERRACK: { return new ItemStack(Material.SOUL_SAND); @@ -76,4 +76,4 @@ public ItemStack getDrop(Block b) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/me/sfiguz7/extratools/lists/ETItems.java b/src/main/java/me/sfiguz7/extratools/lists/ETItems.java index dec52b0..de58053 100644 --- a/src/main/java/me/sfiguz7/extratools/lists/ETItems.java +++ b/src/main/java/me/sfiguz7/extratools/lists/ETItems.java @@ -15,7 +15,7 @@ public final class ETItems { /* Category */ public static final ItemGroup extra_tools = new ItemGroup(new NamespacedKey(ExtraTools.getInstance(), "extra_tools"), - new CustomItemStack(Material.DIAMOND_AXE, "&4Extra Tools") + CustomItemStack.create(Material.DIAMOND_AXE, "&4Extra Tools") ); /* Items */ public static final SlimefunItemStack HAMMER = new SlimefunItemStack("HAMMER", @@ -86,4 +86,4 @@ public final class ETItems { ); private ETItems() { } -} \ No newline at end of file +}