From 634462af468b4ce698ac9262daed43fc5085798c Mon Sep 17 00:00:00 2001 From: Sfiguz7 Date: Thu, 23 Jul 2020 00:16:30 +0200 Subject: [PATCH] More refactoring cause I missed a bunch --- pom.xml | 2 +- .../implementation/machines/CobblestoneGenerator.java | 4 ++-- .../extratools/implementation/machines/ConcreteFactory.java | 2 +- .../extratools/implementation/machines/ElectricComposter.java | 4 ++-- .../extratools/implementation/machines/GoldTransmuter.java | 2 +- .../extratools/implementation/machines/Pulverizer.java | 2 +- .../sfiguz7/extratools/implementation/machines/Vaporizer.java | 2 +- .../me/sfiguz7/extratools/implementation/tools/Hammer.java | 1 + 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 8d05bea..096c490 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ com.github.TheBusyBiscuit CS-CoreLib - 8081bb4fe4 + 9dd4a1cf8d provided 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 8d8b4a6..f09fd6f 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/CobblestoneGenerator.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/CobblestoneGenerator.java @@ -2,13 +2,13 @@ import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ClickAction; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SimpleSlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; 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 33f9da5..0051c68 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/ConcreteFactory.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/ConcreteFactory.java @@ -1,8 +1,8 @@ package me.sfiguz7.extratools.implementation.machines; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.sfiguz7.extratools.lists.ETItems; 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 19dae96..0f4cb82 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/ElectricComposter.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/ElectricComposter.java @@ -1,8 +1,8 @@ package me.sfiguz7.extratools.implementation.machines; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.mrCookieSlime.Slimefun.cscorelib2.materials.MaterialCollections; @@ -15,7 +15,7 @@ public abstract class ElectricComposter extends AContainer implements RecipeDisplayItem { - private Tier tier; + private final Tier tier; public ElectricComposter(Tier tier) { super(ETItems.extra_tools, tier == Tier.ONE ? ETItems.ELECTRIC_COMPOSTER : ETItems.ELECTRIC_COMPOSTER_2, 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 ba48b51..ce96e45 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/GoldTransmuter.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/GoldTransmuter.java @@ -1,8 +1,8 @@ package me.sfiguz7.extratools.implementation.machines; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.sfiguz7.extratools.lists.ETItems; 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 5256020..63f55e3 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/Pulverizer.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/Pulverizer.java @@ -1,8 +1,8 @@ package me.sfiguz7.extratools.implementation.machines; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.sfiguz7.extratools.lists.ETItems; 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 a5b2af4..96e318f 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/machines/Vaporizer.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/machines/Vaporizer.java @@ -1,8 +1,8 @@ package me.sfiguz7.extratools.implementation.machines; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe; import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem; 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 355268c..1ce301a 100644 --- a/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java +++ b/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java @@ -46,6 +46,7 @@ public boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List return true; } + //Can't throw NPEs now b.getLocation().getWorld().dropItemNaturally(b.getLocation(), drop); e.setDropItems(false); return true;