From 20b2dcf9c3711b1c66998b8b60cc11320bd20848 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 24 Dec 2014 01:09:33 -0800 Subject: [PATCH] Clean up Fluids comments. method name setDrink -> setProperties --- src/main/java/forestry/core/fluids/Fluids.java | 15 ++++++++------- src/main/java/forestry/plugins/PluginFluids.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index b9bd526eb..0c6d9c2c3 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -130,7 +130,7 @@ public enum Fluids { } @Override - public void setDrink(ItemLiquidContainer liquidContainer) { + public void setProperties(ItemLiquidContainer liquidContainer) { if (liquidContainer.getType() != EnumContainerType.BUCKET) liquidContainer.setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION); } @@ -191,7 +191,7 @@ public enum Fluids { } @Override - public void setDrink(ItemLiquidContainer liquidContainer) { + public void setProperties(ItemLiquidContainer liquidContainer) { if (liquidContainer.getType() != EnumContainerType.BUCKET) liquidContainer.setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION); } @@ -386,30 +386,31 @@ public enum Fluids { /** FluidBlock and Container registration */ /** - * Add the filled containers for the fluid, to have them get created and registered. + * Add the filled containers for this fluid. + * They will be automatically created and registered. */ public ForestryItem getContainerForType(EnumContainerType type) { return null; } /** - * Add non-forestry containers for the fluid. + * Add non-forestry containers for this fluid. */ public List getOtherContainers() { return Collections.emptyList(); } /** - * Override for Forestry fluids to create FluidBlocks. + * Create a FluidBlock for this fluid. */ public Block makeBlock() { return null; } /** - * Set the drink properties for a ItemLiquidContainer before it gets registered. + * Set the properties for an ItemLiquidContainer before it gets registered. */ - public void setDrink(ItemLiquidContainer liquidContainer) { + public void setProperties(ItemLiquidContainer liquidContainer) { } } diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index 0011d14a1..a27950d84 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -111,7 +111,7 @@ public class PluginFluids extends ForestryPlugin { continue; ItemLiquidContainer liquidContainer = new ItemLiquidContainer(type, fluidType.getBlock(), fluidType.getColor()); - fluidType.setDrink(liquidContainer); + fluidType.setProperties(liquidContainer); container.registerItem(liquidContainer, container.toString()); } }