More refactoring cause I missed a bunch

Sfiguz7 · Jul 22, 2020 · 634462a · 634462a
1 parent f49c4e5
commit 634462a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
   	<dependency>
   		<groupId>com.github.TheBusyBiscuit</groupId>
   		<artifactId>CS-CoreLib</artifactId>
-  		<version>8081bb4fe4</version>
+  		<version>9dd4a1cf8d</version>
   		<scope>provided</scope>
   		<exclusions>
   			<exclusion>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;