diff --git a/build.gradle b/build.gradle index 8fa4280..e3f0cfa 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.0.3" +version = "1.7.10-1.0.3b" group= "singulariteam.eternalsingularity" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "EternalSingularity" diff --git a/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java b/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java index 1f6f1f9..af4f0d2 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java @@ -11,13 +11,10 @@ import wanion.lib.common.MineTweakerHelper; import javax.annotation.Nonnull; import java.util.Iterator; -import java.util.List; @ZenClass("mods.eternalsingularity") public final class EternalRecipeTweaker { - private static final List eternalSingularityRecipe = CommonProxy.eternalSingularityRecipe.getInput(); - private EternalRecipeTweaker() {} public static void init() @@ -53,7 +50,7 @@ public final class EternalRecipeTweaker @Override public void apply() { - eternalSingularityRecipe.add(itemStack); + CommonProxy.getEternalSingularityRecipe().getInput().add(itemStack); } @Override @@ -65,7 +62,7 @@ public final class EternalRecipeTweaker @Override public void undo() { - eternalSingularityRecipe.remove(itemStack); + CommonProxy.getEternalSingularityRecipe().getInput().remove(itemStack); } @Override @@ -94,7 +91,7 @@ public final class EternalRecipeTweaker private Remove(@Nonnull final ItemStack itemStackToRemove) { ItemStack itemStack = null; - for (final Iterator eternalSingularityRecipeIterator = eternalSingularityRecipe.iterator(); eternalSingularityRecipeIterator.hasNext() && itemStack == null; ) { + for (final Iterator eternalSingularityRecipeIterator = CommonProxy.getEternalSingularityRecipe().getInput().iterator(); eternalSingularityRecipeIterator.hasNext() && itemStack == null; ) { final Object input = eternalSingularityRecipeIterator.next(); if (input instanceof ItemStack && ((ItemStack) input).isItemEqual(itemStackToRemove)) itemStack = (ItemStack) input; @@ -105,7 +102,7 @@ public final class EternalRecipeTweaker @Override public void apply() { - eternalSingularityRecipe.remove(itemStack); + CommonProxy.getEternalSingularityRecipe().getInput().remove(itemStack); } @Override @@ -117,7 +114,7 @@ public final class EternalRecipeTweaker @Override public void undo() { - eternalSingularityRecipe.add(itemStack); + CommonProxy.getEternalSingularityRecipe().getInput().add(itemStack); } @Override diff --git a/src/main/java/singulariteam/eternalsingularity/Reference.java b/src/main/java/singulariteam/eternalsingularity/Reference.java index d6a1fa2..79824b2 100644 --- a/src/main/java/singulariteam/eternalsingularity/Reference.java +++ b/src/main/java/singulariteam/eternalsingularity/Reference.java @@ -4,7 +4,7 @@ public final class Reference { public static final String MOD_ID = "eternalsingularity"; public static final String MOD_NAME = "Eternal Singularity"; - public static final String MOD_VERSION = "1.7.10-.1.0.3"; + public static final String MOD_VERSION = "1.7.10-.1.0.3b"; public static final String MC_VERSION = "[1.7.10]"; static final String COMMON_PROXY = "singulariteam.eternalsingularity.proxy.CommonProxy"; static final String CLIENT_PROXY = "singulariteam.eternalsingularity.proxy.ClientProxy"; diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index e3ebc5f..d0fcb43 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -14,6 +14,7 @@ import singulariteam.eternalsingularity.EternalSingularityMod; import singulariteam.eternalsingularity.item.CompoundSingularityItem; import singulariteam.eternalsingularity.item.EternalSingularityItem; +import javax.annotation.Nonnull; import java.io.File; import java.util.*; @@ -21,12 +22,12 @@ import static fox.spiteful.avaritia.Config.craftingOnly; public class CommonProxy { - public static final ShapelessOreRecipe eternalSingularityRecipe = new ShapelessOreRecipe(EternalSingularityItem.instance); + private static ShapelessOreRecipe eternalSingularityRecipe = null; private static final Set classSet = new HashSet<>(); protected CompoundSingularityItem compoundSingularityItem = null; private File configFile; - public CommonProxy() {} + public CommonProxy() { } public final void preInit(final File file) { @@ -53,12 +54,18 @@ public class CommonProxy public void init() {} + @Nonnull + public static ShapelessOreRecipe getEternalSingularityRecipe() + { + return eternalSingularityRecipe; + } + @SuppressWarnings("unchecked") public void postInit() { if (classSet.isEmpty() || craftingOnly) return; - ExtremeCraftingManager.getInstance().getRecipeList().add(eternalSingularityRecipe); + final List singularities = new ArrayList<>(); for (final Iterator catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext(); ) { final Object input = catalystRecipeIterator.next(); if (!(input instanceof ItemStack)) @@ -66,17 +73,18 @@ public class CommonProxy final Item item = ((ItemStack) input).getItem(); if (item != null && classSet.contains(item.getClass())) { catalystRecipeIterator.remove(); - eternalSingularityRecipe.getInput().add(((ItemStack) input).copy()); + singularities.add(((ItemStack) input).copy()); } } final Configuration config = new Configuration(configFile); - final int singularityCount = eternalSingularityRecipe.getInput().size(); + final int singularityCount = singularities.size(); final boolean aboveTheLimit = singularityCount > 81; final boolean useCompoundSingularities = config.getBoolean("useCompoundSingularities", Configuration.CATEGORY_GENERAL, aboveTheLimit, "When useCompoundSingularities is Enabled, Basic Singularities will Need to be Crafted into Compound Singularities First.\n[If there are > 81 Basic Singularities, this Config Option will be Set to True Automatically]") || aboveTheLimit; final boolean easyMode = config.getBoolean("easyMode", Configuration.CATEGORY_GENERAL, false, "If this Config Option is Enabled, for Every 9 Singularities Used in the Eternal Singularity Recipe, You will Receive an Additional Eternal Singularity for the Recipe Output."); if (config.hasChanged()) config.save(); final int compoundMax = (int) Math.ceil((float) singularityCount / 9); + (eternalSingularityRecipe = new ShapelessOreRecipe(new ItemStack(EternalSingularityItem.instance, easyMode ? MathHelper.clamp_int(compoundMax, 1, 64) : 1))).getInput().addAll(singularities); if (useCompoundSingularities) { GameRegistry.registerItem(compoundSingularityItem = new CompoundSingularityItem(compoundMax), "combined_singularity"); final List eternalSingularityRecipeInputs = eternalSingularityRecipe.getInput(); @@ -98,6 +106,7 @@ public class CommonProxy for (int i = 0; i < compoundMax; i++) eternalSingularityRecipeInputs.add(new ItemStack(compoundSingularityItem, 1, i)); } - Grinder.catalyst.getInput().add(new ItemStack(EternalSingularityItem.instance, easyMode ? MathHelper.clamp_int(compoundMax, 1, 64) : 1)); + ExtremeCraftingManager.getInstance().getRecipeList().add(eternalSingularityRecipe); + Grinder.catalyst.getInput().add(new ItemStack(EternalSingularityItem.instance)); } } \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5ab5bf7..5812746 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "eternalsingularity", "name": "Eternal Singularity", "description": "A Mod that Adds an Eternal Singularity! (That Works as a Singularity Binder)", - "version": "1.0.3", + "version": "1.0.3b", "mcversion": "1.7.10", "url": "https://minecraft.curseforge.com/projects/eternal-singularity", "updateUrl": "",