diff --git a/build.gradle b/build.gradle index f796315..a09c555 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.0.0" +version = "1.7.10-1.0.1" group= "singulariteam.eternalsingularity" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "EternalSingularity" diff --git a/screenshots/catalyst crafting.png b/images/catalyst crafting.png similarity index 100% rename from screenshots/catalyst crafting.png rename to images/catalyst crafting.png diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..3ab8efa Binary files /dev/null and b/images/logo.png differ diff --git a/screenshots/singularity crafting crafting.png b/images/singularity crafting crafting.png similarity index 100% rename from screenshots/singularity crafting crafting.png rename to images/singularity crafting crafting.png diff --git a/libs/MineTweaker3-1.7.10-3.0.10B.jar b/libs/MineTweaker3-1.7.10-3.0.10B.jar new file mode 100644 index 0000000..1a83741 Binary files /dev/null and b/libs/MineTweaker3-1.7.10-3.0.10B.jar differ diff --git a/libs/WanionLib-1.7.10-1.3-dev.jar b/libs/WanionLib-1.7.10-1.3-dev.jar new file mode 100644 index 0000000..57e4817 Binary files /dev/null and b/libs/WanionLib-1.7.10-1.3-dev.jar differ diff --git a/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java b/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java new file mode 100644 index 0000000..d03ccad --- /dev/null +++ b/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java @@ -0,0 +1,151 @@ +package wanion.biggercraftingtables.minetweaker; + +/* + * Created by WanionCane(https://github.com/WanionCane). + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import net.minecraft.item.ItemStack; +import singulariteam.eternalsingularity.proxy.CommonProxy; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; +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() + { + MineTweakerAPI.registerClass(EternalRecipeTweaker.class); + } + + @ZenMethod + public static void add(@Nonnull final IItemStack input) + { + final ItemStack itemStack = MineTweakerHelper.toStack(input); + if (itemStack != null && itemStack.getItem() != null) + MineTweakerAPI.apply(new Add(itemStack)); + } + + @ZenMethod + public static void remove(final IItemStack input) + { + final ItemStack itemStack = MineTweakerHelper.toStack(input); + if (itemStack != null && itemStack.getItem() != null) + MineTweakerAPI.apply(new Remove(itemStack)); + } + + private static class Add implements IUndoableAction + { + private final ItemStack itemStack; + + public Add(@Nonnull final ItemStack itemStack) + { + this.itemStack = itemStack; + } + + @Override + public void apply() + { + eternalSingularityRecipe.add(itemStack); + } + + @Override + public boolean canUndo() + { + return true; + } + + @Override + public void undo() + { + eternalSingularityRecipe.remove(itemStack); + } + + @Override + public String describe() + { + return "Adding " + itemStack.getDisplayName() + " into Eternal Singularity Recipe."; + } + + @Override + public String describeUndo() + { + return "Removing " + itemStack.getDisplayName() + " from Eternal Singularity Recipe."; + } + + @Override + public Object getOverrideKey() + { + return null; + } + } + + private static class Remove implements IUndoableAction + { + private final ItemStack itemStack; + + private Remove(@Nonnull final ItemStack itemStackToRemove) + { + ItemStack itemStack = null; + for (final Iterator eternalSingularityRecipeIterator = eternalSingularityRecipe.iterator(); eternalSingularityRecipeIterator.hasNext() && itemStack == null; ) { + final Object input = eternalSingularityRecipeIterator.next(); + if (input instanceof ItemStack && ((ItemStack) input).isItemEqual(itemStackToRemove)) + itemStack = (ItemStack) input; + } + this.itemStack = itemStack; + } + + @Override + public void apply() + { + eternalSingularityRecipe.remove(itemStack); + } + + @Override + public boolean canUndo() + { + return itemStack != null; + } + + @Override + public void undo() + { + eternalSingularityRecipe.add(itemStack); + } + + @Override + public String describe() + { + return "Removing " + itemStack.getDisplayName() + " from Eternal Singularity Recipe."; + } + + @Override + public String describeUndo() + { + return "Adding " + itemStack.getDisplayName() + " into Eternal Singularity Recipe."; + } + + @Override + public Object getOverrideKey() + { + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java index 69c2534..4febfcc 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;after:thermsingul;after:universalsingularities;after:aobdsingularities") +@Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = MC_VERSION, dependencies = "required-after:Avaritia;required-after:wanionlib[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 81d05bb..986de0c 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -25,12 +25,14 @@ public class CommonProxy public final void preInit(final File file) { final Configuration config = new Configuration(file); - final List classNameList = Arrays.asList(config.getStringList("classNameList", Configuration.CATEGORY_GENERAL, new String[]{ + final String[] classNameList = config.getStringList("classNameList", Configuration.CATEGORY_GENERAL, new String[]{ "com.rcx.aobdsingularities.item.AOBDItemSingularity", "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.")); + }, "here is the absolute class name of the Item Classes that must be removed from Infinity Catalyst recipe and inserted into Eternal Singularity."); + if (config.hasChanged()) + config.save(); for (final String className : classNameList) { try { classSet.add(Class.forName(className)); @@ -46,7 +48,7 @@ public class CommonProxy @SuppressWarnings("unchecked") public final void postInit() { - if (craftingOnly) + if (classSet.isEmpty() || craftingOnly) return; ExtremeCraftingManager.getInstance().getRecipeList().add(eternalSingularityRecipe); for (final Iterator catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext();) {