Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing the Infuser to accept valid inputs #603

Closed
wants to merge 4 commits into from
Closed

Fixing the Infuser to accept valid inputs #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d93e52
Fixing #602.
airbreather Apr 9, 2015
f33d1aa
Fixing the imprinter and infuser GUIs to work like the alyzers.
airbreather Apr 9, 2015
257b779
Removing bad commented-out code from markDirty() methods
airbreather Apr 10, 2015
5786a34
Sign CLA
airbreather Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cla-signatures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions src/main/java/forestry/apiculture/items/ItemBeealyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ private void tryAnalyze() {

@Override
public void markDirty() {
// if (!Proxies.common.isSimulating(player.worldObj))
// return;
tryAnalyze();
}

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/forestry/apiculture/items/ItemImprinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ private void tryImprint() {

@Override
public void markDirty() {
if (!Proxies.common.isSimulating(player.worldObj)) {
return;
}
tryImprint();
}

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/forestry/arboriculture/items/ItemTreealyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ private void tryAnalyze() {

@Override
public void markDirty() {
// if (!Proxies.common.isSimulating(player.worldObj))
// return;
tryAnalyze();
}

Expand Down
7 changes: 2 additions & 5 deletions src/main/java/forestry/food/items/ItemInfuser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,6 @@ private void trySeasoning() {

@Override
public void markDirty() {
if (!Proxies.common.isSimulating(player.worldObj)) {
return;
}
trySeasoning();
}

Expand All @@ -324,9 +321,9 @@ public String getInventoryName() {
@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;
}
Expand Down