diff --git a/dependencies.gradle b/dependencies.gradle index 277be301..42949d0d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,6 +2,6 @@ dependencies { api('com.github.GTNewHorizons:CodeChickenCore:1.3.6:dev') - compileOnly('com.github.GTNewHorizons:Hodgepodge:2.5.39-pre:dev') // TODO: change to proper tag + compileOnly('com.github.GTNewHorizons:Hodgepodge:2.5.39-pre:dev') // TODO: change to proper tag and adjust ItemInfo.addSpawnEggs() shadowImplementation('org.apache.commons:commons-csv:1.10.0') } diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index 64b7558b..650ed75f 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -63,7 +63,6 @@ public class NEIModContainer extends DummyModContainer { public Set getRequirements() { Set 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 index 148fefd3..a1a09e5e 100644 --- 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.Loader; 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 @@ public class ItemInfo { } 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")