Cleanup Explosion patch but keep bin compatibility by using asm hacks. …

…Closes #9817
MinecraftForge · Dec 21, 2023 · ed2ba0f · ed2ba0f
1 parent b041189
commit ed2ba0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/patches/minecraft/net/minecraft/world/level/Explosion.java.patch b/patches/minecraft/net/minecraft/world/level/Explosion.java.patch
@@ -8,20 +8,3 @@
        Vec3 vec3 = new Vec3(this.x, this.y, this.z);
 
        for(Entity entity : list) {
-@@ -345,6 +_,16 @@
-
-    public List<BlockPos> getToBlow() {
-       return this.toBlow;
-+   }
-+
-+   @Deprecated(forRemoval = true, since = "1.20.4")
-+   public Vec3 getPosition() {
-+      return this.center();
-+   }
-+
-+   @Nullable
-+   public Entity getExploder() {
-+      return this.source;
-    }
-
-    public Explosion.BlockInteraction getBlockInteraction() {
diff --git a/src/main/resources/coremods/add_bouncer_method.js b/src/main/resources/coremods/add_bouncer_method.js
@@ -7,7 +7,9 @@ var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode')
 
 function initializeCoreMod() {
     return {
-        "getLanguage_bouncer": addBouncer("net.minecraft.network.play.client.CClientSettingsPacket", "func_149524_c", "getLanguage", "()Ljava/lang/String;"),
+        //TODO: Remove in 1.20.5+
+        "getPosition_bouncer": addBouncer("net.minecraft.world.level.Explosion", "m_307721_", "getPosition", "()Lnet/minecraft/world/phys/Vec3;"),
+        "getExploder_bouncer": addBouncer("net.minecraft.world.level.Explosion", "m_253049_", "getExploder", "()Lnet/minecraft/world/entity/Entity;"),
     }
 }