Fixes MC-105068 (#267)

* Fixes MC-105068 closes #241 * This actually doesnt matter
isXander · Apr 30, 2024 · 6663f93 · 6663f93
1 parent c63cccb
commit 6663f93
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/PATCHED.md b/PATCHED.md
@@ -4,16 +4,17 @@
 | Type     | Bug ID                                                | Name                                                                                                                                |
 |----------|-------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
 | Basic    | [MC-577](https://bugs.mojang.com/browse/MC-577)       | Mouse buttons block all inventory controls that are not default                                                                     |
-| Basic    | [MC-4490](https://bugs.mojang.com/browse/MC-4490)     | Fishing line not attached to fishing rod in third person while crouching                                                            |
+| Basic    | [MC-4490](https://bugs.mojang.com/browse/MC-4490)     | Fishing line not attached to fishing rod in third person while crouching                                                      |
+| Gameplay | [MC-12829](https://bugs.mojang.com/browse/MC-12829)   | Flying through ladders/vines/scaffolding in creative mode slows you down                                                                  |
 | Basic    | [MC-22882](https://bugs.mojang.com/browse/MC-22882)   | Ctrl + Q won't work on Mac (disabled by default)                                                                                    |
-| Gameplay | [MC-12829](https://bugs.mojang.com/browse/MC-12829)   | Flying through ladders/vines/scaffolding in creative mode slows you down                                                            |
 | Basic    | [MC-46766](https://bugs.mojang.com/browse/MC-46766)   | Mining a block in Survival, then changing to Spectator creates a breaking animation and sound                                       |
 | Basic    | [MC-55347](https://bugs.mojang.com/browse/MC-55347)   | Title with long duration shows in other world                                                                                       |
 | Basic    | [MC-59810](https://bugs.mojang.com/browse/MC-59810)   | Cannot break blocks while sprinting (Ctrl+Click = right click on macOS) *(macOS only)*                                              |
 | Basic    | [MC-79545](https://bugs.mojang.com/browse/MC-79545)   | The experience bar disappears when too many levels are given to the player                                                          |
 | Basic    | [MC-80859](https://bugs.mojang.com/browse/MC-80859)   | Starting to drag item stacks over other compatible stacks makes the latter invisible until appearance change (stack size increases) |
 | Basic    | [MC-90683](https://bugs.mojang.com/browse/MC-90683)   | "Received unknown passenger" - Entities with differing render distances as passengers outputs error                                 |
 | Basic    | [MC-93384](https://bugs.mojang.com/browse/MC-93384)   | Bubbles appear at the feet of drowning mobs                                                                                         |
+| Basic    | [MC-105068](https://bugs.mojang.com/browse/MC-105068) | Hitting another player blocking with a shield plays normal hurt sound                                                                                      |
 | Basic    | [MC-108948](https://bugs.mojang.com/browse/MC-108948) | Boat on top of slime blocks hover over block                                                                                        |
 | Basic    | [MC-111516](https://bugs.mojang.com/browse/MC-111516) | Player flickers/turns invisible when flying at high speeds                                                                          |
 | Basic    | [MC-112730](https://bugs.mojang.com/browse/MC-112730) | Beacon beam and structure block render twice per frame                                                                              |

diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@
 ## What does this mod replace?
 This mod replaces many mods and implements fixes from some others
 
+- **[BetterShields](https://modrinth.com/mod/bettershields)**
 - **[Shift-Scroll Fix](https://www.curseforge.com/minecraft/mc-mods/shift-scroll-fix)**
 - **[ForgetMeChunk](https://www.curseforge.com/minecraft/mc-mods/forgetmechunk)**
 - **[ChunkSavingFix](https://www.curseforge.com/minecraft/mc-mods/chunk-saving-fix)**

diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc105068/LivingEntityMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc105068/LivingEntityMixin.java
@@ -0,0 +1,26 @@
+package dev.isxander.debugify.client.mixins.basic.mc105068;
+
+import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import dev.isxander.debugify.fixes.BugFix;
+import dev.isxander.debugify.fixes.FixCategory;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@BugFix(id = "MC-105068", category = FixCategory.BASIC, env = BugFix.Env.CLIENT)
+@Mixin(LivingEntity.class)
+public abstract class LivingEntityMixin extends Entity {
+    public LivingEntityMixin(EntityType<?> variant, Level world) {
+        super(variant, world);
+    }
+
+    @WrapWithCondition(method = "handleEntityEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;playSound(Lnet/minecraft/sounds/SoundEvent;FF)V"))
+    private boolean beforeCond30(LivingEntity instance, SoundEvent soundEvent, float f, float v) {
+        level().playLocalSound(getX(), getY(), getZ(), soundEvent, getSoundSource(), f, v, false);
+        return false;
+    }
+}
diff --git a/src/client/resources/debugify.client.mixins.json b/src/client/resources/debugify.client.mixins.json
@@ -8,6 +8,7 @@
   },
   "plugin": "dev.isxander.debugify.mixinplugin.MixinPlugin",
   "client": [
+    "basic.mc105068.LivingEntityMixin",
     "basic.mc108948.BoatMixin",
     "basic.mc111516.PlayerRendererMixin",
     "basic.mc112730.ChunkRenderDispatcherRenderChunkRebuildTaskMixin",

diff --git a/src/main/resources/assets/debugify/lang/en_us.json b/src/main/resources/assets/debugify/lang/en_us.json
@@ -34,6 +34,7 @@
   "debugify.fix_explanation.mc-55347": "Clears titles on disconnect.",
   "debugify.fix_explanation.mc-79545": "Clamps the experience level to the integer limit only when rendering.",
   "debugify.fix_explanation.mc-93384": "Adds the eye height to the particle spawn location.",
+  "debugify.fix_explanation.mc-105068": "Make shield break sound a local sound.",
   "debugify.fix_explanation.mc-108948": "The issue is that the client does not run the same calculations as the server. When no one is controlling the boat, the client does not run physics on the boat, causing a client de-sync. This fix simply tells the client to run some physics calculations on the boat.",
   "debugify.fix_explanation.mc-111516": "Modifies a math acos calculation to make sure the result is not more than 1.0",
   "debugify.fix_explanation.mc-112730": "Prevents beacons and other block entities from being added to the local block entity renderer list if they are already added to the global list.",