diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java index 74bee09..e861935 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -8,7 +8,6 @@ import com.falsepattern.endlessids.asm.transformer.UndergroundBiomesOreUBifier; import com.falsepattern.endlessids.asm.transformer.CofhBlockHelper; import com.falsepattern.endlessids.asm.transformer.FmlRegistry; import com.falsepattern.endlessids.asm.transformer.VanillaItemInWorldManager; -import com.falsepattern.endlessids.asm.transformer.VanillaPlayerControllerMP; import java.util.Map; public enum ClassEdit @@ -26,7 +25,7 @@ public enum ClassEdit //VanillaS24PacketBlockActivation(new VanillaS24PacketBlockActivation(), new String[] { "net.minecraft.network.play.server.S24PacketBlockAction" }), //VanillaS26PacketMapChunkBulk(new VanillaS26PacketMapChunkBulk(), new String[] { "net.minecraft.network.play.server.S26PacketMapChunkBulk" }), //VanillaRenderGlobal(new VanillaRenderGlobal(), new String[] { "net.minecraft.client.renderer.RenderGlobal" }), - VanillaPlayerControllerMP(new VanillaPlayerControllerMP(), new String[] { "net.minecraft.client.multiplayer.PlayerControllerMP" }), + //VanillaPlayerControllerMP(new VanillaPlayerControllerMP(), new String[] { "net.minecraft.client.multiplayer.PlayerControllerMP" }), VanillaItemInWorldManager(new VanillaItemInWorldManager(), new String[] { "net.minecraft.server.management.ItemInWorldManager" }), //VanillaWorld(new VanillaWorld(), new String[] { "net.minecraft.world.World" }), FmlRegistry(new FmlRegistry(), new String[] { "cpw.mods.fml.common.registry.GameData", "cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry" }), diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaPlayerControllerMP.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaPlayerControllerMP.java deleted file mode 100644 index ac6d714..0000000 --- a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaPlayerControllerMP.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.falsepattern.endlessids.asm.transformer; - -import org.objectweb.asm.tree.MethodNode; -import com.falsepattern.endlessids.asm.AsmUtil; -import com.falsepattern.endlessids.asm.Name; -import org.objectweb.asm.tree.ClassNode; -import com.falsepattern.endlessids.asm.IClassNodeTransformer; - -public class VanillaPlayerControllerMP implements IClassNodeTransformer -{ - public VanillaPlayerControllerMP() { - super(); - } - - @Override - public void transform(final ClassNode cn, final boolean obfuscated) { - final MethodNode method = AsmUtil.findMethod(cn, Name.playerControllerMP_onPlayerDestroyBlock); - AsmUtil.transformInlinedSizeMethod(cn, method, 12, 16); - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PlayerControllerMPMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PlayerControllerMPMixin.java new file mode 100644 index 0000000..7f18862 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PlayerControllerMPMixin.java @@ -0,0 +1,16 @@ +package com.falsepattern.endlessids.mixin.mixins.common; + +import net.minecraft.client.multiplayer.PlayerControllerMP; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(PlayerControllerMP.class) +public abstract class PlayerControllerMPMixin { + @ModifyConstant(method = "onPlayerDestroyBlock", + constant = @Constant(intValue = 12, ordinal = 0), + require = 1) + private int extend1(int constant) { + return 16; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index a66215e..88789f0 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -20,6 +20,7 @@ public enum Mixin { S22PacketMultiBlockChangeMixin(builder(Side.COMMON).mixin("S22PacketMultiBlockChangeMixin")), S24PacketBlockActionMixin(builder(Side.COMMON).mixin("S24PacketBlockActionMixin")), S26PacketMapChunkBulkMixin(builder(Side.COMMON).mixin("S26PacketMapChunkBulkMixin")), + PlayerControllerMPMixin(builder(Side.COMMON).mixin("PlayerControllerMPMixin")), NetHandlerPlayClientMixin(builder(Side.CLIENT).mixin("NetHandlerPlayClientMixin")), RenderGlobalMixin(builder(Side.CLIENT).mixin("RenderGlobalMixin")), ;