diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..b761216 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..678d9d8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Jul 02 15:54:47 CDT 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java index 7137760..69c2534 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java @@ -10,7 +10,7 @@ import singulariteam.eternalsingularity.proxy.CommonProxy; import static singulariteam.eternalsingularity.Reference.*; -@Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = MC_VERSION, dependencies = "required-after:Avaritia") +@Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = MC_VERSION, dependencies = "required-after:Avaritia;after:thermsingul;after:universalsingularities;after:aobdsingularities") public class EternalSingularityMod { @Mod.Instance(MOD_ID) diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index f93fd1a..81d05bb 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -1,6 +1,7 @@ package singulariteam.eternalsingularity.proxy; import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import fox.spiteful.avaritia.crafting.Grinder; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -26,7 +27,7 @@ public class CommonProxy final Configuration config = new Configuration(file); final List classNameList = Arrays.asList(config.getStringList("classNameList", Configuration.CATEGORY_GENERAL, new String[]{ "com.rcx.aobdsingularities.item.AOBDItemSingularity", - "fox.spiteful.avaritia.items", + "fox.spiteful.avaritia.items.ItemSingularity", "wanion.thermsingul.ThermalSingularityItem", "wealthyturtle.uiesingularities.UniversalSingularityItem" }, "here is the absolute class name of the Item Classes that must be removed from Infinity Catalyst recipe and inserted into Eternal Singularity.")); @@ -42,10 +43,12 @@ public class CommonProxy public void init() {} + @SuppressWarnings("unchecked") public final void postInit() { if (craftingOnly) return; + ExtremeCraftingManager.getInstance().getRecipeList().add(eternalSingularityRecipe); for (final Iterator catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext();) { final Object input = catalystRecipeIterator.next(); if (!(input instanceof ItemStack)) diff --git a/src/main/resources/assets/eternalsingularity/lang/en_US.lang b/src/main/resources/assets/eternalsingularity/lang/en_US.lang index 7969429..f99e9e9 100644 --- a/src/main/resources/assets/eternalsingularity/lang/en_US.lang +++ b/src/main/resources/assets/eternalsingularity/lang/en_US.lang @@ -4,5 +4,5 @@ //Contact RCXcrafter/WanionCane/Wealthyturtle If You Would Like to Volunteer to Create a Localization File for Another Language. //Eternal Singularity - OMG -item.eternal.singularity,name=Eternal Singularity +item.eternal.singularity.name=Eternal Singularity //Eternal Singularity - OMG \ No newline at end of file