mirror of
https://github.com/barkeser2002/JMT-MCMT.git
synced 2026-09-25 01:10:04 +03:00
jediminer543
c112672bdc
Also fixed a bug with worldparallel which resulted in the world postTick event being fired before the world had finished ticking Also Also found a bug where one mod's worldgen broke to a hardlockup despite the error not occuring in any parallelised code
658 lines
30 KiB
JavaScript
658 lines
30 KiB
JavaScript
// Contains outdated retyping code; I want to keep it around as it's like many hours of work
|
|
return {
|
|
'ServerWorldEntitiesByIdFastUtkill': {
|
|
'target': {
|
|
'type': 'CLASS',
|
|
'name': 'net.minecraft.world.server.ServerWorld'
|
|
},
|
|
"transformer": function(classNode) {
|
|
print("[JMTSUPERTRANS] ServerWorldEntitiesByIdFastUtkill Transformer Called");
|
|
|
|
var opcodes = Java.type('org.objectweb.asm.Opcodes');
|
|
var asmapi = Java.type('net.minecraftforge.coremod.api.ASMAPI');
|
|
var InsnList = Java.type("org.objectweb.asm.tree.InsnList");
|
|
var InsnNode = Java.type("org.objectweb.asm.tree.InsnNode");
|
|
var VarInsnNode = Java.type("org.objectweb.asm.tree.VarInsnNode");
|
|
var FieldInsnNode = Java.type("org.objectweb.asm.tree.FieldInsnNode");
|
|
var FieldNode = Java.type("org.objectweb.asm.tree.FieldNode");
|
|
var LabelNode = Java.type("org.objectweb.asm.tree.LabelNode");
|
|
var JumpInsnNode = Java.type("org.objectweb.asm.tree.JumpInsnNode");
|
|
var MethodType = asmapi.MethodType;
|
|
|
|
var tgt = "it/unimi/dsi/fastutil/ints/Int2ObjectMap";
|
|
var replace = "java/util/Map";
|
|
var fullReplace = "java/util/concurrent/ConcurrentHashMap";
|
|
var valuesTgt = "it/unimi/dsi/fastutil/objects/ObjectCollection";
|
|
var valuesReplace = "java/util/Collection";
|
|
var itrTgtDesc = "it/unimi/dsi/fastutil/objects/ObjectIterator";
|
|
var itrRep = "java/util/Iterator"
|
|
|
|
var fields = classNode.fields;
|
|
|
|
// Doing this as default as TBH these calls are mostly synchronous anyway
|
|
// So fully concurrent-ising this likely has limited impact
|
|
//var syncOnly = false;
|
|
|
|
var syncOnly = true;//asmapi.getSystemPropertyFlag("mcmt.synconly.entitiesbyid")
|
|
//var disable = true;
|
|
|
|
if (disable) {
|
|
return classnode; // DO NOTHING
|
|
}
|
|
|
|
|
|
var tgtField = asmapi.mapField("field_217498_x");
|
|
|
|
if (!syncOnly) {
|
|
for (var i in fields) {
|
|
var fieldNode = fields[i];
|
|
|
|
if (fieldNode.name != tgtField) {
|
|
continue;
|
|
}
|
|
|
|
fieldNode.signature = fieldNode.signature.replace(tgt, replace);
|
|
fieldNode.desc = fieldNode.desc.replace(tgt, replace);
|
|
print(fieldNode.name + "|" + fieldNode.desc + "|" + fieldNode.signature);
|
|
break; // Only do once
|
|
}
|
|
} else {
|
|
print("[JMTSUPERTRANS] only synchronising field_217498_x")
|
|
}
|
|
|
|
|
|
|
|
var methods = classNode.methods;
|
|
|
|
var version = "";
|
|
|
|
var targetMethods = {
|
|
"<init>": { // "Same" for 115 and 1161
|
|
"desc": "(Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/world/storage/SaveHandler;Lnet/minecraft/world/storage/WorldInfo;Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraft/profiler/IProfiler;Lnet/minecraft/world/chunk/listener/IChunkStatusListener;)V",
|
|
"fallbackdesc": "(Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/world/storage/SaveFormat$LevelSave;Lnet/minecraft/world/storage/IServerWorldInfo;Lnet/minecraft/util/RegistryKey;Lnet/minecraft/util/RegistryKey;Lnet/minecraft/world/DimensionType;Lnet/minecraft/world/chunk/listener/IChunkStatusListener;Lnet/minecraft/world/gen/ChunkGenerator;ZJLjava/util/List;Z)V",
|
|
"update": function(methodNode) {
|
|
var instructions = methodNode.instructions;
|
|
|
|
var initdesc1152 = "(Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/world/storage/SaveHandler;Lnet/minecraft/world/storage/WorldInfo;Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraft/profiler/IProfiler;Lnet/minecraft/world/chunk/listener/IChunkStatusListener;)V";
|
|
|
|
if (methodNode.desc.equals(initdesc1152)) {
|
|
version = "1152"
|
|
} else {
|
|
version = "1161"
|
|
}
|
|
print("[JMTSUPERTRANS] mcver:" + version);
|
|
|
|
if (syncOnly) {
|
|
// Cannot concurrently access during init
|
|
return true;
|
|
}
|
|
|
|
|
|
var initTgt = asmapi.findFirstMethodCall(methodNode, MethodType.SPECIAL,
|
|
"it/unimi/dsi/fastutil/ints/Int2ObjectLinkedOpenHashMap", "<init>", "()V");
|
|
//var newTgt = asmapi.findFirstInstructionBefore(methodNode, opcodes.NEW, instructions.indexOf(initTgt))
|
|
var putTgt = asmapi.findFirstInstructionAfter(methodNode, opcodes.PUTFIELD, instructions.indexOf(initTgt))
|
|
|
|
var newTgt = initTgt;
|
|
|
|
while (newTgt.getOpcode() != opcodes.NEW) {
|
|
newTgt = newTgt.getPrevious();
|
|
}
|
|
|
|
if (initTgt == null || newTgt == null || putTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - INIT");
|
|
return false;
|
|
}
|
|
|
|
newTgt.desc = fullReplace;
|
|
initTgt.owner = fullReplace;
|
|
putTgt.desc = putTgt.desc.replace(tgt, replace);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
}
|
|
},
|
|
}
|
|
|
|
targetMethods[asmapi.mapMethod("func_241136_z_")] = { // 1161 only
|
|
"desc": "()Ljava/lang/Iterable;",
|
|
"not1152" : true,
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_241136_z_");
|
|
return true;
|
|
}
|
|
|
|
var getTgt = asmapi.findFirstInstructionAfter(methodNode, opcodes.GETFIELD, 0)
|
|
var valTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, tgt, "values", "()Lit/unimi/dsi/fastutil/objects/ObjectCollection;");
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_241136_z_");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = valTgt.desc.replace(valuesTgt, valuesReplace);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
targetMethods[asmapi.mapMethod("func_217439_j")] = { // getDragons; Same for 115 and 1161
|
|
"desc": "()Ljava/util/List;",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_217439_j");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var getTgt = asmapi.findFirstInstructionAfter(methodNode, opcodes.GETFIELD, 0)
|
|
var valTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, tgt, "values", "()Lit/unimi/dsi/fastutil/objects/ObjectCollection;");
|
|
var itrTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, valuesTgt, "iterator", "()Lit/unimi/dsi/fastutil/objects/ObjectIterator;");
|
|
|
|
if (getTgt == null || valTgt == null || itrTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_241136_z_");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = valTgt.desc.replace(valuesTgt, valuesReplace);
|
|
itrTgt.owner = valuesReplace;
|
|
itrTgt.desc = itrTgt.desc.replace(itrTgtDesc, itrRep);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
targetMethods[asmapi.mapMethod("func_217482_a")] = { // getEntities ;Same for 115 and 1161
|
|
"desc": "(Lnet/minecraft/entity/EntityType;Ljava/util/function/Predicate;)Ljava/util/List;",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_217482_a");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var getTgt = asmapi.findFirstInstructionAfter(methodNode, opcodes.GETFIELD, 0)
|
|
var valTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, tgt, "values", "()Lit/unimi/dsi/fastutil/objects/ObjectCollection;");
|
|
var itrTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, valuesTgt, "iterator", "()Lit/unimi/dsi/fastutil/objects/ObjectIterator;");
|
|
|
|
if (getTgt == null || valTgt == null || itrTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217482_a");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = valTgt.desc.replace(valuesTgt, valuesReplace);
|
|
itrTgt.owner = valuesReplace;
|
|
itrTgt.desc = itrTgt.desc.replace(itrTgtDesc, itrRep);
|
|
printInsnNode(itrTgt);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
targetMethods[asmapi.mapMethod("func_73045_a")] = { // getEntityByID ;Same for 115 and 1161
|
|
"desc": "(I)Lnet/minecraft/entity/Entity;",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_73045_a");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var getTgt = asmapi.findFirstInstructionAfter(methodNode, opcodes.GETFIELD, 0)
|
|
var valTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, tgt, "get", "(I)Ljava/lang/Object;");
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_73045_a");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = "(Ljava/lang/Object;)Ljava/lang/Object;"
|
|
|
|
var instructions = methodNode.instructions;
|
|
var insn = asmapi.buildMethodCall("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", MethodType.STATIC);
|
|
instructions.insertBefore(valTgt, insn);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
targetMethods[asmapi.mapMethod("func_217466_a")] = { // onChunkUnloading ;Same for 115 and 1161
|
|
"desc": "(Lnet/minecraft/world/chunk/Chunk;)V",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_217466_a");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var getTgt = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", 0)
|
|
var valTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, tgt, "remove", "(I)Ljava/lang/Object;");
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217466_a");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = "(Ljava/lang/Object;)Ljava/lang/Object;"
|
|
|
|
var instructions = methodNode.instructions;
|
|
var insn = asmapi.buildMethodCall("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", MethodType.STATIC);
|
|
instructions.insertBefore(valTgt, insn);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
targetMethods[asmapi.mapMethod("func_217465_m")] = { // onEntityAdded ;Same for 115 and 1161
|
|
"desc": "(Lnet/minecraft/entity/Entity;)V",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_217465_m");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var instructions = methodNode.instructions;
|
|
|
|
var getTgt = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", 0)
|
|
var valTgt = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE, tgt, "put", "(ILjava/lang/Object;)Ljava/lang/Object;", instructions.indexOf(getTgt));
|
|
|
|
var getTgt2 = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", instructions.indexOf(valTgt))
|
|
var valTgt2 = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE, tgt, "put", "(ILjava/lang/Object;)Ljava/lang/Object;", instructions.indexOf(getTgt2));
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217465_m");
|
|
return false;
|
|
}
|
|
|
|
if (getTgt2 == null || valTgt2 == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217465_m");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"
|
|
|
|
var insn = asmapi.buildMethodCall("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", MethodType.STATIC);
|
|
var il = new InsnList();
|
|
il.add(new InsnNode(opcodes.SWAP));
|
|
il.add(insn);
|
|
il.add(new InsnNode(opcodes.SWAP));
|
|
|
|
instructions.insertBefore(valTgt, il);
|
|
|
|
/*
|
|
var printTgt = getTgt.getPrevious().getPrevious();
|
|
for (var i = 0; i < 30; i++) {
|
|
printInsnNode(printTgt);
|
|
printTgt = printTgt.getNext();
|
|
}
|
|
print("------------")
|
|
*/
|
|
|
|
getTgt2.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt2.owner = replace;
|
|
valTgt2.desc = "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"
|
|
|
|
il = new InsnList();
|
|
insn = asmapi.buildMethodCall("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", MethodType.STATIC);
|
|
il.add(new InsnNode(opcodes.SWAP));
|
|
il.add(insn);
|
|
il.add(new InsnNode(opcodes.SWAP));
|
|
|
|
instructions.insertBefore(valTgt2, il);
|
|
|
|
/*
|
|
var printTgt = getTgt2.getPrevious().getPrevious();
|
|
for (var i = 0; i < 30; i++) {
|
|
printInsnNode(printTgt);
|
|
printTgt = printTgt.getNext();
|
|
}
|
|
print("------------")
|
|
*/
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
targetMethods[asmapi.mapMethod("func_72835_b")] = { // tick ;Same for 115 and 1161
|
|
"desc": "(Ljava/util/function/BooleanSupplier;)V",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_72835_b");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var instructions = methodNode.instructions;
|
|
|
|
var getTgt = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", 0)
|
|
var valTgt = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE,
|
|
"it/unimi/dsi/fastutil/objects/ObjectSet", "iterator",
|
|
"()Lit/unimi/dsi/fastutil/objects/ObjectIterator;", instructions.indexOf(getTgt));
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_72835_b");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
|
|
var insn = asmapi.buildMethodCall("org/jmt/mcmt/asmdest/ObjectIteratorHack", "intMapItrFake",
|
|
"(Ljava/util/Map;)Lit/unimi/dsi/fastutil/objects/ObjectIterator;", MethodType.STATIC);
|
|
var skipTarget = new LabelNode();
|
|
var il = new InsnList();
|
|
il.add(insn);
|
|
il.add(new JumpInsnNode(opcodes.GOTO, skipTarget));
|
|
|
|
instructions.insert(getTgt, il);
|
|
instructions.insert(valTgt, skipTarget);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
targetMethods[asmapi.mapMethod("func_225322_a")] = { // writeDebugInfo ;Same for 115 and 1161
|
|
"desc": "(Ljava/nio/file/Path;)V",
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_225322_a");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var instructions = methodNode.instructions;
|
|
|
|
var getTgt = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", 0)
|
|
var valTgt = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE, tgt, "size", "()I", instructions.indexOf(getTgt));
|
|
|
|
var getTgt2 = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", instructions.indexOf(valTgt))
|
|
var valTgt2 = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE, tgt, "values",
|
|
"()Lit/unimi/dsi/fastutil/objects/ObjectCollection;", instructions.indexOf(getTgt2));
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217465_m");
|
|
return false;
|
|
}
|
|
|
|
if (getTgt2 == null || valTgt2 == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217465_m");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
//valTgt.desc = "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"
|
|
|
|
getTgt2.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt2.owner = replace;
|
|
valTgt2.desc = valTgt2.desc.replace(valuesTgt, valuesReplace);
|
|
|
|
/*
|
|
var printTgt = getTgt.getPrevious().getPrevious();
|
|
for (var i = 0; i < 10; i++) {
|
|
printInsnNode(printTgt);
|
|
printTgt = printTgt.getNext();
|
|
}
|
|
print("------------")
|
|
*/
|
|
|
|
var printTgt = getTgt2.getPrevious().getPrevious();
|
|
for (var i = 0; i < 10; i++) {
|
|
printInsnNode(printTgt);
|
|
printTgt = printTgt.getNext();
|
|
}
|
|
print("------------")
|
|
|
|
return true;
|
|
}
|
|
}/**/
|
|
|
|
targetMethods[asmapi.mapMethod("func_217450_l")] = { // countEntities ;1152 Only
|
|
"desc": "()Lit/unimi/dsi/fastutil/objects/Object2IntMap;",
|
|
"not1161": true,
|
|
"update": function(methodNode) {
|
|
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-func_217450_l");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var instructions = methodNode.instructions;
|
|
|
|
var getTgt = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", 0)
|
|
var valTgt = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE, tgt, "values",
|
|
"()Lit/unimi/dsi/fastutil/objects/ObjectCollection;", instructions.indexOf(getTgt));
|
|
var itrTgt = valTgt.getNext();
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_72835_b");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
|
|
valTgt.owner = replace;
|
|
valTgt.desc = valTgt.desc.replace(valuesTgt, valuesReplace);
|
|
|
|
var insn = asmapi.buildMethodCall("org/jmt/mcmt/asmdest/ObjectIteratorHack", "itrWrap",
|
|
"(Ljava/lang/Iterable;)Lit/unimi/dsi/fastutil/objects/ObjectIterator;", MethodType.STATIC);
|
|
var skipTarget = new LabelNode();
|
|
var il = new InsnList();
|
|
il.add(insn);
|
|
il.add(new JumpInsnNode(opcodes.GOTO, skipTarget));
|
|
|
|
instructions.insert(valTgt, il);
|
|
instructions.insert(itrTgt, skipTarget);
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
var forgeSpecialGetEntitiesDesc = "()Ljava/util/stream/Stream;";
|
|
var forgeSpecialGetEntitiesSig = "()Ljava/util/stream/Stream<Lnet/minecraft/entity/Entity;>;"
|
|
var forgeSpecialGetEntitiesFun = function(methodNode) {
|
|
if (syncOnly) {
|
|
synchronizeMethod(methodNode, "EntitiesByID-GetEntities");
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
var getTgt = asmapi.findFirstInstructionAfter(methodNode, opcodes.GETFIELD, 0)
|
|
var valTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, tgt, "values", "()Lit/unimi/dsi/fastutil/objects/ObjectCollection;");
|
|
var itrTgt = asmapi.findFirstMethodCall(methodNode, MethodType.INTERFACE, valuesTgt, "stream", "()Ljava/util/stream/Stream;");
|
|
|
|
if (getTgt == null || valTgt == null || itrTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_241136_z_");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = valTgt.desc.replace(valuesTgt, valuesReplace);
|
|
itrTgt.owner = valuesReplace;
|
|
|
|
return true;
|
|
};
|
|
|
|
var forgeSpecialRemoveEntityName = "removeEntity"
|
|
var forgeSpecialRemoveEntityDesc = "(Lnet/minecraft/entity/Entity;Z)V"
|
|
var forgeSpecialRemoveEntityFun = function(methodNode) {
|
|
if (syncOnly) {
|
|
/*
|
|
synchronizeOn(methodNode, 0, [
|
|
new VarInsnNode(opcodes.ALOAD, 0),
|
|
new FieldInsnNode(opcodes.GETFIELD,
|
|
"net/minecraft/world/server/ServerWorld", tgtField,
|
|
"Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;")
|
|
])
|
|
*/
|
|
synchronizeMethod(methodNode, "EntitiesByID-removeEntity");
|
|
return true;
|
|
}
|
|
|
|
var instructions = methodNode.instructions;
|
|
|
|
var getTgt = getFieldAccessAfter(methodNode, opcodes.GETFIELD, "net/minecraft/world/server/ServerWorld",
|
|
tgtField, "Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;", 0)
|
|
var valTgt = asmapi.findFirstMethodCallAfter(methodNode, MethodType.INTERFACE, tgt, "remove", "(I)Ljava/lang/Object;", instructions.indexOf(getTgt));
|
|
|
|
if (getTgt == null || valTgt == null) {
|
|
print("[JMTSUPERTRANS] MISSING TARGET INSN - func_217467_h");
|
|
return false;
|
|
}
|
|
|
|
getTgt.desc = getTgt.desc.replace(tgt, replace);
|
|
valTgt.owner = replace;
|
|
valTgt.desc = "(Ljava/lang/Object;)Ljava/lang/Object;"
|
|
|
|
var insn = asmapi.buildMethodCall("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", MethodType.STATIC);
|
|
|
|
instructions.insertBefore(valTgt, insn);
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
for (var i in methods) {
|
|
var methodNode = methods[i];
|
|
|
|
var op = targetMethods[methodNode.name];
|
|
if (op != undefined && (op.desc == methodNode.desc || op.fallbackdesc == methodNode.desc)) {
|
|
if (op.fallbackdesc == methodNode.desc) {
|
|
print("[JMTSUPERTRANS] 1.16 WARNING")
|
|
}
|
|
print("[JMTSUPERTRANS] updating method: " + methodNode.name + methodNode.desc)
|
|
var result = op.update(methodNode)
|
|
op.result = result;
|
|
}
|
|
else if (methodNode.desc == forgeSpecialGetEntitiesDesc
|
|
&& methodNode.signature == forgeSpecialGetEntitiesSig) {
|
|
print("[JMTSUPERTRANS] FOUND FORGE SPECIAL GETENTITIES!!!")
|
|
|
|
print("[JMTSUPERTRANS] updating method: " + methodNode.name + methodNode.desc)
|
|
forgeSpecialGetEntitiesFun(methodNode);
|
|
} else if (methodNode.desc == forgeSpecialRemoveEntityDesc
|
|
&& methodNode.name == forgeSpecialRemoveEntityName) {
|
|
print("[JMTSUPERTRANS] FOUND FORGE SPECIAL REMOVEENTITY!!!")
|
|
|
|
print("[JMTSUPERTRANS] updating method: " + methodNode.name + methodNode.desc)
|
|
forgeSpecialRemoveEntityFun(methodNode);
|
|
}
|
|
}
|
|
|
|
for (var o in targetMethods) {
|
|
if (targetMethods[o].result != true) {
|
|
if (targetMethods[o]["not"+version]) {
|
|
continue;
|
|
}
|
|
print("[JMTSUPERTRANS] failed to update method: " + o + targetMethods[o].desc)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
return classNode;
|
|
}
|
|
}
|
|
} |