diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java index 4a7b0e5..74bee09 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -9,7 +9,6 @@ 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 com.falsepattern.endlessids.asm.transformer.VanillaS26PacketMapChunkBulk; import java.util.Map; public enum ClassEdit @@ -25,7 +24,7 @@ public enum ClassEdit //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" }), - VanillaS26PacketMapChunkBulk(new VanillaS26PacketMapChunkBulk(), new String[] { "net.minecraft.network.play.server.S26PacketMapChunkBulk" }), + //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" }), VanillaItemInWorldManager(new VanillaItemInWorldManager(), new String[] { "net.minecraft.server.management.ItemInWorldManager" }), diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaS26PacketMapChunkBulk.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaS26PacketMapChunkBulk.java deleted file mode 100644 index d2dba36..0000000 --- a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaS26PacketMapChunkBulk.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 VanillaS26PacketMapChunkBulk implements IClassNodeTransformer -{ - public VanillaS26PacketMapChunkBulk() { - super(); - } - - @Override - public void transform(final ClassNode cn, final boolean obfuscated) { - final MethodNode method = AsmUtil.findMethod(cn, Name.packet_readPacketData); - AsmUtil.transformInlinedSizeMethod(cn, method, 8192, 12288, false); - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S26PacketMapChunkBulkMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S26PacketMapChunkBulkMixin.java new file mode 100644 index 0000000..e65c130 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S26PacketMapChunkBulkMixin.java @@ -0,0 +1,16 @@ +package com.falsepattern.endlessids.mixin.mixins.common; + +import net.minecraft.network.play.server.S26PacketMapChunkBulk; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(S26PacketMapChunkBulk.class) +public abstract class S26PacketMapChunkBulkMixin { + @ModifyConstant(method = "readPacketData", + constant = @Constant(intValue = 0x2000), + require = 1) + private int extend1(int constant) { + return constant + 0x1000; + } +} 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 cd1bb16..a66215e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -19,6 +19,7 @@ public enum Mixin { S21PacketChunkDataMixin(builder(Side.COMMON).mixin("S21PacketChunkDataMixin")), S22PacketMultiBlockChangeMixin(builder(Side.COMMON).mixin("S22PacketMultiBlockChangeMixin")), S24PacketBlockActionMixin(builder(Side.COMMON).mixin("S24PacketBlockActionMixin")), + S26PacketMapChunkBulkMixin(builder(Side.COMMON).mixin("S26PacketMapChunkBulkMixin")), NetHandlerPlayClientMixin(builder(Side.CLIENT).mixin("NetHandlerPlayClientMixin")), RenderGlobalMixin(builder(Side.CLIENT).mixin("RenderGlobalMixin")), ;