Compare commits

...
Author SHA1 Message Date
Dream Master 483aff076c update 2024-08-11 18:25:50 +07:00
Dream Master a2b81b86c6 Merge remote-tracking branch 'origin/eggs' into dev
# Conflicts:
#	dependencies.gradle
2024-08-11 18:24:54 +07:00
glowredman f337182332 Compare HP version 2024-08-10 16:52:11 +02:00
3 changed files with 9 additions and 5 deletions

No files matched your search

+1 -1
View File
@@ -2,6 +2,6 @@
dependencies {
api('com.github.GTNewHorizons:CodeChickenCore:1.3.6:dev')
compileOnly('com.github.GTNewHorizons:Hodgepodge:2.5.43-pre:dev') // TODO: change to proper tag
compileOnly('com.github.GTNewHorizons:Hodgepodge:2.5.45-pre:dev') // TODO: change to proper tag
shadowImplementation('org.apache.commons:commons-csv:1.10.0')
}
@@ -63,7 +63,6 @@ public class NEIModContainer extends DummyModContainer {
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;
}
@@ -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")