From 0462e5a9303bd4f45bb46ec7aa785f19e8f51b01 Mon Sep 17 00:00:00 2001 From: Joe Amenta Date: Wed, 8 Apr 2015 20:19:24 -0400 Subject: [PATCH] Fix #602. Fixing the imprinter and infuser GUIs to work like the alyzers. Imprinter and infuser would previously not run their output until the output slot was clicked (likely, only in SSP). Treealyzer and Beealyzer comment out a block of code (Flutterlyzer never had this in the first place) that was uncommented in these... doing the same here made the issue go away. Sign CLA --- cla-signatures.txt | 1 + src/main/java/forestry/apiculture/items/ItemBeealyzer.java | 2 -- src/main/java/forestry/apiculture/items/ItemImprinter.java | 3 --- .../java/forestry/arboriculture/items/ItemTreealyzer.java | 2 -- src/main/java/forestry/food/items/ItemInfuser.java | 7 ++----- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cla-signatures.txt b/cla-signatures.txt index 330081089..3bcb43807 100644 --- a/cla-signatures.txt +++ b/cla-signatures.txt @@ -1,3 +1,4 @@ Account;Email;Date; samtrion;samtrion@gmail.com;2015-01-18 GenuineSounds;GenuineSoundsLtd@gmail.com;2015-02-26 +airbreather;airbreather@linux.com;2015-04-10 \ No newline at end of file diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index 237e654dd..d6651f7ec 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -82,8 +82,6 @@ public class ItemBeealyzer extends ItemInventoried { @Override public void markDirty() { - // if (!Proxies.common.isSimulating(player.worldObj)) - // return; tryAnalyze(); } diff --git a/src/main/java/forestry/apiculture/items/ItemImprinter.java b/src/main/java/forestry/apiculture/items/ItemImprinter.java index 0434bf125..10c712428 100755 --- a/src/main/java/forestry/apiculture/items/ItemImprinter.java +++ b/src/main/java/forestry/apiculture/items/ItemImprinter.java @@ -136,9 +136,6 @@ public class ItemImprinter extends ItemForestry { @Override public void markDirty() { - if (!Proxies.common.isSimulating(player.worldObj)) { - return; - } tryImprint(); } diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index 56d313fcc..97923546e 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -95,8 +95,6 @@ public class ItemTreealyzer extends ItemInventoried { @Override public void markDirty() { - // if (!Proxies.common.isSimulating(player.worldObj)) - // return; tryAnalyze(); } diff --git a/src/main/java/forestry/food/items/ItemInfuser.java b/src/main/java/forestry/food/items/ItemInfuser.java index 4ad258d4a..1f02e3b3f 100755 --- a/src/main/java/forestry/food/items/ItemInfuser.java +++ b/src/main/java/forestry/food/items/ItemInfuser.java @@ -310,9 +310,6 @@ public class ItemInfuser extends ItemForestry { @Override public void markDirty() { - if (!Proxies.common.isSimulating(player.worldObj)) { - return; - } trySeasoning(); } @@ -324,9 +321,9 @@ public class ItemInfuser extends ItemForestry { @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { if (slotIndex == inputSlot) { - ForestryItem.beverage.isItemEqual(itemStack); + return ForestryItem.beverage.isItemEqual(itemStack); } else if (slotIndex >= ingredientSlot1 && slotIndex < ingredientSlot1 + ingredientSlotCount) { - BeverageManager.infuserManager.isIngredient(itemStack); + return BeverageManager.infuserManager.isIngredient(itemStack); } return false; }