Improvements

Author: TheAndrey

src/main/java/me/theandrey/mods/sidefix/ASMHelper.java

@@ -2,6 +2,7 @@
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
 
 public final class ASMHelper {
@@ -20,4 +21,12 @@ public static byte[] writeClass(ClassNode node, int flags) {
 		node.accept(writer);
 		return writer.toByteArray();
 	}
+
+	public static Type objectType(String name) {
+		return Type.getObjectType(name.replace('.', '/'));
+	}
+
+	public static Type arrayType(Type type) {
+		return Type.getType('[' + type.getDescriptor());
+	}
 }

src/main/java/me/theandrey/mods/sidefix/ClassTransformer.java

@@ -3,6 +3,7 @@
 import java.util.ListIterator;
 import net.minecraft.launchwrapper.IClassTransformer;
 import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldInsnNode;
@@ -13,15 +14,20 @@ public class ClassTransformer implements IClassTransformer {
 
 	@Override
 	public byte[] transform(String name, String transformedName, byte[] bytes) {
-		if (bytes != null && name.equals("net.minecraftforge.fml.common.network.NetworkRegistry")) {
-			return redirectSideValues(bytes);
+		if (bytes != null) {
+			if (name.equals("net.minecraftforge.fml.common.network.NetworkRegistry") ||
+				name.equals("net.minecraftforge.fml.common.network.internal.FMLMessage")) {
+				return redirectSideValues(bytes);
+			}
 		}
 
 		return bytes;
 	}
 
 	private byte[] redirectSideValues(byte[] bytes) {
 		ClassNode clazz = ASMHelper.readClass(bytes);
+		Type sideType = ASMHelper.objectType("net.minecraftforge.fml.relauncher.Side");
+		Type constantsType = ASMHelper.objectType("me.theandrey.mods.sidefix.Constants");
 		boolean patched = false;
 
 		for (MethodNode method : clazz.methods) {
@@ -33,8 +39,9 @@ private byte[] redirectSideValues(byte[] bytes) {
 				if (node.getOpcode() == Opcodes.INVOKESTATIC) {
 					MethodInsnNode methodNode = (MethodInsnNode)node;
 
-					if (methodNode.owner.equals("net/minecraftforge/fml/relauncher/Side") && methodNode.name.equals("values")) {
-						FieldInsnNode fieldNode = new FieldInsnNode(Opcodes.GETSTATIC, "me/theandrey/mods/sidefix/LoadingPlugin", "VALID_SIDES", "[Lnet/minecraftforge/fml/relauncher/Side;");
+					if (methodNode.owner.equals(sideType.getInternalName()) && methodNode.name.equals("values")) {
+						// We can not modify Side class, so redirect values() call to constant.
+						FieldInsnNode fieldNode = new FieldInsnNode(Opcodes.GETSTATIC, constantsType.getInternalName(), "SIDES", ASMHelper.arrayType(sideType).getDescriptor());
 						iterator.set(fieldNode);
 						patched = true;
 

src/main/java/me/theandrey/mods/sidefix/Constants.java

@@ -0,0 +1,11 @@
+package me.theandrey.mods.sidefix;
+
+import net.minecraftforge.fml.relauncher.Side;
+
+public final class Constants {
+
+	public static final Side[] SIDES = {Side.CLIENT, Side.SERVER};
+
+	private Constants() {
+	}
+}

src/main/java/me/theandrey/mods/sidefix/LoadingPlugin.java

@@ -2,7 +2,6 @@
 
 import java.util.Map;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
-import net.minecraftforge.fml.relauncher.Side;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -11,7 +10,6 @@
 public class LoadingPlugin implements IFMLLoadingPlugin {
 
 	static final Logger LOGGER = LogManager.getLogger(LoadingPlugin.class);
-	public static final Side[] VALID_SIDES = {Side.CLIENT, Side.SERVER};
 
 	@Override
 	public String[] getASMTransformerClass() {