diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java index 2b9cdb2..4a7b0e5 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -10,7 +10,6 @@ import com.falsepattern.endlessids.asm.transformer.FmlRegistry; import com.falsepattern.endlessids.asm.transformer.VanillaItemInWorldManager; import com.falsepattern.endlessids.asm.transformer.VanillaPlayerControllerMP; import com.falsepattern.endlessids.asm.transformer.VanillaS26PacketMapChunkBulk; -import com.falsepattern.endlessids.asm.transformer.VanillaS24PacketBlockActivation; import java.util.Map; public enum ClassEdit @@ -25,7 +24,7 @@ public enum ClassEdit //VanillaNetHandlerPlayClient(new VanillaNetHandlerPlayClient(), new String[] { "net.minecraft.client.network.NetHandlerPlayClient" }), //VanillaS21PacketChunkData(new VanillaS21PacketChunkData(), new String[] { "net.minecraft.network.play.server.S21PacketChunkData" }), //VanillaS22PacketMultiBlockChange(new VanillaS22PacketMultiBlockChange(), new String[] { "net.minecraft.network.play.server.S22PacketMultiBlockChange" }), - VanillaS24PacketBlockActivation(new VanillaS24PacketBlockActivation(), new String[] { "net.minecraft.network.play.server.S24PacketBlockAction" }), + //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" }), diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaS24PacketBlockActivation.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaS24PacketBlockActivation.java deleted file mode 100644 index 6e796fa..0000000 --- a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaS24PacketBlockActivation.java +++ /dev/null @@ -1,22 +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 VanillaS24PacketBlockActivation implements IClassNodeTransformer -{ - public VanillaS24PacketBlockActivation() { - super(); - } - - @Override - public void transform(final ClassNode cn, final boolean obfuscated) { - MethodNode method = AsmUtil.findMethod(cn, Name.packet_readPacketData); - AsmUtil.transformInlinedSizeMethod(cn, method, 4095, 65535); - method = AsmUtil.findMethod(cn, Name.packet_writePacketData); - AsmUtil.transformInlinedSizeMethod(cn, method, 4095, 65535); - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S24PacketBlockActionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S24PacketBlockActionMixin.java new file mode 100644 index 0000000..0ff7bcd --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S24PacketBlockActionMixin.java @@ -0,0 +1,16 @@ +package com.falsepattern.endlessids.mixin.mixins.common; + +import net.minecraft.network.play.server.S24PacketBlockAction; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(S24PacketBlockAction.class) +public abstract class S24PacketBlockActionMixin { + @ModifyConstant(method = {"readPacketData", "writePacketData"}, + constant = @Constant(intValue = 4095), + require = 2) + private int extend1(int constant) { + return 65535; + } +} 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 49f9778..cd1bb16 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -18,6 +18,7 @@ public enum Mixin { ExtendedBlockStorageMixin(builder(Side.COMMON).mixin("ExtendedBlockStorageMixin")), S21PacketChunkDataMixin(builder(Side.COMMON).mixin("S21PacketChunkDataMixin")), S22PacketMultiBlockChangeMixin(builder(Side.COMMON).mixin("S22PacketMultiBlockChangeMixin")), + S24PacketBlockActionMixin(builder(Side.COMMON).mixin("S24PacketBlockActionMixin")), NetHandlerPlayClientMixin(builder(Side.CLIENT).mixin("NetHandlerPlayClientMixin")), RenderGlobalMixin(builder(Side.CLIENT).mixin("RenderGlobalMixin")), ;