diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 528da91f8..db9beed12 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -14,9 +14,7 @@ import com.google.common.collect.ImmutableMap; import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Random; import java.util.Set; @@ -38,6 +36,7 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.SidedProxy; @@ -560,9 +559,9 @@ public class PluginApiculture extends BlankForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{items.honeydew.getItemStack()}, honeyDropFluid); ItemStack phosphor = PluginCore.items.phosphor.getItemStack(2); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND)}, Fluids.LAVA.getFluid(2000)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND, 1, 1)}, Fluids.LAVA.getFluid(2000)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.DIRT)}, Fluids.LAVA.getFluid(1600)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND)}, new FluidStack(FluidRegistry.WATER, 2000)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND, 1, 1)}, new FluidStack(FluidRegistry.LAVA, 2000)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.DIRT)}, new FluidStack(FluidRegistry.LAVA, 1600)); // / CARPENTER RecipeManagers.carpenterManager.addRecipe(50, Fluids.FOR_HONEY.getFluid(500), null, PluginCore.items.craftingMaterial.getScentedPaneling(), @@ -571,14 +570,14 @@ public class PluginApiculture extends BlankForestryPlugin { 'J', items.royalJelly, 'W', PluginCore.items.beeswax, 'P', items.pollenCluster.get(EnumPollenCluster.NORMAL, 1)); - - RecipeManagers.carpenterManager.addRecipe(30, Fluids.WATER.getFluid(600), null, blocks.candle.getUnlitCandle(24), + + RecipeManagers.carpenterManager.addRecipe(30, new FluidStack(FluidRegistry.WATER, 600), null, blocks.candle.getUnlitCandle(24), " X ", "###", "###", '#', PluginCore.items.beeswax, 'X', Items.STRING); - RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(200), null, blocks.candle.getUnlitCandle(6), + RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 200), null, blocks.candle.getUnlitCandle(6), "#X#", '#', PluginCore.items.beeswax, 'X', PluginCore.items.craftingMaterial.getSilkWisp()); diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index 1ca58802d..325ef3ed6 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -19,6 +19,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -50,9 +51,9 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory super(BlockAlvearyType.HYGRO); this.inventory = new InventoryHygroregulator(this); - - Fluid water = Fluids.WATER.getFluid(); - Fluid lava = Fluids.LAVA.getFluid(); + + Fluid water = FluidRegistry.WATER; + Fluid lava = FluidRegistry.LAVA; Fluid liquidIce = Fluids.ICE.getFluid(); this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(water, lava, liquidIce); diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index 2a915544a..04c1c6d2d 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -17,7 +17,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import forestry.core.fluids.Fluids; import net.minecraft.command.ICommand; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,6 +26,8 @@ import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.IFuelHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -265,7 +266,7 @@ public class PluginCore extends BlankForestryPlugin { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { // / CARPENTER - RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, PluginCore.items.portableAlyzer.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(100, new FluidStack(FluidRegistry.WATER, 2000), null, PluginCore.items.portableAlyzer.getItemStack(), "X#X", "X#X", "RDR", '#', OreDictUtil.PANE_GLASS, 'X', OreDictUtil.INGOT_TIN, @@ -340,9 +341,9 @@ public class PluginCore extends BlankForestryPlugin { int bogEarthOutputCan = ForestryAPI.activeMode.getIntegerSetting("recipe.output.bogearth.can"); if (bogEarthOutputCan > 0) { ItemStack bogEarth = blocks.bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, bogEarthOutputCan); - ItemStack canWater = PluginFluids.items.getContainer(EnumContainerType.CAN, Fluids.WATER); - ItemStack waxCapsuleWater = PluginFluids.items.getContainer(EnumContainerType.CAPSULE, Fluids.WATER); - ItemStack refractoryWater = PluginFluids.items.getContainer(EnumContainerType.REFRACTORY, Fluids.WATER); + ItemStack canWater = PluginFluids.items.getContainer(EnumContainerType.CAN, FluidRegistry.WATER); + ItemStack waxCapsuleWater = PluginFluids.items.getContainer(EnumContainerType.CAPSULE, FluidRegistry.WATER); + ItemStack refractoryWater = PluginFluids.items.getContainer(EnumContainerType.REFRACTORY, FluidRegistry.WATER); RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', canWater, 'Y', OreDictUtil.SAND); RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', waxCapsuleWater, 'Y', OreDictUtil.SAND); RecipeUtil.addRecipe(bogEarth, "#Y#", "YXY", "#Y#", '#', Blocks.DIRT, 'X', refractoryWater, 'Y', OreDictUtil.SAND); diff --git a/src/main/java/forestry/core/fluids/PipetteContents.java b/src/main/java/forestry/core/fluids/PipetteContents.java index d9a31bc3d..bcdf36e38 100644 --- a/src/main/java/forestry/core/fluids/PipetteContents.java +++ b/src/main/java/forestry/core/fluids/PipetteContents.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import forestry.api.core.INbtWritable; @@ -48,7 +49,7 @@ public class PipetteContents implements INbtWritable { } public boolean isFull() { - return contents.amount >= 1000; + return contents.amount >= Fluid.BUCKET_VOLUME; } public void addTooltip(List list) { diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java b/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java index a6ef4090c..cd033b8b4 100644 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidTank; @@ -62,7 +63,7 @@ public class ContainerLiquidTanksHelper if (pipette.canPipette(itemstack) && liquidAmount > 0) { if (liquidAmount > 0) { if (tank instanceof FluidTank) { - FluidStack fillAmount = ((FluidTank) tank).drainInternal(1000, false); + FluidStack fillAmount = ((FluidTank) tank).drainInternal(Fluid.BUCKET_VOLUME, false); int filled = pipette.fill(itemstack, fillAmount, true); tank.drain(filled, true); player.updateHeldItem(); diff --git a/src/main/java/forestry/core/items/ItemRegistryFluids.java b/src/main/java/forestry/core/items/ItemRegistryFluids.java index 88d1bc9b3..4eb6a4f23 100644 --- a/src/main/java/forestry/core/items/ItemRegistryFluids.java +++ b/src/main/java/forestry/core/items/ItemRegistryFluids.java @@ -13,11 +13,15 @@ package forestry.core.items; import java.util.EnumMap; import java.util.Map; -import forestry.core.fluids.Fluids; import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; +import forestry.core.fluids.Fluids; + public class ItemRegistryFluids extends ItemRegistry { public final ItemFluidContainerForestry canEmpty; public final ItemFluidContainerForestry waxCapsuleEmpty; @@ -26,9 +30,13 @@ public class ItemRegistryFluids extends ItemRegistry { private final Map containers = new EnumMap<>(EnumContainerType.class); public ItemStack getContainer(EnumContainerType type, Fluids fluid) { + return getContainer(type, fluid.getFluid()); + } + + public ItemStack getContainer(EnumContainerType type, Fluid fluid) { ItemStack container = new ItemStack(containers.get(type)); IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container); - fluidHandler.fill(fluid.getFluid(Integer.MAX_VALUE), true); + fluidHandler.fill(new FluidStack(fluid, Integer.MAX_VALUE), true); return container; } diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java index 2a0cb1e66..8ed0838cf 100644 --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -25,6 +25,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -42,8 +43,8 @@ public abstract class RecipeUtil { if (RecipeManagers.fermenterManager == null) { return; } - - RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.0f, output.getFluid(1), Fluids.WATER.getFluid(1)); + + RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.0f, output.getFluid(1), new FluidStack(FluidRegistry.WATER, 1)); if (FluidRegistry.isFluidRegistered(Fluids.JUICE.getFluid())) { RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.5f, output.getFluid(1), Fluids.JUICE.getFluid(1)); diff --git a/src/main/java/forestry/core/recipes/jei/JEIUtils.java b/src/main/java/forestry/core/recipes/jei/JEIUtils.java index d84992bbc..3a984bde3 100644 --- a/src/main/java/forestry/core/recipes/jei/JEIUtils.java +++ b/src/main/java/forestry/core/recipes/jei/JEIUtils.java @@ -55,7 +55,7 @@ public class JEIUtils { if (fluidStack == null && Block.getBlockFromItem(stack.getItem()) instanceof IFluidBlock) { Fluid fluid = ((IFluidBlock) Block.getBlockFromItem(stack.getItem())).getFluid(); if (fluid != null) { - fluidStack = new FluidStack(fluid, 1000); + fluidStack = new FluidStack(fluid, Fluid.BUCKET_VOLUME); } } return fluidStack; diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index 4300b5b97..f94913255 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -32,7 +32,6 @@ import forestry.api.fuels.FuelManager; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; -import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; @@ -111,7 +110,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi } else if (shutdown) { - if (heatingTank.getFluidAmount() > 0 && Fluids.LAVA.is(heatingTank.getFluid())) { + if (heatingTank.getFluidAmount() > 0 && heatingTank.getFluid().getFluid() == FluidRegistry.LAVA) { addHeat(Constants.ENGINE_HEAT_VALUE_LAVA); heatingTank.drainInternal(1, true); } diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java index 793fd90d1..7914fb04c 100644 --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -17,6 +17,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import forestry.api.circuits.ChipsetManager; @@ -152,7 +153,7 @@ public class PluginFactory extends BlankForestryPlugin { FuelManager.bronzeEngineFuel.put(Fluids.BIOMASS.getFluid(), new EngineBronzeFuel(Fluids.BIOMASS.getFluid(), Constants.ENGINE_FUEL_VALUE_BIOMASS, (int) (Constants.ENGINE_CYCLE_DURATION_BIOMASS * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.biogas")), 1)); - FuelManager.bronzeEngineFuel.put(Fluids.WATER.getFluid(), new EngineBronzeFuel(Fluids.WATER.getFluid(), + FuelManager.bronzeEngineFuel.put(FluidRegistry.WATER, new EngineBronzeFuel(FluidRegistry.WATER, Constants.ENGINE_FUEL_VALUE_WATER, Constants.ENGINE_CYCLE_DURATION_WATER, 3)); FuelManager.bronzeEngineFuel.put(Fluids.MILK.getFluid(), new EngineBronzeFuel(Fluids.MILK.getFluid(), Constants.ENGINE_FUEL_VALUE_MILK, Constants.ENGINE_CYCLE_DURATION_MILK, 3)); @@ -269,8 +270,8 @@ public class PluginFactory extends BlankForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.WHEAT_SEEDS)}, seedOil); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.PUMPKIN_SEEDS)}, seedOil); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.MELON_SEEDS)}, seedOil); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{PluginCore.items.phosphor.getItemStack(2), new ItemStack(Blocks.COBBLESTONE)}, Fluids.LAVA.getFluid(1600)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Blocks.CACTUS)}, Fluids.WATER.getFluid(500)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{PluginCore.items.phosphor.getItemStack(2), new ItemStack(Blocks.COBBLESTONE)}, new FluidStack(FluidRegistry.LAVA, 1600)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Blocks.CACTUS)}, new FluidStack(FluidRegistry.WATER, 500)); RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.SNOWBALL), PluginCore.items.craftingMaterial.getIceShard(4)}, Fluids.ICE.getFluid(4000)); // STILL @@ -323,30 +324,30 @@ public class PluginFactory extends BlankForestryPlugin { "#", "#", '#', "logWood"); - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(250), null, + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 250), null, PluginCore.items.woodPulp.getItemStack(4), "#", '#', "logWood"); - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(250), null, + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 250), null, new ItemStack(Items.PAPER, 1), "#", "#", '#', "pulpWood"); - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), null, new ItemStack(PluginCore.blocks.humus, 9), "###", "#X#", "###", '#', Blocks.DIRT, 'X', PluginCore.items.mulch); - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), null, PluginCore.blocks.bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, 8), "#X#", "XYX", "#X#", '#', Blocks.DIRT, 'X', "sand", 'Y', PluginCore.items.mulch); - RecipeManagers.carpenterManager.addRecipe(75, Fluids.WATER.getFluid(5000), null, PluginCore.items.hardenedCasing.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(75, new FluidStack(FluidRegistry.WATER, 5000), null, PluginCore.items.hardenedCasing.getItemStack(), "# #", " Y ", "# #", @@ -355,21 +356,21 @@ public class PluginFactory extends BlankForestryPlugin { // / CHIPSETS ItemCircuitBoard circuitBoard = PluginCore.items.circuitboards; - RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{}), + RecipeManagers.carpenterManager.addRecipe(20, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{}), "R R", "R#R", "R R", '#', "ingotTin", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{}), + RecipeManagers.carpenterManager.addRecipe(40, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{}), "R#R", "R#R", "R#R", '#', "ingotBronze", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{}), + RecipeManagers.carpenterManager.addRecipe(80, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{}), "R#R", "R#R", "R#R", '#', "ingotIron", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.INTRICATE, null, new ICircuit[]{}), + RecipeManagers.carpenterManager.addRecipe(80, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.INTRICATE, null, new ICircuit[]{}), "R#R", "R#R", "R#R", '#', "ingotGold", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, PluginCore.items.solderingIron.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(40, new FluidStack(FluidRegistry.WATER, 1000), null, PluginCore.items.solderingIron.getItemStack(), " # ", "# #", " B", '#', "ingotIron", 'B', "ingotBronze"); // RAIN SUBSTRATES ItemRegistryApiculture beeItems = PluginApiculture.items; if (beeItems != null) { - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, PluginCore.items.iodineCharge.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), null, PluginCore.items.iodineCharge.getItemStack(), "Z#Z", "#Y#", "X#X", @@ -377,7 +378,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', Items.GUNPOWDER, 'Y', PluginFluids.items.canEmpty, 'Z', beeItems.honeyDrop); - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, PluginCore.items.craftingMaterial.getDissipationCharge(), + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), null, PluginCore.items.craftingMaterial.getDissipationCharge(), "Z#Z", "#Y#", "X#X", @@ -392,14 +393,14 @@ public class PluginFactory extends BlankForestryPlugin { PluginCore.items.craftingMaterial.getPulsatingMesh()); // Woven Silk - RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(500), null, PluginCore.items.craftingMaterial.getWovenSilk(), + RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 500), null, PluginCore.items.craftingMaterial.getWovenSilk(), "###", "###", "###", '#', PluginCore.items.craftingMaterial.getSilkWisp()); // Boxes - RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, PluginCore.items.carton.getItemStack(2), + RecipeManagers.carpenterManager.addRecipe(5, new FluidStack(FluidRegistry.WATER, 1000), null, PluginCore.items.carton.getItemStack(2), " # ", "# #", " # ", '#', "pulpWood"); // Assembly Kits diff --git a/src/main/java/forestry/factory/recipes/FermenterRecipeManager.java b/src/main/java/forestry/factory/recipes/FermenterRecipeManager.java index 2ebcf40a8..67c89335a 100644 --- a/src/main/java/forestry/factory/recipes/FermenterRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/FermenterRecipeManager.java @@ -17,11 +17,11 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.IFermenterManager; import forestry.api.recipes.IFermenterRecipe; -import forestry.core.fluids.Fluids; import forestry.core.utils.ItemStackUtil; public class FermenterRecipeManager implements IFermenterManager { @@ -38,7 +38,7 @@ public class FermenterRecipeManager implements IFermenterManager { @Override public void addRecipe(ItemStack resource, int fermentationValue, float modifier, FluidStack output) { - addRecipe(resource, fermentationValue, modifier, output, Fluids.WATER.getFluid(1000)); + addRecipe(resource, fermentationValue, modifier, output, new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME)); } public static IFermenterRecipe findMatchingRecipe(ItemStack res, FluidStack liqu) { diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index d43fe79c5..730e02692 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -32,7 +32,6 @@ import forestry.api.core.IErrorLogic; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FluidHelper; -import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.network.DataInputStreamForestry; @@ -45,7 +44,7 @@ import forestry.factory.gui.GuiRaintank; import forestry.factory.inventory.InventoryRaintank; public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile { - private static final FluidStack STACK_WATER = Fluids.WATER.getFluid(Constants.RAINTANK_AMOUNT_PER_UPDATE); + private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Constants.RAINTANK_AMOUNT_PER_UPDATE); private final FilteredTank resourceTank; private final TankManager tankManager; @@ -119,14 +118,14 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa } if (!isFilling()) { - FluidHelper.FillStatus canFill = FluidHelper.fillContainers(tankManager, this, InventoryRaintank.SLOT_RESOURCE, InventoryRaintank.SLOT_PRODUCT, Fluids.WATER.getFluid(), false); + FluidHelper.FillStatus canFill = FluidHelper.fillContainers(tankManager, this, InventoryRaintank.SLOT_RESOURCE, InventoryRaintank.SLOT_PRODUCT, FluidRegistry.WATER, false); if (canFill == FluidHelper.FillStatus.SUCCESS) { fillingTime = Constants.RAINTANK_FILLING_TIME; } } else { fillingTime--; if (fillingTime <= 0) { - FluidHelper.FillStatus filled = FluidHelper.fillContainers(tankManager, this, InventoryRaintank.SLOT_RESOURCE, InventoryRaintank.SLOT_PRODUCT, Fluids.WATER.getFluid(), true); + FluidHelper.FillStatus filled = FluidHelper.fillContainers(tankManager, this, InventoryRaintank.SLOT_RESOURCE, InventoryRaintank.SLOT_PRODUCT, FluidRegistry.WATER, true); if (filled == FluidHelper.FillStatus.SUCCESS) { fillingTime = 0; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index e6e12d369..b1b3974cf 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -21,11 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; -import forestry.core.fluids.Fluids; import forestry.core.utils.BlockUtil; import forestry.farming.FarmHelper; @@ -33,8 +34,8 @@ public abstract class FarmLogicWatered extends FarmLogic { protected final IBlockState ground; private final ItemStack resource; - - private static final FluidStack STACK_WATER = Fluids.WATER.getFluid(1000); + + private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME); protected List produce = new ArrayList<>(); diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 575a608ee..23194d054 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import forestry.core.fluids.FluidHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -62,7 +61,7 @@ import forestry.core.access.EnumAccess; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; -import forestry.core.fluids.Fluids; +import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; @@ -632,7 +631,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen final int fertilizerConsumption = logic.getFertilizerConsumption(); int liquidConsumption = logic.getWaterConsumption(hydrationModifier); - FluidStack liquid = Fluids.WATER.getFluid(liquidConsumption); + FluidStack liquid = new FluidStack(FluidRegistry.WATER, liquidConsumption); if (farmTargets != null) { for (FarmTarget target : farmTargets) { @@ -748,7 +747,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen // Check water float hydrationModifier = hydrationManager.getHydrationModifier(); int waterConsumption = provider.getWaterConsumption(hydrationModifier); - FluidStack requiredLiquid = Fluids.WATER.getFluid(waterConsumption); + FluidStack requiredLiquid = new FluidStack(FluidRegistry.WATER, waterConsumption); boolean hasLiquid = requiredLiquid.amount == 0 || hasLiquid(requiredLiquid); if (errorLogic.setCondition(!hasLiquid, EnumErrorCode.NO_LIQUID_FARM)) { diff --git a/src/main/java/forestry/mail/PluginMail.java b/src/main/java/forestry/mail/PluginMail.java index f1dcd2e31..a8c48350d 100644 --- a/src/main/java/forestry/mail/PluginMail.java +++ b/src/main/java/forestry/mail/PluginMail.java @@ -14,6 +14,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import forestry.api.circuits.ICircuit; import forestry.api.mail.EnumAddressee; @@ -133,7 +135,7 @@ public class PluginMail extends BlankForestryPlugin { RecipeUtil.addRecipe(new ItemStack(Items.PAPER), "###", '#', OreDictUtil.EMPTIED_LETTER_ORE_DICT); // Carpenter - RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(250), null, items.letters.getItemStack(), "###", "###", '#', PluginCore.items.woodPulp); + RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 250), null, items.letters.getItemStack(), "###", "###", '#', PluginCore.items.woodPulp); RecipeUtil.addShapelessRecipe(items.catalogue.getItemStack(), items.stamps.getWildcard(), new ItemStack(Items.BOOK)); diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java index 7c6fe2aae..1d6c939ef 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java @@ -34,7 +34,7 @@ public class PluginBuildCraftFuels extends BlankForestryPlugin { // @Override // public void doInit() { // ICoolantManager coolantManager = BuildcraftFuelRegistry.coolant; -// ICoolant waterCoolant = coolantManager.getCoolant(Fluids.WATER.getFluid()); + // ICoolant waterCoolant = coolantManager.getCoolant(FluidRegistry.WATER); // float waterCooling = waterCoolant.getDegreesCoolingPerMB(100); // // coolantManager.addCoolant(Fluids.ICE.getFluid(), Constants.ICE_COOLING_MULTIPLIER * waterCooling); diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index 7d083f49c..1ba39bec8 100644 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -18,8 +18,8 @@ import java.util.Set; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.event.FMLInterModComms; @@ -52,7 +52,6 @@ import forestry.core.utils.Log; import forestry.core.utils.ModUtil; import forestry.energy.PluginEnergy; import forestry.energy.blocks.BlockRegistryEnergy; -import forestry.energy.blocks.BlockTypeEngine; import forestry.energy.circuits.CircuitElectricBoost; import forestry.energy.circuits.CircuitElectricChoke; import forestry.energy.circuits.CircuitElectricEfficiency; @@ -256,11 +255,11 @@ public class PluginIC2 extends BlankForestryPlugin { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ENERGY)) { - FluidStack biogas = FluidRegistry.getFluidStack("ic2biogas", 1000); + Fluid biogas = FluidRegistry.getFluid("ic2biogas"); if (biogas != null) { int burnDuration = Math.round(Constants.ENGINE_CYCLE_DURATION_BIOMASS * ForestryAPI.activeMode.getFloatSetting("fuel.biomass.biogas")); EngineBronzeFuel bronzeFuel = new EngineBronzeFuel(Fluids.BIOMASS.getFluid(), Constants.ENGINE_FUEL_VALUE_BIOMASS, burnDuration, 1); - FuelManager.bronzeEngineFuel.put(biogas.getFluid(), bronzeFuel); + FuelManager.bronzeEngineFuel.put(biogas, bronzeFuel); } } diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 3dbaeac16..861bea43e 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -32,6 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; @@ -53,7 +55,6 @@ import forestry.core.IResupplyHandler; import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; -import forestry.core.fluids.Fluids; import forestry.core.items.ItemCrated; import forestry.core.models.ModelCrate; import forestry.core.recipes.RecipeUtil; @@ -477,7 +478,7 @@ public class PluginStorage extends BlankForestryPlugin { } private static void addCrating(@Nonnull ItemStack crateStack, @Nonnull Object uncrated) { - FluidStack water = Fluids.WATER.getFluid(Constants.CARPENTER_CRATING_LIQUID_QUANTITY); + FluidStack water = new FluidStack(FluidRegistry.WATER, Constants.CARPENTER_CRATING_LIQUID_QUANTITY); ItemStack box = items.crate.getItemStack(); RecipeManagers.carpenterManager.addRecipe(Constants.CARPENTER_CRATING_CYCLES, water, box, crateStack, "###", "###", "###", '#', uncrated); } @@ -543,7 +544,7 @@ public class PluginStorage extends BlankForestryPlugin { // / CARPENTER if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { // / CRATES - RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, items.crate.getItemStack(24), + RecipeManagers.carpenterManager.addRecipe(20, new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), null, items.crate.getItemStack(24), " # ", "# #", " # ", '#', "logWood"); // / BACKPACKS WOVEN @@ -573,7 +574,7 @@ public class PluginStorage extends BlankForestryPlugin { private static void addT2BackpackRecipe(Item backpackT1, Item backpackT2) { ItemStack wovenSilk = PluginCore.items.craftingMaterial.getWovenSilk(); - RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.getFluid(1000), null, new ItemStack(backpackT2), + RecipeManagers.carpenterManager.addRecipe(200, new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), null, new ItemStack(backpackT2), "WXW", "WTW", "WWW",