diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java index d98df4e..c78c8c0 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -16,13 +16,12 @@ import com.falsepattern.endlessids.asm.transformer.VanillaS22PacketMultiBlockCha import com.falsepattern.endlessids.asm.transformer.VanillaNetHandlerPlayClient; import com.falsepattern.endlessids.asm.transformer.VanillaDataWatcher; import com.falsepattern.endlessids.asm.transformer.VanillaStatList; -import com.falsepattern.endlessids.asm.transformer.VanillaBlockFire; import java.util.Map; public enum ClassEdit { //SelfHooks(new SelfHooks(), new String[] { "com.falsepattern.endlessids.Hooks" }), - VanillaBlockFire(new VanillaBlockFire(), new String[] { "net.minecraft.block.BlockFire" }), + //VanillaBlockFire(new VanillaBlockFire(), new String[] { "net.minecraft.block.BlockFire" }), VanillaStatList(new VanillaStatList(), new String[] { "net.minecraft.stats.StatList" }), //VanillaAnvilChunkLoader(new VanillaAnvilChunkLoader(), new String[] { "net.minecraft.world.chunk.storage.AnvilChunkLoader" }), //VanillaChunk(new VanillaChunk(), new String[] { "net.minecraft.world.chunk.Chunk" }), diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaBlockFire.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaBlockFire.java deleted file mode 100644 index ebfd5d6..0000000 --- a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaBlockFire.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.falsepattern.endlessids.asm.transformer; - -import com.falsepattern.endlessids.asm.AsmTransformException; -import com.falsepattern.endlessids.asm.AsmUtil; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.ClassNode; -import com.falsepattern.endlessids.asm.IClassNodeTransformer; - -public class VanillaBlockFire implements IClassNodeTransformer -{ - public VanillaBlockFire() { - super(); - } - - @Override - public void transform(final ClassNode cn, final boolean obfuscated) { - boolean found = false; - for (final MethodNode method : cn.methods) { - if (AsmUtil.transformInlinedSizeMethod(cn, method, 4096, 32768, true)) { - found = true; - } - } - if (!found) { - throw new AsmTransformException("can't find 4096 constant in any method"); - } - } -} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/BlockFireMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/BlockFireMixin.java new file mode 100644 index 0000000..0e03909 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/BlockFireMixin.java @@ -0,0 +1,17 @@ +package com.falsepattern.endlessids.mixin.mixins.common; + +import net.minecraft.block.BlockFire; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(BlockFire.class) +public abstract class BlockFireMixin { + @ModifyConstant(method = {"", "rebuildFireInfo", "getFlammability", "getEncouragement"}, + constant = @Constant(intValue = 4096), + remap = false, + require = 1) + private static int extendIDs(int constant) { + return 32768; + } +} 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 85e05ed..de8effc 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -9,6 +9,7 @@ import java.util.Set; public enum Mixin { AnvilChunkLoaderMixin(builder(Side.COMMON).mixin("AnvilChunkLoaderMixin")), ChunkMixin(builder(Side.COMMON).mixin("ChunkMixin")), + BlockFireMixin(builder(Side.COMMON).mixin("BlockFireMixin")), WorldMixin(builder(Side.COMMON).mixin("WorldMixin")), ExtendedBlockStorageMixin(builder(Side.COMMON).mixin("ExtendedBlockStorageMixin")), S21PacketChunkDataMixin(builder(Side.COMMON).mixin("S21PacketChunkDataMixin")),