WorldEdit

This commit is contained in:
FalsePattern committed 2022-03-22 13:17:19 +01:00
1 parent a6420b7580
commit 14a6897297
6 files changed
+50 -44

No files matched your search

@@ -1,7 +1,6 @@
package com.falsepattern.endlessids.asm;
import java.util.HashMap;
import com.falsepattern.endlessids.asm.transformer.WorldEditBaseBlock;
import com.falsepattern.endlessids.asm.transformer.FmlRegistry;
import java.util.Map;
@@ -23,12 +22,13 @@ public enum ClassEdit
//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" }),
FmlRegistry(new FmlRegistry(), new String[] { "cpw.mods.fml.common.registry.GameData", "cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry" }),
//CofhBlockHelper(new CofhBlockHelper(), new String[] { "cofh.lib.util.helpers.BlockHelper" }),
//UndergroundBiomesOreUBifier(new UndergroundBiomesOreUBifier(), new String[] { "exterminatorJeff.undergroundBiomes.worldGen.OreUBifier" }),
//UndergroundBiomesBiomeUndergroundDecorator(new UndergroundBiomesBiomeUndergroundDecorator(), new String[] { "exterminatorJeff.undergroundBiomes.worldGen.BiomeUndergroundDecorator" }),
//MFQM(new MFQM(), new String[] { "MoreFunQuicksandMod.main.MFQM" }),
WorldEditBaseBlock(new WorldEditBaseBlock(), new String[] { "com.sk89q.worldedit.blocks.BaseBlock" });
//WorldEditBaseBlock(new WorldEditBaseBlock(), new String[] { "com.sk89q.worldedit.blocks.BaseBlock" })
;
private static final Map<String, ClassEdit> editMap;
private final IClassNodeTransformer transformer;
@@ -1,39 +0,0 @@
package com.falsepattern.endlessids.asm.transformer;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.endlessids.constants.VanillaConstants;
import lombok.val;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.LdcInsnNode;
import com.falsepattern.endlessids.asm.AsmUtil;
import org.objectweb.asm.tree.ClassNode;
import com.falsepattern.endlessids.asm.IClassNodeTransformer;
public class WorldEditBaseBlock implements IClassNodeTransformer
{
public WorldEditBaseBlock() {
super();
}
@Override
public void transform(final ClassNode cn, final boolean obfuscated) {
final MethodNode method = AsmUtil.findMethod(cn, "internalSetId", true);
if (method == null) {
return;
}
AsmUtil.transformInlinedSizeMethod(cn, method, VanillaConstants.maxBlockID, ExtendedConstants.maxBlockID);
final InsnList code = method.instructions;
val iter = code.iterator();
while (iter.hasNext()) {
val insn = iter.next();
if (insn.getType() == 9 && ((LdcInsnNode)insn).cst instanceof String) {
final String string = (String)((LdcInsnNode)insn).cst;
if (string.contains(Integer.toString(VanillaConstants.maxBlockID))) {
((LdcInsnNode)insn).cst = string.replace(Integer.toString(VanillaConstants.maxBlockID), Integer.toString(ExtendedConstants.maxBlockID));
break;
}
}
}
}
}
@@ -0,0 +1,36 @@
package com.falsepattern.endlessids.mixin.mixins.common.worldedit;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.sk89q.worldedit.blocks.BaseBlock;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
@Mixin(BaseBlock.class)
public abstract class BaseBlockMixin {
private int idExtended;
/**
* @author FalsePattern
* @reason ID limit extension
*/
@Overwrite
protected final void internalSetId(int id) {
if (id > ExtendedConstants.maxBlockID) {
throw new IllegalArgumentException("Can't have a block ID above " + ExtendedConstants.maxBlockID + " (" + id + " given)");
} else if (id < 0) {
throw new IllegalArgumentException("Can't have a block ID below 0");
} else {
this.idExtended = id;
}
}
/**
* @author FalsePattern
* @reason ID limit extension
*/
@Overwrite
public int getId() {
return idExtended;
}
}
@@ -50,8 +50,11 @@ public enum Mixin {
//END DragonAPI->common
//BEGIN MFQM->common
MFQMMixin(builder(Side.COMMON).target(TargetedMod.MFQM).mixin("mfqm.MFQMMixin")),
MFQMDataWatcherMixin(builder(Side.COMMON).target(TargetedMod.MFQM).condition(() -> IEConfig.extendDataWatcher).mixin("mfqm.MFQMDataWatcherMixin"))
MFQMDataWatcherMixin(builder(Side.COMMON).target(TargetedMod.MFQM).condition(() -> IEConfig.extendDataWatcher).mixin("mfqm.MFQMDataWatcherMixin")),
//END MFQM->common
//BEGIN WorldEdit->common
BaseBlockMixin(builder(Side.COMMON).target(TargetedMod.WORLDEDIT).mixin("worldedit.BaseBlockMixin")),
//END WorldEdit->common
;
public final String mixin;
@@ -11,7 +11,9 @@ public enum TargetedMod {
UBC("Underground Biomes Constructs", "undergroundbiomesconstructs-", "", false),
COFHLIB("CoFH Lib", "cofhlib-", "", false),
DRAGONAPI("DragonAPI", "dragonapi", "", false),
MFQM("More Fun Quicksand Mod", "morefunquicksandmod-", "", false);
MFQM("More Fun Quicksand Mod", "morefunquicksandmod-", "", false),
WORLDEDIT("WorldEdit", "worldedit-", "", false),
;
public final String modName;
public final String jarNamePrefixLowercase;