From 43312e2eb4ac8e356db2f8aa91422c9b8f645a88 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Thu, 31 Oct 2024 20:09:36 +0100 Subject: [PATCH] Change some machine sounds to METAL (Fixing #1429) --- .../ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java | 3 ++- .../actuallyadditions/mod/blocks/BlockCoalGenerator.java | 3 ++- .../actuallyadditions/mod/blocks/BlockCoffeeMachine.java | 3 ++- .../de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java | 3 ++- .../actuallyadditions/mod/blocks/BlockDisplayStand.java | 3 ++- .../ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java | 3 ++- .../de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java | 3 ++- .../mod/blocks/BlockLavaFactoryController.java | 3 ++- .../actuallyadditions/mod/blocks/BlockOilGenerator.java | 3 ++- .../actuallyadditions/mod/blocks/BlockPoweredFurnace.java | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java index f8dc6eb7a..5f64722ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java @@ -16,6 +16,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -27,7 +28,7 @@ import javax.annotation.Nullable; public class BlockBioReactor extends DirectionalBlock.Container { public BlockBioReactor() { - super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F)); + super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F).sound(SoundType.METAL)); } @Nullable diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index 98c6f9e5b..40a0a3410 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -20,6 +20,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -32,7 +33,7 @@ import javax.annotation.Nullable; public class BlockCoalGenerator extends DirectionalBlock.Container { public BlockCoalGenerator() { - super(ActuallyBlocks.defaultPickProps().randomTicks()); + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks()); } @Nullable diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index e821a16e5..921d4c189 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -19,6 +19,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -31,7 +32,7 @@ import javax.annotation.Nullable; public class BlockCoffeeMachine extends DirectionalBlock.Container { public BlockCoffeeMachine() { - super(ActuallyBlocks.defaultPickProps()); + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java index 074dc8d86..a75a4531a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java @@ -24,6 +24,7 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -41,7 +42,7 @@ public class BlockCrusher extends BlockContainerBase { private final boolean isDouble; public BlockCrusher(boolean isDouble) { - super(ActuallyBlocks.defaultPickProps().randomTicks()); + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks()); this.isDouble = isDouble; this.registerDefaultState(getStateDefinition().any().setValue(HORIZONTAL_FACING, Direction.NORTH).setValue(LIT, false)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java index 0396b793e..d74e720d8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java @@ -23,6 +23,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -36,7 +37,7 @@ import javax.annotation.Nullable; public class BlockDisplayStand extends BlockContainerBase { public BlockDisplayStand(boolean empowerer) { - super(ActuallyBlocks.defaultPickProps()); + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL)); isEmpowerer = empowerer; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 298f541b4..a976d60fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -17,6 +17,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -29,7 +30,7 @@ public class BlockEnergizer extends BlockContainerBase { private final boolean isEnergizer; public BlockEnergizer(boolean isEnergizer) { - super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F)); + super(ActuallyBlocks.defaultPickProps(2.0F, 10.0F).sound(SoundType.METAL)); this.isEnergizer = isEnergizer; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java index 73f0b502b..65bcf6117 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java @@ -16,6 +16,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -27,7 +28,7 @@ import javax.annotation.Nullable; public class BlockFarmer extends DirectionalBlock.Container { public BlockFarmer() { - super(ActuallyBlocks.defaultPickProps()); + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL)); } @Nullable diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index 938424ef2..19f0b5843 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -20,6 +20,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -33,7 +34,7 @@ import javax.annotation.Nullable; public class BlockLavaFactoryController extends DirectionalBlock.Container implements IHudDisplay { public BlockLavaFactoryController() { - super(ActuallyBlocks.defaultPickProps(4.5F, 20.0F)); + super(ActuallyBlocks.defaultPickProps(4.5F, 20.0F).sound(SoundType.METAL)); } @Nullable diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index f4e1163e0..93a26eb6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -22,6 +22,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -35,7 +36,7 @@ import javax.annotation.Nullable; public class BlockOilGenerator extends DirectionalBlock.Container { public BlockOilGenerator() { - super(ActuallyBlocks.defaultPickProps().randomTicks()); + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks()); } @Nullable diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java index d109d856c..4ecae8bde 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java @@ -27,6 +27,7 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -42,7 +43,7 @@ import static net.minecraft.world.level.block.state.properties.BlockStatePropert public class BlockPoweredFurnace extends DirectionalBlock.Container { public BlockPoweredFurnace() { - super(ActuallyBlocks.defaultPickProps().randomTicks().lightLevel(state -> state.getValue(LIT) + super(ActuallyBlocks.defaultPickProps().sound(SoundType.METAL).randomTicks().lightLevel(state -> state.getValue(LIT) ? 12 : 0));