From b4a025bae187c64cfc90c1a1ca914f0a2c4fb847 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:57:19 +0200 Subject: [PATCH] fix --- CHANGELOG | 3 +- .../arcmods/ryantlg/blockClasses/Damon.java | 28 +++++++++---------- .../ryantlg/blockClasses/WeemCropBlock.java | 28 +++++++++---------- .../arcmods/ryantlg/blockClasses/elon.java | 28 +++++++++---------- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c23ca8e..5728722 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,4 +12,5 @@ ## 1.19-1.0.2-unstable - added stupidium armour - added textures for stupidium stuff -- fixed weem haybale \ No newline at end of file +- fixed weem haybale +- fixed fucked audio blocks \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/Damon.java b/src/main/java/net/arcmods/ryantlg/blockClasses/Damon.java index a5fc89a..f78de92 100755 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/Damon.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/Damon.java @@ -17,18 +17,18 @@ public class Damon extends Block{ super(settings); } - @Override - public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) { - if (!world.isClient) { - world.playSound( - null, // Player - if non-null, will play sound for every nearby player *except* the specified player - blockPos, // The position of where the sound will come from - sounds.MATT_SOUND_EVENT, // The sound that will play - SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound - 1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc - 1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc - ); - } - return ActionResult.FAIL; - } + // @Override + // public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) { + // if (!world.isClient) { + // world.playSound( + // null, // Player - if non-null, will play sound for every nearby player *except* the specified player + // blockPos, // The position of where the sound will come from + // sounds.MATT_SOUND_EVENT, // The sound that will play + // SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound + // 1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc + // 1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc + // ); + // } + // return ActionResult.FAIL; + // } } diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/WeemCropBlock.java b/src/main/java/net/arcmods/ryantlg/blockClasses/WeemCropBlock.java index 4793a05..e5f2d12 100755 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/WeemCropBlock.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/WeemCropBlock.java @@ -40,21 +40,21 @@ public class WeemCropBlock extends CropBlock { return AGE_TO_SHAPE[(Integer)state.get(this.getAgeProperty())]; } - @Override - public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) { - if (!world.isClient) { - world.playSound( - null, // Player - if non-null, will play sound for every nearby player *except* the specified player - blockPos, // The position of where the sound will come from - sounds.SNIFF_SOUND_EVENT, // The sound that will play - SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound - 1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc - 1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc - ); - } - return ActionResult.FAIL; + // @Override + // public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) { + // if (!world.isClient) { + // world.playSound( + // null, // Player - if non-null, will play sound for every nearby player *except* the specified player + // blockPos, // The position of where the sound will come from + // sounds.SNIFF_SOUND_EVENT, // The sound that will play + // SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound + // 1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc + // 1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc + // ); + // } + // return ActionResult.FAIL; - } + // } } \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/elon.java b/src/main/java/net/arcmods/ryantlg/blockClasses/elon.java index 4658f17..94bdc44 100755 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/elon.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/elon.java @@ -17,18 +17,18 @@ public class elon extends Block{ super(settings); } - @Override - public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) { - if (!world.isClient) { - world.playSound( - null, // Player - if non-null, will play sound for every nearby player *except* the specified player - blockPos, // The position of where the sound will come from - sounds.ELON_SOUND_EVENT, // The sound that will play - SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound - 1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc - 1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc - ); - } - return ActionResult.FAIL; - } + // @Override + // public ActionResult onUse(BlockState blockState, World world, BlockPos blockPos, PlayerEntity placedBy, Hand hand, BlockHitResult blockHitResult) { + // if (!world.isClient) { + // world.playSound( + // null, // Player - if non-null, will play sound for every nearby player *except* the specified player + // blockPos, // The position of where the sound will come from + // sounds.ELON_SOUND_EVENT, // The sound that will play + // SoundCategory.BLOCKS, // This determines which of the volume sliders affect this sound + // 1f, //Volume multiplier, 1 is normal, 0.5 is half volume, etc + // 1f // Pitch multiplier, 1 is normal, 0.5 is half pitch, etc + // ); + // } + // return ActionResult.FAIL; + // } }