dev-only patch for fixing some mods that didn't load in dev before.

This commit is contained in:
FalsePattern committed 2022-07-23 00:49:56 +02:00
1 parent 356a980bc7
commit 2268011f5d
4 files changed
+89 -7

No files matched your search

@@ -2,6 +2,7 @@ package com.falsepattern.endlessids.asm;
import com.falsepattern.endlessids.Tags;
import com.falsepattern.endlessids.asm.transformer.ChunkProviderSuperPatcher;
import com.falsepattern.endlessids.asm.transformer.DevFixer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.objectweb.asm.ClassReader;
@@ -29,7 +30,7 @@ public class IETransformer implements IClassTransformer {
public byte[] transform(final String name, final String transformedName, final byte[] bytes) {
if (bytes == null) {
return bytes;
return null;
}
ClassEdit edit = ClassEdit.get(transformedName);
final ClassNode cn = new ClassNode(Opcodes.ASM5);
@@ -39,9 +40,12 @@ public class IETransformer implements IClassTransformer {
if (cn.interfaces.contains("apu") || cn.interfaces.contains("net/minecraft/world/chunk/IChunkProvider")) {
edit = ClassEdit.ChunkProviderSuperPatcher;
} else {
return bytes;
return isObfuscated ? bytes : DevFixer.fixDev(bytes);
}
}
if (!isObfuscated) {
DevFixer.transform(cn);
}
IETransformer.logger.debug("Patching {} with {}...", transformedName, edit.getName());
try {
edit.getTransformer().transform(cn, IETransformer.isObfuscated);
@@ -0,0 +1,78 @@
package com.falsepattern.endlessids.asm.transformer;
import com.falsepattern.endlessids.asm.ClassEdit;
import com.falsepattern.endlessids.asm.IClassNodeTransformer;
import com.falsepattern.endlessids.asm.IETransformer;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import lombok.val;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldInsnNode;
import org.objectweb.asm.util.CheckClassAdapter;
import net.minecraft.launchwrapper.Launch;
import java.io.IOException;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DevFixer {
private static final ClassNode blocks;
static {
if (IETransformer.isObfuscated) {
blocks = null;
} else {
try {
byte[] blox = Launch.classLoader.getClassBytes("net/minecraft/init/Blocks");
blocks = new ClassNode(Opcodes.ASM5);
final ClassReader reader = new ClassReader(blox);
reader.accept(blocks, 0);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
public static byte[] fixDev(byte[] classBytes) {
if (IETransformer.isObfuscated) {
return classBytes;
}
val cn = new ClassNode(Opcodes.ASM5);
val reader = new ClassReader(classBytes);
reader.accept(cn, 0);
transform(cn);
val writer = new ClassWriter(0);
val check = new CheckClassAdapter(writer);
cn.accept(check);
return writer.toByteArray();
}
@SneakyThrows
public static void transform(final ClassNode cn) {
if (IETransformer.isObfuscated) {
return;
}
for (val method: cn.methods) {
val instructions = method.instructions;
int insnCount = instructions.size();
for (int i = 0; i < insnCount; i++) {
val insn = instructions.get(i);
if (insn instanceof FieldInsnNode) {
val field = (FieldInsnNode) insn;
if (field.getOpcode() == Opcodes.GETSTATIC &&
field.owner.equals("net/minecraft/init/Blocks")) {
for (val blockField: blocks.fields) {
if (blockField.name.equals(field.name) &&
!blockField.desc.equals(field.desc)) {
field.desc = blockField.desc;
}
}
}
}
}
}
}
}
@@ -28,14 +28,14 @@ public enum TargetedMod implements ITargetedMod {
GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")),
ICG("Immersive Cavegen", true, startsWith("immersivecavegen")),
LOTR("LOTR Mod", false, startsWith("lotrmod")),
MFQM("More Fun Quicksand Mod", false, startsWith("morefunquicksandmod-")),
MFQM("More Fun Quicksand Mod", true, startsWith("morefunquicksandmod-")),
NATURESCOMPASS("Nature's Compass", true, startsWith("naturescompass")),
NETHERLICIOUS("Netherlicious", true, startsWith("netherlicious-")),
RTG("Realistic Terrain Generation", true, startsWith("rtg-")),
THAUMCRAFT("Thaumcraft", true, startsWith("thaumcraft")),
TROPICRAFT("Tropicraft", true, startsWith("tropicraft-")),
TWILIGHTFOREST("Twilight Forest", true, startsWith("twilightforest")),
UBC("Underground Biomes Constructs", false, startsWith("undergroundbiomesconstructs-")),
UBC("Underground Biomes Constructs", true, startsWith("undergroundbiomesconstructs-")),
WORLDEDIT("WorldEdit", false, startsWith("worldedit-")),
;