From 822f26749aba4945c0d404c767dc66a367472532 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Tue, 12 May 2015 00:22:12 -0400 Subject: [PATCH] Add MineTweaker API to add/replace compacting tiers. API: mods.storagedrawers.Compaction.add(, , 4); // third value is conversion rate, must be 4 or 9. --- .../config/CompTierRegistry.java | 41 +++++++++- .../integration/MineTweaker.java | 2 + .../integration/minetweaker/Compaction.java | 78 +++++++++++++++++++ 3 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 src/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java diff --git a/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java index 5eb006a..de16339 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java +++ b/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java @@ -28,13 +28,48 @@ public class CompTierRegistry register(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand), 4); } - public void register (ItemStack upper, ItemStack lower, int convRate) { + public boolean register (ItemStack upper, ItemStack lower, int convRate) { + if (upper == null || lower == null) + return false; + if (convRate != 4 && convRate != 9) + return false; + + unregisterUpperTarget(upper); + unregisterLowerTarget(lower); + Record r = new Record(); - r.upper = upper; - r.lower = lower; + r.upper = upper.copy(); + r.lower = lower.copy(); r.convRate = convRate; + r.upper.stackSize = 1; + r.lower.stackSize = 1; + records.add(r); + + return true; + } + + public boolean unregisterUpperTarget (ItemStack stack) { + for (Record r : records) { + if (ItemStack.areItemStacksEqual(stack, r.upper)) { + records.remove(r); + return true; + } + } + + return false; + } + + public boolean unregisterLowerTarget (ItemStack stack) { + for (Record r : records) { + if (ItemStack.areItemStacksEqual(stack, r.lower)) { + records.remove(r); + return true; + } + } + + return false; } public Record findHigherTier (ItemStack stack) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java b/src/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java index 442d13c..4beaf1d 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java @@ -1,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.integration; +import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.Compaction; import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryBlacklist; import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryWhitelist; import minetweaker.MineTweakerAPI; @@ -15,6 +16,7 @@ public class MineTweaker extends IntegrationModule public void init () throws Throwable { MineTweakerAPI.registerClass(OreDictionaryBlacklist.class); MineTweakerAPI.registerClass(OreDictionaryWhitelist.class); + MineTweakerAPI.registerClass(Compaction.class); } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java b/src/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java new file mode 100644 index 0000000..eb83fbe --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java @@ -0,0 +1,78 @@ +package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; + +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import net.minecraft.item.ItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +@ZenClass("mods.storagedrawers.Compaction") +public class Compaction +{ + @ZenMethod + public static void add (IItemStack upper, IItemStack lower, int conversion) { + ItemStack upperStack = MineTweakerMC.getItemStack(upper); + ItemStack lowerStack = MineTweakerMC.getItemStack(lower); + + if (upperStack == null || lowerStack == null) + MineTweakerAPI.logError("Tried to add compacting tier with invalid item stack."); + else if (conversion != 4 && conversion != 9) + MineTweakerAPI.logError("Tried to add compacting tier with invalid conversion value (must be 4 or 9)."); + else + MineTweakerAPI.apply(new AddRecordAction(upperStack, lowerStack, conversion)); + } + + private static class AddRecordAction implements IUndoableAction + { + ItemStack upper; + ItemStack lower; + int conversionRate; + boolean added; + + public AddRecordAction (ItemStack upper, ItemStack lower, int conversionRate) { + this.upper = upper; + this.lower = lower; + this.conversionRate = conversionRate; + } + + @Override + public void apply () { + added = StorageDrawers.compRegistry.register(upper, lower, conversionRate); + } + + @Override + public boolean canUndo () { + return true; + } + + @Override + public void undo () { + if (added) + StorageDrawers.compRegistry.unregisterUpperTarget(upper); + } + + @Override + public String describe () { + if (added) + return "Adding compacting tier: 1 '" + upper.getDisplayName() + "' = " + conversionRate + " '" + lower.getDisplayName() + "'."; + else + return "Failed to add compacting tier."; + } + + @Override + public String describeUndo () { + if (added) + return "Removing previously added compacting tier: 1 '" + upper.getDisplayName() + "' = " + conversionRate + " '" + lower.getDisplayName() + "'."; + else + return ""; + } + + @Override + public Object getOverrideKey () { + return null; + } + } +}