Consolidation 1.12.2

Author: Mgazul

build.gradle

@@ -30,7 +30,7 @@ repositories {
 minecraft {
     version = '1.7.10'
     mcpVersion = '9.05'
-    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    mainClass = 'red.mohist.Mohist'
     tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
     installerVersion = "1.4"
     srgExtra "PK: org/bukkit/craftbukkit org/bukkit/craftbukkit/v1_7_R4"
@@ -109,7 +109,7 @@ tasks.packageUniversal {
             'Implementation-Title'  : project.name,
             'Implementation-Version': project.version,
             'TweakClass'            : 'cpw.mods.fml.common.launcher.FMLTweaker',
-            'Main-Class'            : 'cpw.mods.fml.relauncher.ServerLaunchWrapper',
+            'Main-Class'            : 'red.mohist.Mohist',
             'Class-Path'            : generateClasspath()
     ])
 }

mohist.ver

@@ -0,0 +1 @@
+1.1

patches/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java.patch

@@ -1,12 +1,13 @@
 --- ../src-base/minecraft/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java
 +++ ../src-work/minecraft/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java
-@@ -46,7 +46,8 @@
+@@ -46,7 +46,9 @@
                                     clsName.equals("net/minecraft/server/dedicated/DedicatedServer") ||
                                     clsName.equals("cpw/mods/fml/common/FMLCommonHandler") ||
                                     clsName.startsWith("com/jcraft/jogg/") ||
 -                                   clsName.startsWith("scala/sys/")
 +                                   clsName.startsWith("scala/sys/") ||
-+                                   clsName.startsWith("net/md_5/specialsource")
++                                   clsName.startsWith("net/md_5/specialsource")||
++                                   clsName.startsWith("red/mohist")
                                     );
 
              return new MethodVisitor(Opcodes.ASM5, super.visitMethod(mAccess, mName, mDesc, mSignature, mExceptions))

patches/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java
 +++ ../src-work/minecraft/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java
-@@ -47,6 +47,16 @@
+@@ -47,6 +47,17 @@
  import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
@@ -13,11 +13,12 @@
 +import org.bukkit.craftbukkit.inventory.CraftInventory;
 +import org.bukkit.craftbukkit.inventory.CraftInventoryView;
 +import org.bukkit.event.inventory.InventoryType;
++import red.mohist.configuration.MohistConfig;
 +// Cauldron end
 
  public class FMLNetworkHandler
  {
-@@ -75,6 +85,31 @@
+@@ -75,6 +86,31 @@
              Container remoteGuiContainer = NetworkRegistry.INSTANCE.getRemoteGuiContainer(mc, entityPlayerMP, modGuiId, world, x, y, z);
              if (remoteGuiContainer != null)
              {
@@ -49,7 +50,7 @@
                  entityPlayerMP.getNextWindowId();
                  entityPlayerMP.closeContainer();
                  int windowId = entityPlayerMP.currentWindowId;
-@@ -187,17 +222,26 @@
+@@ -187,17 +223,26 @@
 
      public static void enhanceStatusQuery(JsonObject jsonobject)
      {
@@ -68,7 +69,7 @@
 +            //Uranium end
 +            */
 +            JsonObject fmlData = new JsonObject();
-+            fmlData.addProperty("type", "FML");
++            fmlData.addProperty("type", MohistConfig.instance.server_type.getValue());
 +            JsonArray modList = new JsonArray();
 +            for (ModContainer mc : Loader.instance().getActiveModList()) {
 +                JsonObject modData = new JsonObject();