Merge pull request #26 from GTNewHorizons/remove-offline-kick

Remove offline kick if hodgepodge is loaded
GTNewHorizons · Jul 8, 2023 · 357e902 · 357e902
2 parents 1b9af6b + bc1b10e
commit 357e902
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java
@@ -108,7 +108,8 @@
         dependencies = "required-after:GalacticraftCore@[3.0.61-GTNH,);" + "required-after:GalacticraftMars;"
                 + "after:dreamcraft;"
                 + "after:IronChest;"
-                + "after:AdvancedSolarPanel",
+                + "after:AdvancedSolarPanel;"
+                + "after:Hodgepodge@[2.2.19,);",
         name = AmunRa.MODNAME)
 public class AmunRa {
 

diff --git a/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java b/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java
@@ -3,6 +3,7 @@
 import net.minecraft.server.MinecraftServer;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import de.katzenpapst.amunra.AmunRa;
 
@@ -12,7 +13,9 @@ public class ServerProxy extends ARSidedProxy {
     public void init(final FMLInitializationEvent event) {
         try {
             final MinecraftServer s = MinecraftServer.getServer();
-            if (s.isDedicatedServer() && !s.isServerInOnlineMode() && !AmunRa.isDevEnvironment()) {
+            if (!Loader.isModLoaded("hodgepodge") && s.isDedicatedServer()
+                    && !s.isServerInOnlineMode()
+                    && !AmunRa.isDevEnvironment()) {
                 AmunRa.LOGGER.fatal("Server is running in offline mode. This is not supported.");
                 FMLCommonHandler.instance().exitJava(-10, false);
             }