Updated to RC-16, fixes #7

Sfiguz7 · Sep 9, 2020 · c045101 · c045101
1 parent 634462a
commit c045101
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
   	<dependency>
   		<groupId>com.github.TheBusyBiscuit</groupId>
   		<artifactId>Slimefun4</artifactId>
-  		<version>613bcd86b8</version>
+  		<version>RC-16</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
@@ -13,7 +13,6 @@
 import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock;
 import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
 import me.mrCookieSlime.Slimefun.api.BlockStorage;
-import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
 import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
@@ -127,14 +126,14 @@ public void tick(Block b, SlimefunItem sf, Config data) {
 
                 ItemStack output = new ItemStack(Material.COBBLESTONE);
 
-                if (ChargableBlock.getCharge(b) >= ENERGY_CONSUMPTION) {
+                if (getCharge(b.getLocation()) >= ENERGY_CONSUMPTION) {
                     BlockMenu menu = BlockStorage.getInventory(b);
 
                     if (!menu.fits(output, getOutputSlots())) {
                         return;
                     }
 
-                    ChargableBlock.addCharge(b, -ENERGY_CONSUMPTION);
+                    addCharge(b.getLocation(), -ENERGY_CONSUMPTION);
                     menu.pushItem(output, getOutputSlots());
                 }
             }

diff --git a/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java b/src/main/java/me/sfiguz7/extratools/implementation/tools/Hammer.java
@@ -58,6 +58,7 @@ public boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List
             public ItemStack getDrop(Block b) {
 
                 Material m = b.getType();
+                System.out.println();
 
                 switch (m) {
                     case STONE: