diff --git a/build.gradle b/build.gradle index ef04dc7a..41293f1a 100644 --- a/build.gradle +++ b/build.gradle @@ -40,10 +40,6 @@ repositories { name 'DVS1 Maven FS' url 'http://dvs1.progwml6.com/files/maven' } - maven { - name 'TehNut Repo' - url 'http://tehnut.info/maven/' - } maven { name 'tterrag Repo' url 'http://maven.tterrag.com/' @@ -59,9 +55,10 @@ dependencies { compile "codechicken:CodeChickenLib:" + config.mc_version + "-" + config.cclib_version + ":dev" compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev" compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev" - compile fileTree(dir: 'libs', include: 'CraftTweaker-Dev-1.7.10-3.2.0-GTNH.4-legacy.jar') - compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev" - compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf" + compile fileTree(dir: 'libs', include: 'CraftTweaker-Dev-1.7.10-3.2.2-GTNH.4-legacy.jar') + compile fileTree(dir: 'libs', include: 'Guide-API-1.7.10-1.0.1-20-deobf.jar') + compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev" +// compile "guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf" compile "team.chisel:Chisel:" + config.chisel_version + ":api" } diff --git a/build.properties b/build.properties index 60867f37..2f687cf7 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Sat Oct 24 13:06:30 MSK 2020 +#Sun Nov 29 17:51:49 PST 2020 mod_name=BloodMagic forge_version=10.13.4.1614-1.7.10 ccc_version=1.0.7.47 @@ -9,7 +9,7 @@ nei_version=1.0.5.111 package_group=com.wayoftime.bloodmagic guideapi_version=1.0.1-20 mod_version=1.3.3 -minetweaker_version=Dev-1.7.10-3.2.0-GTNH +minetweaker_version=Dev-1.7.10-3.2.2-GTNH chisel_version=2.9.2.8 mc_version=1.7.10 -build_number=39 +build_number=43 diff --git a/libs/CraftTweaker-Dev-1.7.10-3.2.0-GTNH.4-legacy.jar b/libs/CraftTweaker-Dev-1.7.10-3.2.2-GTNH-legacy.jar similarity index 84% rename from libs/CraftTweaker-Dev-1.7.10-3.2.0-GTNH.4-legacy.jar rename to libs/CraftTweaker-Dev-1.7.10-3.2.2-GTNH-legacy.jar index 69681717..9327804f 100644 Binary files a/libs/CraftTweaker-Dev-1.7.10-3.2.0-GTNH.4-legacy.jar and b/libs/CraftTweaker-Dev-1.7.10-3.2.2-GTNH-legacy.jar differ diff --git a/libs/Guide-API-1.7.10-1.0.1-20-deobf.jar b/libs/Guide-API-1.7.10-1.0.1-20-deobf.jar new file mode 100644 index 00000000..4f61310e Binary files /dev/null and b/libs/Guide-API-1.7.10-1.0.1-20-deobf.jar differ diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/BloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/BloodOrb.java index 3997fd74..d180d95d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/BloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/BloodOrb.java @@ -4,6 +4,7 @@ import static WayofTime.alchemicalWizardry.common.tweaker.MTHelper.toObjects; import static WayofTime.alchemicalWizardry.common.tweaker.MTHelper.toShapedObjects; import static WayofTime.alchemicalWizardry.common.tweaker.MTHelper.toStack; +import java.util.ArrayList; import java.util.List; import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; @@ -24,16 +25,30 @@ import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; @ZenClass("mods.bloodmagic.BloodOrb") public class BloodOrb { + public static List lateAdditions = new ArrayList<>(); + public static List lateRemovals = new ArrayList<>(); + + public static void applyAdditionsAndRemovals() { + for (IUndoableAction toRemove : lateRemovals) { + MineTweakerAPI.apply(toRemove); + } + for (IUndoableAction toAdd : lateAdditions) { + MineTweakerAPI.apply(toAdd); + } + + lateAdditions.clear(); + } + @ZenMethod public static void addShaped(IItemStack output, IIngredient[][] ingredients) { - MineTweakerAPI.apply(new Add(false, toStack(output), toShapedObjects(ingredients))); + lateAdditions.add(new Add(false, toStack(output), toShapedObjects(ingredients))); } @ZenMethod public static void addShapeless(IItemStack output, IIngredient[] ingredients) { - MineTweakerAPI.apply(new Add(true, toStack(output), toObjects(ingredients))); + lateAdditions.add((new Add(true, toStack(output), toObjects(ingredients)))); } private static class Add implements IUndoableAction { @@ -89,7 +104,7 @@ public class BloodOrb @ZenMethod public static void removeRecipe(IItemStack output) { - MineTweakerAPI.apply(new Remove(toStack(output))); + lateRemovals.add(new Remove(toStack(output))); } private static class Remove implements IUndoableAction { @@ -111,7 +126,6 @@ public class BloodOrb break; } } - CraftingManager.getInstance().getRecipeList().remove(iRecipe); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/MineTweakerIntegration.java b/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/MineTweakerIntegration.java index e95af3f9..fad3204a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/MineTweakerIntegration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tweaker/MineTweakerIntegration.java @@ -1,6 +1,8 @@ package WayofTime.alchemicalWizardry.common.tweaker; import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.util.IEventHandler; /** * MineTweaker3 Integration by joshie * @@ -15,5 +17,18 @@ public class MineTweakerIntegration MineTweakerAPI.registerClass(BloodOrb.class); MineTweakerAPI.registerClass(FallingTower.class); MineTweakerAPI.registerClass(HarvestMoon.class); + + MineTweakerImplementationAPI.onRollbackEvent(new HandleLateAdditionsAndRemovals()); + MineTweakerImplementationAPI.onPostReload(new HandleLateAdditionsAndRemovals()); } + public static class HandleLateAdditionsAndRemovals implements IEventHandler + { + @Override + public void handle(MineTweakerImplementationAPI.ReloadEvent event) + { + BloodOrb.applyAdditionsAndRemovals(); + } + } + + }