mirror of
https://github.com/GTNewHorizons/Eternal-Singularity.git
synced 2026-11-21 20:42:21 +00:00
yay!! 1.7.10 is back! =D
also, fixed easyMode...
This commit is contained in:
1 parent
0143bfb4c4
commit
3a7332e001
5 files changed
+23
-17
No files matched your search
@@ -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<Object> 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<Object> eternalSingularityRecipeIterator = eternalSingularityRecipe.iterator(); eternalSingularityRecipeIterator.hasNext() && itemStack == null; ) {
|
||||
for (final Iterator<Object> 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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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<Class> 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<ItemStack> singularities = new ArrayList<>();
|
||||
for (final Iterator<Object> 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<Object> 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));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user