From 9284f8464524eeb014969343386c7befa842aff9 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 21 Jun 2016 14:26:16 -0700 Subject: [PATCH] Fix pipette filling bug --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- src/main/java/forestry/Forestry.java | 2 +- src/main/java/forestry/core/items/ItemPipette.java | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index d7dbf2115..ae39ce8c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.9.4 -forgeversion=12.17.0.1957 +forgeversion=12.17.0.1968 mcp_mappings=snapshot_20160525 jei_version=3.6.4.+ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848f1..bf6747ed5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Tue Jun 21 15:23:47 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index e072d346f..8df484deb 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -49,7 +49,7 @@ import forestry.plugins.PluginManager; name = "Forestry", version = Constants.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", - dependencies = "required-after:Forge@[12.17.0.1949,);" + dependencies = "required-after:Forge@[12.17.0.1963,);" + "after:Buildcraft|Core@[7.2,);" + "after:BuildCraft|Energy@[7.2,);" + "after:ExtrabiomesXL;" diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index bc98c881e..f05e2916e 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -59,7 +59,6 @@ public class ItemPipette extends ItemForestry implements IToolPipette, IFluidCon } contained = new PipetteContents(new FluidStack(liquid, filled)); - filled = liquid.amount; } else { if (contained.getContents().amount >= limit) { return 0; @@ -141,7 +140,7 @@ public class ItemPipette extends ItemForestry implements IToolPipette, IFluidCon contained.getContents().amount -= drained; if (contained.getContents().amount <= 0) { - pipette.setTagCompound(null); + pipette.setTagCompound(new NBTTagCompound()); pipette.setItemDamage(0); } else { NBTTagCompound nbttagcompound = new NBTTagCompound();