fix #476 (bug introduced in ba90280), add a sound effect for when you…

… clear it too, and swing arm
FallingColors · Nov 19, 2024 · d0ac296 · d0ac296
1 parent 27c1c6e
commit d0ac296
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.../main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockRedstoneImpetus.java b/.../main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockRedstoneImpetus.java
@@ -49,6 +49,8 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
             if (usedStack.isEmpty() && pPlayer.isDiscrete()) {
                 tile.clearPlayer();
                 tile.sync();
+                pLevel.playSound(null, pPos, HexSounds.IMPETUS_REDSTONE_CLEAR, SoundSource.BLOCKS, 1f, 1f);
+                return InteractionResult.sidedSuccess(pLevel.isClientSide);
             } else {
                 var datumContainer = IXplatAbstractions.INSTANCE.findDataHolder(usedStack);
                 if (datumContainer != null) {
@@ -60,8 +62,9 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
                             tile.setPlayer(player.getGameProfile(), entity.getUUID());
                             tile.sync();
 
-                            pLevel.playSound(pPlayer, pPos, HexSounds.IMPETUS_REDSTONE_DING,
+                            pLevel.playSound(null, pPos, HexSounds.IMPETUS_REDSTONE_DING,
                                 SoundSource.BLOCKS, 1f, 1f);
+                            return InteractionResult.sidedSuccess(pLevel.isClientSide);
                         }
                     }
                 }

diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexSounds.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexSounds.java
@@ -42,6 +42,7 @@ public static void registerSounds(BiConsumer<SoundEvent, ResourceLocation> r) {
 
     public static final SoundEvent IMPETUS_LOOK_TICK = sound("impetus.fletcher.tick");
     public static final SoundEvent IMPETUS_REDSTONE_DING = sound("impetus.redstone.register");
+    public static final SoundEvent IMPETUS_REDSTONE_CLEAR = sound("impetus.redstone.clear");
 
     public static final SoundEvent READ_LORE_FRAGMENT = sound("lore_fragment.read");
 

diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
@@ -606,6 +606,7 @@
       "scroll.scribble": "Scroll is scribbled",
       "impetus.fletcher.tick": "Fletcher Impetus ticks",
       "impetus.redstone.register": "Cleric Impetus dings",
+      "impetus.redstone.clear": "Cleric Impetus clears",
       "lore_fragment.read": "Read lore fragment",
       "flight.ambience": "Player flies",
       "flight.finish": "Flight ends",

diff --git a/Common/src/main/resources/assets/hexcasting/sounds.json5 b/Common/src/main/resources/assets/hexcasting/sounds.json5
@@ -132,6 +132,12 @@
     ],
     "subtitle": "hexcasting.subtitles.impetus.redstone.register"
   },
+  "impetus.redstone.clear": {
+    "sounds": [
+      "hexcasting:cast/fail"
+    ],
+    "subtitle": "hexcasting.subtitles.impetus.redstone.clear"
+  },
 
   "lore_fragment.read": {
     "sounds": [