From 84ecd43af2e666e0d1205bc7202145e7af7b0ddd Mon Sep 17 00:00:00 2001 From: Adubbz Date: Thu, 17 Oct 2013 20:40:22 +1100 Subject: [PATCH] Yay for forgetting to account for things! --- common/biomesoplenty/asm/smoothing/block/BlockFluid.java | 5 ++++- common/biomesoplenty/asm/smoothing/block/BlockGrass.java | 5 ++++- common/biomesoplenty/asm/smoothing/block/BlockLeaves.java | 5 ++++- common/biomesoplenty/asm/smoothing/block/BlockTallGrass.java | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/common/biomesoplenty/asm/smoothing/block/BlockFluid.java b/common/biomesoplenty/asm/smoothing/block/BlockFluid.java index c7ff1c63a..6b65ae1d1 100644 --- a/common/biomesoplenty/asm/smoothing/block/BlockFluid.java +++ b/common/biomesoplenty/asm/smoothing/block/BlockFluid.java @@ -70,7 +70,10 @@ public class BlockFluid toInject.add(new VarInsnNode(ILOAD, 2)); toInject.add(new VarInsnNode(ILOAD, 3)); toInject.add(new VarInsnNode(ILOAD, 4)); - toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getWaterColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); + if (obfuscated) + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getWaterColourMultiplier", "(Lacf;III)I")); + else + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getWaterColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); toInject.add(new InsnNode(IRETURN)); m.instructions.insertBefore(targetNode, toInject); diff --git a/common/biomesoplenty/asm/smoothing/block/BlockGrass.java b/common/biomesoplenty/asm/smoothing/block/BlockGrass.java index 14eda10fb..674b482a2 100644 --- a/common/biomesoplenty/asm/smoothing/block/BlockGrass.java +++ b/common/biomesoplenty/asm/smoothing/block/BlockGrass.java @@ -68,7 +68,10 @@ public class BlockGrass toInject.add(new VarInsnNode(ILOAD, 2)); toInject.add(new VarInsnNode(ILOAD, 3)); toInject.add(new VarInsnNode(ILOAD, 4)); - toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getGrassColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); + if (obfuscated) + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getGrassColourMultiplier", "(Lacf;III)I")); + else + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getGrassColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); toInject.add(new InsnNode(IRETURN)); m.instructions.insertBefore(targetNode, toInject); diff --git a/common/biomesoplenty/asm/smoothing/block/BlockLeaves.java b/common/biomesoplenty/asm/smoothing/block/BlockLeaves.java index 48a13f7f8..e68dfabbe 100644 --- a/common/biomesoplenty/asm/smoothing/block/BlockLeaves.java +++ b/common/biomesoplenty/asm/smoothing/block/BlockLeaves.java @@ -71,7 +71,10 @@ public class BlockLeaves toInject.add(new VarInsnNode(ILOAD, 2)); toInject.add(new VarInsnNode(ILOAD, 3)); toInject.add(new VarInsnNode(ILOAD, 4)); - toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getLeavesColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); + if (obfuscated) + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getLeavesColourMultiplier", "(Lacf;III)I")); + else + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getLeavesColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); toInject.add(new InsnNode(IRETURN)); m.instructions.insertBefore(targetNode, toInject); diff --git a/common/biomesoplenty/asm/smoothing/block/BlockTallGrass.java b/common/biomesoplenty/asm/smoothing/block/BlockTallGrass.java index 9ce9232b7..8146d3676 100644 --- a/common/biomesoplenty/asm/smoothing/block/BlockTallGrass.java +++ b/common/biomesoplenty/asm/smoothing/block/BlockTallGrass.java @@ -68,7 +68,10 @@ public class BlockTallGrass toInject.add(new VarInsnNode(ILOAD, 2)); toInject.add(new VarInsnNode(ILOAD, 3)); toInject.add(new VarInsnNode(ILOAD, 4)); - toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getGrassColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); + if (obfuscated) + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getGrassColourMultiplier", "(Lacf;III)I")); + else + toInject.add(new MethodInsnNode(INVOKESTATIC, "biomesoplenty/asm/smoothing/BOPBiomeTransitionSmoothing", "getGrassColourMultiplier", "(Lnet/minecraft/world/IBlockAccess;III)I")); toInject.add(new InsnNode(IRETURN)); m.instructions.insertBefore(targetNode, toInject);