feat: allow giving mtes custom soundtypes

MCTian-mi · MCTian-mi · commit 8f9e7b94e174 · 2025-08-20T16:27:41.000+08:00
diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java
@@ -590,4 +590,13 @@ public void randomDisplayTick(@NotNull IBlockState stateIn, @NotNull World world
         MetaTileEntity metaTileEntity = getMetaTileEntity(worldIn, pos);
         if (metaTileEntity != null) metaTileEntity.randomDisplayTick();
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType(@NotNull IBlockState state, @NotNull World world, @NotNull BlockPos pos,
+                                  @Nullable Entity entity) {
+        MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos);
+        if (metaTileEntity == null) return getSoundType();
+        return metaTileEntity.getSoundType();
+    }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -41,6 +41,7 @@
 import gregtech.common.items.MetaItems;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -908,6 +909,14 @@ private void updateSound() {
         }
     }
 
+    /**
+     * @return The sound type used when this block is broken, placed, stepped on, hit, or fallen on.
+     */
+    @NotNull
+    public SoundType getSoundType() {
+        return SoundType.METAL;
+    }
+
     public final @NotNull ItemStack getStackForm(int amount) {
         int metaTileEntityIntId = registry.getIdByObjectName(metaTileEntityId);
         return new ItemStack(registry.getBlock(), amount, metaTileEntityIntId);
diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java
@@ -21,6 +21,7 @@
 import gregtech.core.network.packets.PacketClipboardNBTUpdate;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.creativetab.CreativeTabs;
@@ -548,4 +549,10 @@ public boolean showToolUsages() {
     public ItemStack getPickItem(EntityPlayer player) {
         return this.getClipboard();
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.WOOD;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOven.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOven.java
@@ -21,6 +21,7 @@
 import gregtech.common.metatileentities.MetaTileEntities;
 import gregtech.common.mui.widget.GTFluidSlot;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -168,4 +169,10 @@ public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fac
         }
         return super.onRightClick(playerIn, hand, facing, hitResult);
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.STONE;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOvenHatch.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityCokeOvenHatch.java
@@ -12,6 +12,7 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -30,6 +31,7 @@
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -127,4 +129,10 @@ public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fac
         }
         return super.onRightClick(playerIn, hand, facing, hitResult);
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.STONE;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityMultiblockTank.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityMultiblockTank.java
@@ -20,6 +20,7 @@
 import gregtech.common.metatileentities.MetaTileEntities;
 import gregtech.common.mui.widget.GTFluidSlot;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
@@ -191,4 +192,10 @@ public <T> T getCapability(Capability<T> capability, EnumFacing side) {
         }
         return super.getCapability(capability, side);
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return this.isMetal ? SoundType.METAL : SoundType.WOOD;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveBlastFurnace.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveBlastFurnace.java
@@ -24,6 +24,7 @@
 import gregtech.common.blocks.BlockMetalCasing;
 import gregtech.common.blocks.MetaBlocks;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.SoundEvents;
@@ -209,4 +210,10 @@ public void randomDisplayTick() {
             }
         }
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.STONE;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveWaterPump.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveWaterPump.java
@@ -17,6 +17,7 @@
 import gregtech.common.blocks.MetaBlocks;
 import gregtech.common.metatileentities.MetaTileEntities;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -191,4 +192,10 @@ public int getFluidProduction() {
     public boolean allowsExtendedFacing() {
         return false;
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.WOOD;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java
@@ -18,6 +18,7 @@
 import gregtech.common.metatileentities.storage.MetaTileEntityQuantumTank;
 import gregtech.common.mui.widget.GTFluidSlot;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -191,4 +192,10 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List<String> t
     public int getDefaultPaintingColor() {
         return 0xFFFFFF;
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.WOOD;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityTankValve.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityTankValve.java
@@ -13,6 +13,7 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -150,4 +151,10 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List<String> t
         tooltip.add(I18n.format("gregtech.tool_action.wrench.set_facing"));
         super.addToolUsages(stack, world, tooltip, advanced);
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return this.isMetal ? SoundType.METAL : SoundType.WOOD;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java
@@ -11,6 +11,7 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.items.MetaItems;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
@@ -279,4 +280,10 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List<String> t
         tooltip.add(I18n.format("gregtech.tool_action.screwdriver.access_covers"));
         super.addToolUsages(stack, world, tooltip, advanced);
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return ModHandler.isMaterialWood(material) ? SoundType.WOOD : SoundType.METAL;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityDrum.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityDrum.java
@@ -13,6 +13,7 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.client.utils.TooltipHelper;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
@@ -315,4 +316,10 @@ public void readFromNBT(NBTTagCompound data) {
     protected boolean shouldSerializeInventories() {
         return false;
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return this.isWood ? SoundType.WOOD : SoundType.METAL;
+    }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java
@@ -17,6 +17,7 @@
 import gregtech.common.mui.widget.workbench.CraftingOutputSlot;
 import gregtech.common.mui.widget.workbench.RecipeMemorySlot;
 
+import net.minecraft.block.SoundType;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Blocks;
@@ -487,4 +488,10 @@ public boolean canRenderMachineGrid(@NotNull ItemStack mainHandStack, @NotNull I
     public boolean showToolUsages() {
         return false;
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType() {
+        return SoundType.WOOD;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -590,4 +590,13 @@ public void randomDisplayTick(@NotNull IBlockState stateIn, @NotNull World world`
`590`	`590`	`MetaTileEntity metaTileEntity = getMetaTileEntity(worldIn, pos);`
`591`	`591`	`if (metaTileEntity != null) metaTileEntity.randomDisplayTick();`
`592`	`592`	`}`
	`593`	`+`
	`594`	`+ @NotNull`
	`595`	`+ @Override`
	`596`	`+ public SoundType getSoundType(@NotNull IBlockState state, @NotNull World world, @NotNull BlockPos pos,`
	`597`	`+ @Nullable Entity entity) {`
	`598`	`+ MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos);`
	`599`	`+ if (metaTileEntity == null) return getSoundType();`
	`600`	`+ return metaTileEntity.getSoundType();`
	`601`	`+ }`
`593`	`602`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import gregtech.common.metatileentities.MetaTileEntities;`
`22`	`22`	`import gregtech.common.mui.widget.GTFluidSlot;`
`23`	`23`
	`24`	`+import net.minecraft.block.SoundType;`
`24`	`25`	`import net.minecraft.block.state.IBlockState;`
`25`	`26`	`import net.minecraft.entity.player.EntityPlayer;`
`26`	`27`	`import net.minecraft.entity.player.EntityPlayerMP;`
`@@ -168,4 +169,10 @@ public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fac`
`168`	`169`	`}`
`169`	`170`	`return super.onRightClick(playerIn, hand, facing, hitResult);`
`170`	`171`	`}`
	`172`	`+`
	`173`	`+ @NotNull`
	`174`	`+ @Override`
	`175`	`+ public SoundType getSoundType() {`
	`176`	`+ return SoundType.STONE;`
	`177`	`+ }`
`171`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import gregtech.common.metatileentities.MetaTileEntities;`
`21`	`21`	`import gregtech.common.mui.widget.GTFluidSlot;`
`22`	`22`
	`23`	`+import net.minecraft.block.SoundType;`
`23`	`24`	`import net.minecraft.block.state.IBlockState;`
`24`	`25`	`import net.minecraft.client.resources.I18n;`
`25`	`26`	`import net.minecraft.entity.player.EntityPlayer;`
`@@ -191,4 +192,10 @@ public <T> T getCapability(Capability<T> capability, EnumFacing side) {`
`191`	`192`	`}`
`192`	`193`	`return super.getCapability(capability, side);`
`193`	`194`	`}`
	`195`	`+`
	`196`	`+ @NotNull`
	`197`	`+ @Override`
	`198`	`+ public SoundType getSoundType() {`
	`199`	`+ return this.isMetal ? SoundType.METAL : SoundType.WOOD;`
	`200`	`+ }`
`194`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import gregtech.common.blocks.BlockMetalCasing;`
`25`	`25`	`import gregtech.common.blocks.MetaBlocks;`
`26`	`26`
	`27`	`+import net.minecraft.block.SoundType;`
`27`	`28`	`import net.minecraft.block.state.IBlockState;`
`28`	`29`	`import net.minecraft.entity.EntityLivingBase;`
`29`	`30`	`import net.minecraft.init.SoundEvents;`
`@@ -209,4 +210,10 @@ public void randomDisplayTick() {`
`209`	`210`	`}`
`210`	`211`	`}`
`211`	`212`	`}`
	`213`	`+`
	`214`	`+ @NotNull`
	`215`	`+ @Override`
	`216`	`+ public SoundType getSoundType() {`
	`217`	`+ return SoundType.STONE;`
	`218`	`+ }`
`212`	`219`	`}`