Back to Thermos

Author: Mgazul

LICENSE

@@ -61,6 +61,9 @@ minecraft {
     tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
     installerVersion = "1.4"
     srgExtra "PK: org/bukkit/craftbukkit org/bukkit/craftbukkit/v1_7_R4"
+    tasks.withType(JavaCompile) {
+        options.encoding = "UTF-8"
+    }
 }
 
 group = 'red.mohist'
@@ -81,7 +84,7 @@ configurations {
 
 
 dependencies {
-    bootstrap 'pw.prok:KBootstrap:0.2.+'
+    bootstrap 'pw.prok:KBootstrapX:0.2.+'
     libraries 'org.ow2.asm:asm-all:5.0.3'
     libraries 'com.typesafe.akka:akka-actor_2.11:2.3.3'
     libraries 'com.typesafe:config:1.3.1'
@@ -111,8 +114,9 @@ dependencies {
     libraries 'net.openhft:affinity:3.0.1'
     libraries 'org.fusesource.jansi:jansi:1.11'
     libraries 'java3d:vecmath:1.3.1'
-    libraries 'colt:colt:1.2.0'
-    libraries 'org.jetbrains.kotlin:kotlin-runtime:1.1.4-2'
+    libraries 'com.koloboke:koloboke-api-jdk8:1.0.0'
+    libraries 'com.koloboke:koloboke-impl-common-jdk8:1.0.0'
+    libraries 'com.koloboke:koloboke-impl-jdk8:1.0.0'
 }
 
 packageUniversal {

build.gradle

@@ -1,6 +1,13 @@
 --- ../src-base/minecraft/cpw/mods/fml/common/FMLCommonHandler.java
 +++ ../src-work/minecraft/cpw/mods/fml/common/FMLCommonHandler.java
-@@ -37,6 +37,10 @@
+@@ -31,12 +31,17 @@
+ import net.minecraft.network.INetHandler;
+ import net.minecraft.network.NetworkManager;
+ import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.management.ServerConfigurationManager;
+ import net.minecraft.world.World;
+ import net.minecraft.world.storage.SaveHandler;
+ import net.minecraft.world.storage.WorldInfo;
 
  import org.apache.logging.log4j.Level;
  import org.apache.logging.log4j.Logger;
@@ -11,7 +18,7 @@
 
  import com.google.common.base.Joiner;
  import com.google.common.base.Strings;
-@@ -151,13 +155,7 @@
+@@ -151,13 +156,7 @@
       */
      public Side getEffectiveSide()
      {
@@ -26,14 +33,6 @@
      }
      /**
       * Raise an exception
-@@ -245,6 +243,7 @@
-     public void onPostServerTick()
-     {
-         bus().post(new TickEvent.ServerTickEvent(Phase.END));
-+        cc.uraniummc.ChunkGenerator.INSTANCE.chunkGeneratorCycle(); // KCauldron
-     }
- 
-     /**
 @@ -385,10 +384,11 @@
          {
              return;
@@ -54,22 +53,26 @@
 -        List<String> modNames = Lists.newArrayListWithExpectedSize(3);
 +        // Cauldron start    
 +        List<String> modNames = Lists.newArrayListWithExpectedSize(6);
-+        modNames.add("uranium");
-+        modNames.add("kcauldron");
++        modNames.add("thermos");
 +        modNames.add("cauldron");
 +        modNames.add("craftbukkit");
 +        modNames.add("mcpc");
++        modNames.add("kcauldron");
 +        // Cauldron end
          modNames.add("fml");
          if (!noForge)
          {
-@@ -540,8 +547,17 @@
+@@ -540,8 +547,21 @@
          bus().post(new InputEvent.KeyInputEvent());
      }
 
 +    // Cauldron start - wrapper to notify plugins for mods that bypass ServerConfigurationManager
      public void firePlayerChangedDimensionEvent(EntityPlayer player, int fromDim, int toDim)
      {
++        // Thermos - (Robotia) Ok so turns out whoever wrote this bit didn't get enough sleep.
++        // It should've gotten the dim from the fromDim ID, not the player world.
++        // The player world returns the world the player is in after transfer...!
++        // It should be fine now though.
 +        this.firePlayerChangedDimensionEvent(player, fromDim, toDim, MinecraftServer.getServer().worldServerForDimension(fromDim).getWorld());
 +    }
 +

patches/cpw/mods/fml/common/FMLCommonHandler.java.patch

@@ -14,12 +14,12 @@
              }
          }
 
-+        if (!"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
++        if (!"false".equals(System.getProperty("thermos.fastcraft.disable", "true"))) {
 +            java.util.Iterator<ModContainer> iterator = modList.iterator();
 +            while(iterator.hasNext()) {
 +                ModContainer container = iterator.next();
 +                if ("FastCraft".equals(container.getModId())) {
-+                    FMLLog.log(Level.WARN, "Found FastCraft mod, removing it...");
++                    FMLLog.log(Level.WARN, "[Thermos] Sorry, the FastCraft mod will not be loaded due to Thermos compatibility issues. If you still wish to enable it, add \"-thermos.fastcraft.disable=false\" to your server launch script.");
 +                    iterator.remove();
 +                }
 +            }

patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch

@@ -1,25 +1,26 @@
 --- ../src-base/minecraft/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java
 +++ ../src-work/minecraft/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java
-@@ -9,6 +9,7 @@
- import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
- import cpw.mods.fml.common.registry.GameData;
- import cpw.mods.fml.relauncher.Side;
-+import net.minecraft.server.MinecraftServer;
- 
- enum FMLHandshakeServerState implements IHandshakeState<FMLHandshakeServerState>
- {
-@@ -37,8 +38,13 @@
+@@ -19,6 +19,10 @@
+         {
+             NetworkDispatcher dispatcher = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER).get();
+             int overrideDim = dispatcher.serverInitiateHandshake();
++            if(overrideDim == -100000)
++            {
++            	return ERROR;
++            }
+             ctx.writeAndFlush(FMLHandshakeMessage.makeCustomChannelRegistration(NetworkRegistry.INSTANCE.channelNamesFor(Side.SERVER))).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
+             ctx.writeAndFlush(new FMLHandshakeMessage.ServerHello(overrideDim)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
+             return HELLO;
+@@ -37,7 +41,11 @@
              }
 
              FMLHandshakeMessage.ModList client = (FMLHandshakeMessage.ModList)msg;
 -            FMLLog.info("Client attempting to join with %d mods : %s", client.modListSize(), client.modListAsString());
-+            if (net.minecraft.server.MinecraftServer.uraniumConfig.loggingClientModList.getValue()) {
++            if (net.minecraft.server.MinecraftServer.thermosConfig.loggingClientModList.getValue()) {
 +                FMLLog.info("Client attempting to join with %d mods : %s", client.modListSize(), client.modListAsString());
 +            } else {
 +                FMLLog.info("Client attempting to join with %d mods", client.modListSize());
 +            }
              String result = FMLNetworkHandler.checkModList(client, Side.CLIENT);
-+
              if (result != null)
              {
-                 NetworkDispatcher dispatcher = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER).get();

patches/cpw/mods/fml/common/network/FMLEventChannel.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,17 @@
+@@ -47,6 +47,16 @@
  import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
@@ -13,12 +13,11 @@
 +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 +86,31 @@
+@@ -75,6 +85,31 @@
              Container remoteGuiContainer = NetworkRegistry.INSTANCE.getRemoteGuiContainer(mc, entityPlayerMP, modGuiId, world, x, y, z);
              if (remoteGuiContainer != null)
              {
@@ -50,15 +49,15 @@
                  entityPlayerMP.getNextWindowId();
                  entityPlayerMP.closeContainer();
                  int windowId = entityPlayerMP.currentWindowId;
-@@ -131,6 +167,7 @@
+@@ -131,6 +166,7 @@
      public static String checkModList(Map<String,String> listData, Side side)
      {
          List<ModContainer> rejects = Lists.newArrayList();
 +        List<ModContainer> hackpacks = Lists.newArrayList();
          for (Entry<ModContainer, NetworkModHolder> networkMod : NetworkRegistry.INSTANCE.registry().entrySet())
          {
              boolean result = networkMod.getValue().check(listData, side);
-@@ -138,9 +175,15 @@
+@@ -138,9 +174,15 @@
              {
                  rejects.add(networkMod.getKey());
              }
@@ -74,12 +73,3 @@
              return null;
          }
          else
-@@ -188,7 +231,7 @@
-     public static void enhanceStatusQuery(JsonObject jsonobject)
-     {
-         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())
-         {

patches/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java.patch

@@ -1,33 +1,17 @@
 --- ../src-base/minecraft/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
 +++ ../src-work/minecraft/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
-@@ -8,13 +8,29 @@
- import io.netty.channel.SimpleChannelInboundHandler;
- import io.netty.channel.ChannelHandler.Sharable;
- 
-+import java.util.concurrent.Executor;
-+import java.util.concurrent.ExecutorService;
-+import java.util.concurrent.Executors;
-+
- @Sharable
- public class HandshakeCompletionHandler extends SimpleChannelInboundHandler<FMLMessage.CompleteHandshake> {
-+    private ExecutorService pool= Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+@@ -13,8 +13,14 @@
      @Override
--    protected void channelRead0(ChannelHandlerContext ctx, CompleteHandshake msg) throws Exception
-+    protected void channelRead0(ChannelHandlerContext ctx, final CompleteHandshake msg) throws Exception
+     protected void channelRead0(ChannelHandlerContext ctx, CompleteHandshake msg) throws Exception
      {
 -        NetworkDispatcher dispatcher = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER).getAndRemove();
 -        dispatcher.completeHandshake(msg.target);
 +        // Cauldron start - attempt to fix race condition with attr being null
 +        io.netty.util.Attribute<NetworkDispatcher> attr = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER);
 +        if (attr != null)
 +        {
-+            final NetworkDispatcher dispatcher = attr.getAndRemove();
-+            if (dispatcher != null) pool.execute(new Runnable() {
-+                @Override
-+                public void run() {
-+                    dispatcher.completeHandshake(msg.target);
-+                }
-+            });
++            NetworkDispatcher dispatcher = attr.getAndRemove();
++            if (dispatcher != null) dispatcher.completeHandshake(msg.target);
 +        }
 +        // Cauldron end
      }

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

@@ -34,7 +34,7 @@
 +            Item item = itemRegistry.getRaw(id);
 +            // inject item materials into Bukkit for FML
 +            org.bukkit.Material material = org.bukkit.Material.addMaterial(id, itemRegistry.getNameForObject(item), false);
-+            if (material != null && net.minecraft.server.MinecraftServer.uraniumConfig.loggingMaterialInjection.getValue())
++            if (material != null)
 +            {
 +                FMLLog.info("Injected new Forge item material %s with ID %d.", material.name(), material.getId());
 +            }
@@ -59,7 +59,7 @@
 +            Block block = blockRegistry.getRaw(id);
 +            // inject block materials into Bukkit for FML
 +            org.bukkit.Material material = org.bukkit.Material.addMaterial(id, blockRegistry.getNameForObject(block), true);
-+            if (material != null && net.minecraft.server.MinecraftServer.uraniumConfig.loggingMaterialInjection.getValue())
++            if (material != null)
 +            {
 +                FMLLog.info("Injected new Forge block material %s with ID %d.", material.name(), material.getId());
 +            }

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

@@ -5,7 +5,7 @@
      private static final Attributes.Name MODTYPE = new Attributes.Name("ModType");
      private static final Attributes.Name MODSIDE = new Attributes.Name("ModSide");
 -    private static String[] rootPlugins = { "cpw.mods.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin" };
-+    private static String[] rootPlugins = { "cpw.mods.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin", "pw.prok.imagine.ImagineLoadingPlugin","cc.uraniummc.UraniumPlusCore"};
++    private static String[] rootPlugins = { "cpw.mods.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin", "pw.prok.imagine.ImagineLoadingPlugin" };
      private static List<String> loadedCoremods = Lists.newArrayList();
      private static List<FMLPluginWrapper> loadPlugins;
      private static boolean deobfuscatedEnvironment;
@@ -51,7 +51,7 @@
              String cascadedTweaker = mfAttributes.getValue("TweakClass");
              if (cascadedTweaker != null)
              {
-+                if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
++                if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("thermos.fastcraft.disable", "true"))) {
 +                    FMLRelaunchLog.info("Found FastCraft tweaker, skipping...");
 +                    continue;
 +                }
@@ -62,7 +62,7 @@
                  FMLRelaunchLog.fine("Not found coremod data in %s", coreMod.getName());
                  continue;
              }
-+            if ("fastcraft.LoadingPlugin".equals(fmlCorePlugin) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
++            if ("fastcraft.LoadingPlugin".equals(fmlCorePlugin) && !"false".equals(System.getProperty("thermos.fastcraft.disable", "true"))) {
 +                FMLRelaunchLog.warning("Found FastCraft coremod, skipping...");
 +                continue;
 +            }