Merge branch 'master' into fix

# Conflicts: # dependencies.gradle
GTNewHorizons · Dec 11, 2023 · a736d2e · a736d2e
2 parents 1e6152e + 3e7d69f
commit a736d2e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -15,7 +15,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.15.2:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.1-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')

diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java
@@ -641,8 +641,8 @@ public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
 
     @Override
     public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-        ItemStack equipped = player.getCurrentEquippedItem();
-        if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) {
+        ITool tool = ToolUtil.getEquippedTool(player);
+        if (!player.isSneaking() || tool == null || !tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) {
             return;
         }
         ConduitUtil.openConduitGui(world, x, y, z, player);