Merge remote-tracking branch 'origin/eggs' into dev

# Conflicts: # dependencies.gradle
GTNewHorizons · Aug 11, 2024 · a2b81b8 · a2b81b8
2 parents 6bc9825 + f337182
commit a2b81b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java
@@ -63,7 +63,6 @@ public static boolean isGT5Loaded() {
     public Set<ArtifactVersion> getRequirements() {
         Set<ArtifactVersion> deps = new HashSet<>();
         deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + CodeChickenCorePlugin.version + ",)"));
-        deps.add(VersionParser.parseVersionReference("hodgepodge@[2.5.44,)"));
         return deps;
     }
 

diff --git a/src/main/java/codechicken/nei/api/ItemInfo.java b/src/main/java/codechicken/nei/api/ItemInfo.java
@@ -69,6 +69,7 @@
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
 
 /**
  * This is an internal class for storing information about items, to be accessed by the API
@@ -460,10 +461,14 @@ else if (item == Items.fishing_rod || item == Items.flint_and_steel || item == I
     }
 
     private static void addSpawnEggs() {
-        if (!Loader.isModLoaded("hodgepodge") || !TweaksConfig.addModEntityStats) {
-            addEntityEgg(EntitySnowman.class, 0xEEFFFF, 0xffa221);
-            addEntityEgg(EntityIronGolem.class, 0xC5C2C1, 0xffe1cc);
+        if (Loader.isModLoaded("hodgepodge")
+                && Loader.instance().getIndexedModList().get("hodgepodge").getProcessedVersion()
+                        .compareTo(new DefaultArtifactVersion("2.5.44")) >= 0
+                && TweaksConfig.addModEntityStats) {
+            return;
         }
+        addEntityEgg(EntitySnowman.class, 0xEEFFFF, 0xffa221);
+        addEntityEgg(EntityIronGolem.class, 0xC5C2C1, 0xffe1cc);
     }
 
     @SuppressWarnings("unchecked")