diff --git a/Forge/resource/transformers.js b/Forge/resource/transformers.js index 7d2362d..e884816 100644 --- a/Forge/resource/transformers.js +++ b/Forge/resource/transformers.js @@ -1,5 +1,4 @@ var FieldInsnNode = Java.type('org.objectweb.asm.tree.FieldInsnNode'); -var InsnList = Java.type('org.objectweb.asm.tree.InsnList'); var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode'); var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); @@ -40,10 +39,8 @@ function initializeCoreMod() { 'transformer': function (cn) { cn.methods.forEach(function (mn) { if (mn.name === 'func_174884_b') { - var il = new InsnList(); - il.add(new VarInsnNode(Opcodes.ALOAD, 0)); - il.add(new InsnNode(Opcodes.ARETURN)); - mn.instructions.insert(il); + mn.instructions.insert(new InsnNode(Opcodes.ARETURN)); + mn.instructions.insert(new VarInsnNode(Opcodes.ALOAD, 0)); } }); return cn; diff --git a/Forge/source/customskinloader/forge/ForgeMod.java b/Forge/source/customskinloader/forge/ForgeMod.java index 48666f9..288ef1f 100644 --- a/Forge/source/customskinloader/forge/ForgeMod.java +++ b/Forge/source/customskinloader/forge/ForgeMod.java @@ -1,10 +1,12 @@ package customskinloader.forge; import customskinloader.CustomSkinLoader; - +import net.minecraftforge.fml.ExtensionPoint; +import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; +import net.minecraftforge.fml.network.FMLNetworkConstants; +import org.apache.commons.lang3.tuple.Pair; /** * Forge Mod Container @@ -20,8 +22,15 @@ import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent; certificateFingerprint = "52885f395e68f42e9b3b629ba56ecf606f7d4269" )//1.13- public class ForgeMod { + public ForgeMod() { + try { + this.setExtensionPoint(); + } catch (Throwable ignored) { + // before forge-1.13.2-25.0.103 + } + } - @EventHandler + @Mod.EventHandler public void fingerprintError(FMLFingerprintViolationEvent event) { if (event.isDirectory()) return;//Development Environment @@ -38,4 +47,9 @@ public class ForgeMod { throw new RuntimeException("Fingerprint ERROR, please **DO NOT MODIFY** any mod."); } + + // Make sure the mod being absent on the other network side does not cause the client to display the server as incompatible after forge-1.13.2-25.0.107. + private void setExtensionPoint() { + ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (remote, isServer) -> true)); + } } \ No newline at end of file diff --git a/Forge/source/net/minecraftforge/fml/ExtensionPoint.java b/Forge/source/net/minecraftforge/fml/ExtensionPoint.java new file mode 100644 index 0000000..b985164 --- /dev/null +++ b/Forge/source/net/minecraftforge/fml/ExtensionPoint.java @@ -0,0 +1,10 @@ +package net.minecraftforge.fml; + +import java.util.function.BiPredicate; +import java.util.function.Supplier; + +import org.apache.commons.lang3.tuple.Pair; + +public class ExtensionPoint { + public static ExtensionPoint, BiPredicate>> DISPLAYTEST; +} diff --git a/Forge/source/net/minecraftforge/fml/ModLoadingContext.java b/Forge/source/net/minecraftforge/fml/ModLoadingContext.java new file mode 100644 index 0000000..d42346f --- /dev/null +++ b/Forge/source/net/minecraftforge/fml/ModLoadingContext.java @@ -0,0 +1,13 @@ +package net.minecraftforge.fml; + +import java.util.function.Supplier; + +public class ModLoadingContext { + public static ModLoadingContext get() { + return null; + } + + public void registerExtensionPoint(ExtensionPoint point, Supplier extension) { + + } +} diff --git a/Forge/source/net/minecraftforge/fml/network/FMLNetworkConstants.java b/Forge/source/net/minecraftforge/fml/network/FMLNetworkConstants.java new file mode 100644 index 0000000..8bbbe0c --- /dev/null +++ b/Forge/source/net/minecraftforge/fml/network/FMLNetworkConstants.java @@ -0,0 +1,5 @@ +package net.minecraftforge.fml.network; + +public class FMLNetworkConstants { + public static String IGNORESERVERONLY; +}