From 1db5375d358b5171204be3abf60bf1d46ffa0e1d Mon Sep 17 00:00:00 2001 From: Michael Lydeamore Date: Thu, 23 Oct 2014 14:53:14 +1030 Subject: [PATCH] Added /dev/null functionality Moved finding to TinkerTools --- src/main/java/tconstruct/TConstruct.java | 2 ++ .../tconstruct/library/tools/HarvestTool.java | 16 +++++++++++++--- src/main/java/tconstruct/tools/TinkerTools.java | 6 ++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index ddbf6fdd..9e3e6dce 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -85,6 +85,8 @@ public class TConstruct public static final Logger logger = LogManager.getLogger(modID); public static final PacketPipeline packetPipeline = new PacketPipeline(); public static Random random = new Random(); + + /* Instance of this mod, used for grabbing prototype fields */ @Instance(modID) diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index b124a3a4..00d27122 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -16,7 +16,7 @@ import net.minecraft.network.play.client.C07PacketPlayerDigging; import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import tconstruct.TConstruct; +import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; /* Base class for tools that should be harvesting blocks */ @@ -153,7 +153,8 @@ public abstract class HarvestTool extends ToolCore if (nearbyStack != null) { Item item = nearbyStack.getItem(); - if (item instanceof ItemBlock) + + if (item instanceof ItemBlock || (item != null && item == TinkerTools.openBlocksDevNull)) { int posX = x; int posY = y; @@ -197,8 +198,17 @@ public abstract class HarvestTool extends ToolCore int dmg = nearbyStack.getItemDamage(); int count = nearbyStack.stackSize; + if (item == TinkerTools.openBlocksDevNull) + { + //Openblocks uses current inventory slot, so we have to do this... + player.inventory.currentItem=itemSlot; + item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); + player.inventory.currentItem=hotbarSlot; + player.swingItem(); + } + else + used = item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); - used = item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); // handle creative mode if(player.capabilities.isCreativeMode) { // fun fact: vanilla minecraft does it exactly the same way diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 3e9097f3..04af5db3 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -124,6 +124,9 @@ public class TinkerTools // recipe stuff public static boolean thaumcraftAvailable; + + //Dev/Null Stuff + public static Item openBlocksDevNull; @Handler public void preInit (FMLPreInitializationEvent event) @@ -718,6 +721,9 @@ public class TinkerTools { } // No need to handle } + + //OpenBlocks + openBlocksDevNull = GameRegistry.findItem("OpenBlocks", "devnull"); } void registerMaterials ()