Wrench rotation sounds

GregTechCEu · Nov 26, 2021 · f0f8014 · f0f8014
1 parent 7c72156
commit f0f8014
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java
@@ -16,6 +16,9 @@
 import gregtech.api.cover.CoverBehavior;
 import gregtech.api.cover.ICoverable;
 import gregtech.api.cover.IFacadeCover;
+import gregtech.api.items.metaitem.MetaItem;
+import gregtech.api.items.toolitem.IToolStats;
+import gregtech.api.items.toolitem.ToolMetaItem;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.pipenet.block.BlockPipe;
@@ -332,6 +335,11 @@ public boolean onBlockActivated(@Nonnull World worldIn, @Nonnull BlockPos pos, @
 
             if (wrenchItem.damageItem(DamageValues.DAMAGE_FOR_WRENCH, true) &&
                     metaTileEntity.onWrenchClick(playerIn, hand, wrenchDirection, rayTraceResult)) {
+
+                if(itemStack.getItem() instanceof ToolMetaItem<?>) {
+                    IToolStats stats = ((ToolMetaItem<?>) itemStack.getItem()).getItem(itemStack).getToolStats();
+                    stats.onBreakingUse(itemStack);
+                }
                 wrenchItem.damageItem(DamageValues.DAMAGE_FOR_WRENCH, false);
                 return true;
             }

diff --git a/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java
@@ -138,6 +138,6 @@ public ModularUI.Builder createUITemplate(EntityPlayer player) {
     @Override
     public void onAttached() {
         super.onAttached();
-        this.setupSound(workableHandler.recipeMap.getSound(), this.getPos(), this.getWorld());
+        this.setupSound(workableHandler.getRecipeMap().getSound(), this.getPos(), this.getWorld());
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/WorkableTieredMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/WorkableTieredMetaTileEntity.java
@@ -163,6 +163,6 @@ public boolean isActive() {
     @Override
     public void onAttached() {
         super.onAttached();
-        this.setupSound(this.workable.recipeMap.getSound(), this.getPos(), this.getWorld());
+        this.setupSound(this.workable.getRecipeMap().getSound(), this.getPos(), this.getWorld());
     }
 }
diff --git a/...n/java/gregtech/api/metatileentity/multiblock/RecipeMapPrimitiveMultiblockController.java b/...n/java/gregtech/api/metatileentity/multiblock/RecipeMapPrimitiveMultiblockController.java
@@ -63,7 +63,7 @@ protected boolean shouldUpdate(MTETrait trait) {
     @Override
     public void onAttached() {
         super.onAttached();
-        this.setupSound(recipeMapWorkable.recipeMap.getSound(), this.getPos(), this.getWorld());
+        this.setupSound(recipeMapWorkable.getRecipeMap().getSound(), this.getPos(), this.getWorld());
     }
 
     public boolean canCreateSound() {

diff --git a/src/main/java/gregtech/common/items/behaviors/WrenchBehaviour.java b/src/main/java/gregtech/common/items/behaviors/WrenchBehaviour.java
@@ -1,6 +1,8 @@
 package gregtech.common.items.behaviors;
 
 import gregtech.api.items.metaitem.stats.IItemBehaviour;
+import gregtech.api.items.toolitem.IToolStats;
+import gregtech.api.items.toolitem.ToolMetaItem;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.util.GTUtility;
 import net.minecraft.client.resources.I18n;
@@ -27,7 +29,9 @@ public WrenchBehaviour(int cost) {
     public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) {
         if (!world.isRemote && !world.isAirBlock(pos)) {
             ItemStack stack = player.getHeldItem(hand);
+
             TileEntity tileEntity = world.getTileEntity(pos);
+
             if (tileEntity instanceof MetaTileEntityHolder)
                 //machines handle wrench click manually
                 return EnumActionResult.PASS;