From 43bd2763899286767177441dcd96b1b7465ab9d7 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 23 Dec 2014 01:16:29 -0800 Subject: [PATCH] Close #390 Forestry Fluids should have FluidBlocks --- lang | 2 +- src/main/java/forestry/Forestry.java | 40 ++- .../java/forestry/core/EventHandlerCore.java | 20 +- src/main/java/forestry/core/ForestryCore.java | 80 +---- .../java/forestry/core/config/Config.java | 111 +++--- .../forestry/core/config/Configuration.java | 2 +- .../forestry/core/config/ForestryItem.java | 34 +- .../core/fluids/BlockForestryFluid.java | 250 ++++++++++++++ .../java/forestry/core/fluids/Fluids.java | 27 +- .../forestry/core/fluids/ForestryFluids.java | 317 ++++++++++++++++++ .../core/items/ItemLiquidContainer.java | 135 +++++++- .../java/forestry/core/proxy/ProxyCommon.java | 6 + .../render/EntityColoredDropParticleFX.java | 84 +++++ .../forestry/core/render/TextureManager.java | 11 +- .../forestry/core/utils/LiquidHelper.java | 36 +- .../java/forestry/core/utils/Schemata.java | 2 +- .../plugins/PluginBuildCraftFuels.java | 55 ++- .../java/forestry/plugins/PluginCore.java | 113 ++++--- .../java/forestry/plugins/PluginFood.java | 1 - .../{bioethanol.png => bioethanol_still.png} | Bin ...png.mcmeta => bioethanol_still.png.mcmeta} | 0 .../textures/blocks/liquid/biomass.png | Bin 4876 -> 0 bytes .../textures/blocks/liquid/biomass_still.png | Bin 0 -> 9753 bytes ...ss.png.mcmeta => biomass_still.png.mcmeta} | 0 .../blocks/liquid/for.honey_still.png | Bin 0 -> 3816 bytes ....png.mcmeta => for.honey_still.png.mcmeta} | 0 .../liquid/{glass.png => glass_still.png} | Bin ...oney.png.mcmeta => glass_still.png.mcmeta} | 0 .../forestry/textures/blocks/liquid/honey.png | Bin 4047 -> 0 bytes .../forestry/textures/blocks/liquid/ice.png | Bin 4982 -> 0 bytes .../textures/blocks/liquid/ice_still.png | Bin 0 -> 3792 bytes .../{ice.png.mcmeta => ice_still.png.mcmeta} | 0 .../forestry/textures/blocks/liquid/juice.png | Bin 4859 -> 0 bytes .../textures/blocks/liquid/juice_still.png | Bin 0 -> 3282 bytes ...uice.png.mcmeta => juice_still.png.mcmeta} | 0 .../liquid/{milk.png => milk_still.png} | Bin .../liquid/{seedoil.png => seedoil_still.png} | Bin ...il.png.mcmeta => seedoil_still.png.mcmeta} | 0 .../textures/blocks/liquid/short.mead.png | Bin 5000 -> 0 bytes .../blocks/liquid/short.mead_still.png | Bin 0 -> 6923 bytes ...png.mcmeta => short.mead_still.png.mcmeta} | 0 41 files changed, 1090 insertions(+), 236 deletions(-) create mode 100644 src/main/java/forestry/core/fluids/BlockForestryFluid.java create mode 100644 src/main/java/forestry/core/fluids/ForestryFluids.java create mode 100644 src/main/java/forestry/core/render/EntityColoredDropParticleFX.java rename src/main/resources/assets/forestry/textures/blocks/liquid/{bioethanol.png => bioethanol_still.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/liquid/{bioethanol.png.mcmeta => bioethanol_still.png.mcmeta} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/biomass_still.png rename src/main/resources/assets/forestry/textures/blocks/liquid/{biomass.png.mcmeta => biomass_still.png.mcmeta} (100%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/for.honey_still.png rename src/main/resources/assets/forestry/textures/blocks/liquid/{glass.png.mcmeta => for.honey_still.png.mcmeta} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/liquid/{glass.png => glass_still.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/liquid/{honey.png.mcmeta => glass_still.png.mcmeta} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/forestry/textures/blocks/liquid/honey.png delete mode 100755 src/main/resources/assets/forestry/textures/blocks/liquid/ice.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/ice_still.png rename src/main/resources/assets/forestry/textures/blocks/liquid/{ice.png.mcmeta => ice_still.png.mcmeta} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/forestry/textures/blocks/liquid/juice.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/juice_still.png rename src/main/resources/assets/forestry/textures/blocks/liquid/{juice.png.mcmeta => juice_still.png.mcmeta} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/liquid/{milk.png => milk_still.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/liquid/{seedoil.png => seedoil_still.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/blocks/liquid/{seedoil.png.mcmeta => seedoil_still.png.mcmeta} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/liquid/short.mead_still.png rename src/main/resources/assets/forestry/textures/blocks/liquid/{short.mead.png.mcmeta => short.mead_still.png.mcmeta} (100%) mode change 100755 => 100644 diff --git a/lang b/lang index ab16b1a2e..05bee96e8 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit ab16b1a2efc80aa48e70d81c8859fd83e143a98f +Subproject commit 05bee96e8aa617756ab7445cf32163a901c82028 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 9661e460e..9d42c573b 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -39,6 +39,9 @@ import forestry.core.utils.FluidMap; import forestry.core.utils.ItemStackMap; import forestry.core.utils.StringUtil; import java.io.File; +import java.util.HashMap; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -63,6 +66,22 @@ public class Forestry { public static Forestry instance; private File configFolder; + private static final Map mappedItems = new HashMap(); + + static { + mappedItems.put("Forestry:builderBackpack", ForestryItem.builderBackpack); + mappedItems.put("Forestry:builderBackpackT2", ForestryItem.builderBackpackT2); + mappedItems.put("Forestry:adventurerBackpack", ForestryItem.adventurerBackpack); + mappedItems.put("Forestry:adventurerBackpackT2", ForestryItem.adventurerBackpackT2); + mappedItems.put("Forestry:shortMead", ForestryItem.beverage); + mappedItems.put("Forestry:waterCan", ForestryItem.canWater); + mappedItems.put("Forestry:biofuelCan", ForestryItem.canEthanol); + mappedItems.put("Forestry:biomassCan", ForestryItem.canBiomass); + mappedItems.put("Forestry:bucketBiofuel", ForestryItem.bucketEthanol); + mappedItems.put("Forestry:refractoryBiofuel", ForestryItem.refractoryEthanol); + mappedItems.put("Forestry:waxCapsuleBiofuel", ForestryItem.waxCapsuleEthanol); + } + public Forestry() { FuelManager.fermenterFuel = new ItemStackMap(); FuelManager.moistenerResource = new ItemStackMap(); @@ -129,21 +148,12 @@ public class Forestry { if (block != null) { mapping.remap(Item.getItemFromBlock(block)); Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); - } else if (mapping.name.equals("Forestry:builderBackpack")) { - mapping.remap(ForestryItem.builderBackpack.item()); - Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.builderBackpack.name()); - } else if (mapping.name.equals("Forestry:builderBackpackT2")) { - mapping.remap(ForestryItem.builderBackpackT2.item()); - Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.builderBackpackT2.name()); - } else if (mapping.name.equals("Forestry:adventurerBackpack")) { - mapping.remap(ForestryItem.adventurerBackpack.item()); - Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.adventurerBackpack.name()); - } else if (mapping.name.equals("Forestry:adventurerBackpackT2")) { - mapping.remap(ForestryItem.adventurerBackpackT2.item()); - Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.adventurerBackpackT2.name()); - } else if (mapping.name.equals("Forestry:shortMead")) { - mapping.remap(ForestryItem.beverage.item()); - Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.beverage.name()); + } else { + ForestryItem mappedItem = mappedItems.get(mapping.name); + if (mappedItem != null) { + mapping.remap(mappedItem.item()); + Proxies.log.warning("Remapping item " + mapping.name + " to " + mappedItem.name()); + } } } } diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index dd5caadce..465fb4752 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,22 +10,25 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.core.ErrorStateRegistry; -import forestry.core.fluids.Fluids; +import forestry.core.fluids.ForestryFluids; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.render.TextureManager; import forestry.plugins.PluginManager; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.oredict.OreDictionary; public class EventHandlerCore { @@ -86,8 +89,9 @@ public class EventHandlerCore { if(event.map.getTextureType() == 1) { ErrorStateRegistry.initIcons(event.map); TextureManager.getInstance().initDefaultIcons(event.map); - } else if(event.map.getTextureType() == 0) - Fluids.resetFluidIcons(event.map); + } else if(event.map.getTextureType() == 0) { + ForestryFluids.resetFluidIcons(event.map); + } } @SubscribeEvent diff --git a/src/main/java/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java index 12da31df3..bec6868b0 100755 --- a/src/main/java/forestry/core/ForestryCore.java +++ b/src/main/java/forestry/core/ForestryCore.java @@ -11,10 +11,21 @@ package forestry.core; import com.google.common.collect.ImmutableList; + +import java.io.File; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; + +import net.minecraftforge.common.MinecraftForge; + import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import forestry.api.apiculture.FlowerManager; import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; @@ -34,12 +45,6 @@ import forestry.core.gadgets.TileMill; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; import forestry.plugins.PluginManager; -import java.io.File; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.common.MinecraftForge; public class ForestryCore { @@ -61,7 +66,6 @@ public class ForestryCore { public void init(Object basemod) { - // Register Liquids & Containers registerLiquidContainers(); // Register world generator @@ -123,7 +127,6 @@ public class ForestryCore { } public void postInit() { - PluginManager.runPostInit(); Proxies.common.registerTickHandlers(); @@ -144,61 +147,14 @@ public class ForestryCore { return "after:mod_IC2;after:mod_BuildCraftCore;after:mod_BuildCraftEnergy;after:mod_BuildCraftFactory;after:mod_BuildCraftSilicon;after:mod_BuildCraftTransport;after:mod_RedPowerWorld"; } + /** Set containers for vanilla liquids */ private void registerLiquidContainers() { - // Add lava and water buckets to the API in case this has not been done yet. - if (LiquidHelper.isEmptyLiquidData()) { - LiquidHelper.injectLiquidContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket)); - LiquidHelper.injectLiquidContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.water_bucket), new ItemStack(Items.bucket)); - } - - // Glass - Fluids.GLASS.register(); - - // Set default lava, water and biofuel buckets - Fluids.MILK.register(); - LiquidHelper.injectLiquidContainer(Fluids.MILK, Defaults.BUCKET_VOLUME, new ItemStack(Items.milk_bucket), new ItemStack(Items.bucket)); - - // Lava - LiquidHelper.injectTinContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, ForestryItem.canLava.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, ForestryItem.refractoryLava.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - // Water - LiquidHelper.injectLiquidContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.glass_bottle)); - LiquidHelper.injectTinContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, ForestryItem.canWater.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleWater.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, ForestryItem.refractoryWater.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - Fluids.BIOMASS.register(); - LiquidHelper.injectLiquidContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.bucketBiomass.getItemStack(), new ItemStack(Items.bucket)); - LiquidHelper.injectTinContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.canBiomass.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleBiomass.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.refractoryBiomass.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - Fluids.BIOETHANOL.register(); - LiquidHelper.injectLiquidContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.bucketBiofuel.getItemStack(), new ItemStack(Items.bucket)); - LiquidHelper.injectTinContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.canBiofuel.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleBiofuel.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryBiofuel.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - Fluids.SEEDOIL.register(); - LiquidHelper.injectTinContainer(Fluids.SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.canSeedOil.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleSeedOil.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.refractorySeedOil.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - Fluids.HONEY.register(); - LiquidHelper.injectTinContainer(Fluids.HONEY, Defaults.BUCKET_VOLUME, ForestryItem.canHoney.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.HONEY, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleHoney.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.HONEY, Defaults.BUCKET_VOLUME, ForestryItem.refractoryHoney.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - Fluids.JUICE.register(); - LiquidHelper.injectTinContainer(Fluids.JUICE, Defaults.BUCKET_VOLUME, ForestryItem.canJuice.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.JUICE, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleJuice.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.JUICE, Defaults.BUCKET_VOLUME, ForestryItem.refractoryJuice.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - - Fluids.ICE.register(); - LiquidHelper.injectTinContainer(Fluids.ICE, Defaults.BUCKET_VOLUME, ForestryItem.canIce.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.ICE, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleIce.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.ICE, Defaults.BUCKET_VOLUME, ForestryItem.refractoryIce.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.LAVA, ForestryItem.canLava.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.LAVA, ForestryItem.refractoryLava.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.potionitem), new ItemStack(Items.glass_bottle)); + LiquidHelper.injectLiquidContainer(Fluids.WATER, ForestryItem.canWater.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.WATER, ForestryItem.waxCapsuleWater.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.WATER, ForestryItem.refractoryWater.getItemStack()); } } diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index b022d4804..e66da0a98 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -19,20 +19,26 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Locale; +import java.util.Map; import java.util.Properties; +import java.util.Set; +import forestry.core.fluids.ForestryFluids; import forestry.core.proxy.Proxies; public class Config { public static final String CATEGORY_COMMON = "common"; + public static final String CATEGORY_FLUIDS = "fluids"; public static final String CATEGORY_DEBUG = "debug"; public static Configuration config; public static String gameMode; - public static final HashSet disabledStructures = new HashSet(); + private static final Set disabledStructures = new HashSet(); + private static final Set disabledFluids = new HashSet(); + private static final Set disabledBlocks = new HashSet(); public static boolean isDebug = false; @@ -65,10 +71,6 @@ public class Config { private static boolean craftingBronzeEnabled = true; - public static boolean getCraftingBronzeEnabled() { - return craftingBronzeEnabled; - } - public static boolean craftingStampsEnabled = true; public static final ArrayList collectorStamps = new ArrayList(); @@ -82,6 +84,22 @@ public class Config { public static final HashMap hints = new HashMap(); public static boolean disableEnergyStat = false; + public static boolean isStructureEnabled(String uid) { + return !Config.disabledStructures.contains(uid); + } + + public static boolean isFluidEnabled(ForestryFluids fluids) { + return !Config.disabledFluids.contains(fluids.tag); + } + + public static boolean isBlockEnabled(String tag) { + return !Config.disabledBlocks.contains(tag); + } + + public static boolean isCraftingBronzeEnabled() { + return craftingBronzeEnabled; + } + public static void load() { setDebugMode(); @@ -96,35 +114,10 @@ public class Config { config.addPurge("buildcraft.ignore"); config.addPurge("power.framework"); - Property property = config.get("difficulty.gamemode", CATEGORY_COMMON, "EASY"); - property.comment = "set to your preferred game mode. available modes are OP, EASY, NORMAL, HARD. mismatch with the server may cause visual glitches with recipes. setting an unavailable mode will create a new mode definition file."; - gameMode = property.value; + loadModes(); + loadFluids(); - property = config.get("difficulty.recreate.definitions", CATEGORY_COMMON, true); - property.comment = "set to true to force recreation of the game mode definitions in config/forestry/gamemodes"; - boolean recreate = Boolean.parseBoolean(property.value); - - if (recreate) - Proxies.log.info("Recreating all gamemode definitions from the defaults. This may be caused by an upgrade"); - - // Make sure the default mode files are there. - File easyMode = config.getCategoryFile("gamemodes/EASY"); - if (recreate) - CopyFileToFS(easyMode, "/config/forestry/gamemodes/EASY.conf"); - - File opMode = config.getCategoryFile("gamemodes/OP"); - if (!opMode.exists() || recreate) - CopyFileToFS(opMode, "/config/forestry/gamemodes/OP.conf"); - - File normalMode = config.getCategoryFile("gamemodes/NORMAL"); - if (!normalMode.exists() || recreate) - CopyFileToFS(normalMode, "/config/forestry/gamemodes/NORMAL.conf"); - - File hardMode = config.getCategoryFile("gamemodes/HARD"); - if (!hardMode.exists() || recreate) - CopyFileToFS(hardMode, "/config/forestry/gamemodes/HARD.conf"); - - config.set("difficulty.recreate.definitions", CATEGORY_COMMON, false); + Property property; Property particleFX = config.get("performance.particleFX.enabled", CATEGORY_COMMON, true); particleFX.comment = "set to false to disable particle fx on slower machines"; @@ -217,6 +210,53 @@ public class Config { loadHints(); } + private static void loadModes() { + Property property = config.get("difficulty.gamemode", CATEGORY_COMMON, "EASY"); + property.comment = "set to your preferred game mode. available modes are OP, EASY, NORMAL, HARD. mismatch with the server may cause visual glitches with recipes. setting an unavailable mode will create a new mode definition file."; + gameMode = property.value; + + property = config.get("difficulty.recreate.definitions", CATEGORY_COMMON, true); + property.comment = "set to true to force recreation of the game mode definitions in config/forestry/gamemodes"; + boolean recreate = Boolean.parseBoolean(property.value); + + if (recreate) + Proxies.log.info("Recreating all gamemode definitions from the defaults. This may be caused by an upgrade"); + + // Make sure the default mode files are there. + File easyMode = config.getCategoryFile("gamemodes/EASY"); + if (recreate) + CopyFileToFS(easyMode, "/config/forestry/gamemodes/EASY.conf"); + + File opMode = config.getCategoryFile("gamemodes/OP"); + if (!opMode.exists() || recreate) + CopyFileToFS(opMode, "/config/forestry/gamemodes/OP.conf"); + + File normalMode = config.getCategoryFile("gamemodes/NORMAL"); + if (!normalMode.exists() || recreate) + CopyFileToFS(normalMode, "/config/forestry/gamemodes/NORMAL.conf"); + + File hardMode = config.getCategoryFile("gamemodes/HARD"); + if (!hardMode.exists() || recreate) + CopyFileToFS(hardMode, "/config/forestry/gamemodes/HARD.conf"); + + config.set("difficulty.recreate.definitions", CATEGORY_COMMON, false); + } + + private static void loadFluids() { + Property property; + for (ForestryFluids fluid : ForestryFluids.values()) { + property = config.get("disable.fluid." + fluid.tag, CATEGORY_FLUIDS, false); + property.comment = "set to true to disable the fluid for " + fluid.tag; + if (Boolean.parseBoolean(property.value)) + Config.disabledFluids.add(fluid.tag); + + property = config.get("disable.fluidBlock." + fluid.tag, CATEGORY_FLUIDS, false); + property.comment = "set to true to disable the in-world FluidBlock for " + fluid.tag; + if (Boolean.parseBoolean(property.value)) + Config.disabledBlocks.add(fluid.tag); + } + } + private static void setDebugMode() { File debug = new File(Proxies.common.getForestryRoot(), "config/" + Defaults.MOD.toLowerCase(Locale.ENGLISH) + "/DEBUG.ON"); isDebug = debug.exists(); @@ -279,9 +319,4 @@ public class Config { else return list.split("[;]+"); } - - public static boolean getOrCreateBooleanProperty(String key, String kind, boolean defaults) { - return Boolean.parseBoolean(config.get(key, kind, defaults).value); - } - } diff --git a/src/main/java/forestry/core/config/Configuration.java b/src/main/java/forestry/core/config/Configuration.java index e9e6269e3..40d60d5b1 100755 --- a/src/main/java/forestry/core/config/Configuration.java +++ b/src/main/java/forestry/core/config/Configuration.java @@ -237,8 +237,8 @@ public class Configuration { writer.write("# " + Defaults.MOD + newLine + "# " + Version.getVersion() + newLine); writer.write("#" + newLine + "# Config files:" + newLine); - writer.write("# base.conf\t\t-\t Contains Forge configuration for block and item ids" + newLine); writer.write("# common.conf\t\t-\t Contains all options common to Forestry" + newLine); + writer.write("# fluids.conf\t\t-\t Contains all options for fluids" + newLine); writer.write("# apiculture.conf\t-\t Contains all options for bee breeding" + newLine); writer.write("# backpacks.conf\t-\t Contains custom configurations for backpacks" + newLine); writer.write("# pipes.conf\t\t-\t Configures item id for the apiarist's pipe" + newLine); diff --git a/src/main/java/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java index 46465d42c..4e839aae8 100755 --- a/src/main/java/forestry/core/config/ForestryItem.java +++ b/src/main/java/forestry/core/config/ForestryItem.java @@ -10,10 +10,16 @@ ******************************************************************************/ package forestry.core.config; +import forestry.core.fluids.ForestryFluids; +import forestry.core.items.ItemLiquidContainer; import forestry.core.proxy.Proxies; import forestry.plugins.PluginManager; import forestry.plugins.PluginManager.Stage; + +import java.awt.Color; import java.util.EnumSet; + +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -42,7 +48,13 @@ public enum ForestryItem { wrench, pipette, bucketBiomass, - bucketBiofuel, + bucketEthanol, + bucketGlass, + bucketHoney, + bucketIce, + bucketJuice, + bucketSeedoil, + bucketShortMead, // Crafting impregnatedCasing, sturdyCasing, @@ -156,7 +168,7 @@ public enum ForestryItem { waxCapsule, waxCapsuleWater, waxCapsuleBiomass, - waxCapsuleBiofuel, + waxCapsuleEthanol, waxCapsuleOil, waxCapsuleFuel, waxCapsuleSeedOil, @@ -167,7 +179,7 @@ public enum ForestryItem { refractoryEmpty, refractoryWater, refractoryBiomass, - refractoryBiofuel, + refractoryEthanol, refractoryOil, refractoryFuel, refractoryLava, @@ -179,7 +191,7 @@ public enum ForestryItem { canWater, canEmpty, canBiomass, - canBiofuel, + canEthanol, canOil, canFuel, canLava, @@ -283,4 +295,18 @@ public enum ForestryItem { return null; return new ItemStack(item, qty, meta); } + + public void registerContainer(ItemLiquidContainer.EnumContainerType type, ForestryFluids fluid, int healAmount, float saturationModifier) { + ItemLiquidContainer liquidContainer = new ItemLiquidContainer(type, fluid.getBlock(), fluid.getColor()); + liquidContainer.setDrink(healAmount, saturationModifier); + registerItem(liquidContainer, toString()); + } + + public void registerContainer(ItemLiquidContainer.EnumContainerType type, ForestryFluids fluid) { + registerItem(new ItemLiquidContainer(type, fluid.getBlock(), fluid.getColor()), toString()); + } + + public void registerContainer(ItemLiquidContainer.EnumContainerType type, Block block, Color color) { + registerItem(new ItemLiquidContainer(type, block, color), toString()); + } } diff --git a/src/main/java/forestry/core/fluids/BlockForestryFluid.java b/src/main/java/forestry/core/fluids/BlockForestryFluid.java new file mode 100644 index 000000000..794459ff3 --- /dev/null +++ b/src/main/java/forestry/core/fluids/BlockForestryFluid.java @@ -0,0 +1,250 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.fluids; + +import java.awt.Color; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.init.Blocks; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import forestry.core.config.Defaults; +import forestry.core.render.EntityColoredDropParticleFX; +import forestry.core.render.TextureManager; + +public class BlockForestryFluid extends BlockFluidClassic { + + private final boolean flammable; + private final int flammability; + private final Color color; + + @SideOnly(Side.CLIENT) + private List icons; + + public BlockForestryFluid(ForestryFluids forestryFluid) { + this(forestryFluid, 0, false); + } + + public BlockForestryFluid(ForestryFluids forestryFluid, int flammability, boolean flammable) { + this(forestryFluid.standardFluid.get(), flammability, flammable, forestryFluid.getColor()); + } + + private BlockForestryFluid(Fluid fluid, int flammability, boolean flammable, Color color) { + super(fluid, Material.water); + + setDensity(fluid.getDensity()); + + this.flammability = flammability; + this.flammable = flammable; + + this.color = color; + } + + @Override + public boolean canDrain(World world, int x, int y, int z) { + return true; + } + + @Override + public Fluid getFluid() { + return FluidRegistry.getFluid(fluidName); + } + + @Override + public IIcon getIcon(int side, int meta) { + if (side == 0 || side == 1 || this.icons.size() == 1) { + return this.icons.get(0); + } else { + return this.icons.get(1); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + + this.icons = new ArrayList(2); + + String still = "liquid/" + fluidName + "_still"; + this.icons.add(TextureManager.getInstance().registerTex(iconRegister, still)); + + if(flowTextureExists()) { + String flow = "liquid/" + fluidName + "_flow"; + this.icons.add(TextureManager.getInstance().registerTex(iconRegister, flow)); + } + } + + @SideOnly(Side.CLIENT) + public boolean flowTextureExists() { + try { + ResourceLocation resourceLocation = new ResourceLocation(Defaults.ID, "textures/blocks/liquid/" + fluidName + "_flow.png"); + IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager(); + return resourceManager.getResource(resourceLocation) != null; + } catch (java.lang.Exception e) { + return false; + } + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + if (rand.nextInt(10) == 0 && World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && !world.getBlock(x, y - 2, z).getMaterial().blocksMovement()) { + double px = (double) ((float) x + rand.nextFloat()); + double py = (double) y - 1.05D; + double pz = (double) ((float) z + rand.nextFloat()); + + EntityFX fx = new EntityColoredDropParticleFX(world, px, py, pz, color.getRed(), color.getGreen(), color.getBlue()); + FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx); + } + } + + @Override + public boolean canDisplace(IBlockAccess world, int x, int y, int z) { + if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + return false; + } + return super.canDisplace(world, x, y, z); + } + + @Override + public boolean displaceIfPossible(World world, int x, int y, int z) { + if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + return false; + } + return super.displaceIfPossible(world, x, y, z); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return flammable ? 30 : 0; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return flammability; + } + + public boolean isFlammable(IBlockAccess world, int x, int y, int z) { + return flammable; + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return flammable; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return flammable && flammability == 0; + } + + public Color getColor() { + return color; + } + + @Override + public Material getMaterial() { + // Fahrenheit 451 = 505.928 Kelvin + // The temperature at which book-paper catches fire, and burns. + if (temperature > 505) + return Material.lava; + else + return super.getMaterial(); + } + + @Override + public void updateTick(World world, int x, int y, int z, Random rand) { + super.updateTick(world, x, y, z, rand); + + // Start fires if the fluid is lava-like + if (getMaterial() == Material.lava) { + int rangeUp = rand.nextInt(3); + + for (int i = 0; i < rangeUp; ++i) { + x += rand.nextInt(3) - 1; + ++y; + z += rand.nextInt(3) - 1; + Block block = world.getBlock(x, y, z); + + if (block.getMaterial() == Material.air) { + if (isNeighborFlammable(world, x, y, z)) { + world.setBlock(x, y, z, Blocks.fire); + return; + } + } else if (block.getMaterial().blocksMovement()) { + return; + } + } + + if (rangeUp == 0) { + int startX = x; + int startZ = z; + + for (int i = 0; i < 3; ++i) { + x = startX + rand.nextInt(3) - 1; + z = startZ + rand.nextInt(3) - 1; + + if (world.isAirBlock(x, y + 1, z) && this.isFlammable(world, x, y, z)) { + world.setBlock(x, y + 1, z, Blocks.fire); + } + } + } + } + + // explode if very flammable and near fire + int flammability = getFlammability(world, x, y, z, ForgeDirection.UNKNOWN); + if (flammability > 0) { + // Explosion size is determined by flammability, up to size 4. + float explosionSize = 4F * flammability / 300F; + if (explosionSize > 1.0 && isNearFire(world, x, y, z)) { + world.setBlock(x, y, z, Blocks.fire); + world.newExplosion(null, x, y, z, explosionSize, true, true); + } + } + } + + private boolean isNeighborFlammable(World world, int x, int y, int z) { + return isFlammable(world, x - 1, y, z) || + isFlammable(world, x + 1, y, z) || + isFlammable(world, x, y, z - 1) || + isFlammable(world, x, y, z + 1) || + isFlammable(world, x, y - 1, z) || + isFlammable(world, x, y + 1, z); + } + + private boolean isNearFire(World world, int x, int y, int z) { + AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 1, y + 1, z + 1); + return world.func_147470_e(boundingBox); + } +} diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index 12040b03a..dcf17563a 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -10,13 +10,10 @@ ******************************************************************************/ package forestry.core.fluids; -import forestry.core.render.TextureManager; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; -import net.minecraft.client.renderer.texture.IIconRegister; + import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -28,9 +25,7 @@ import net.minecraftforge.fluids.FluidStack; public enum Fluids { WATER, LAVA, FUEL, BIOMASS, BIOFUEL, CREOSOTE, STEAM, BIOETHANOL, - COAL, PYROTHEUM, HONEY, MILK, JUICE, ICE, GLASS, OIL, SEEDOIL, SHORT_MEAD("short.mead"); - - private static final List myLiquids = new ArrayList(values().length); + COAL, PYROTHEUM, HONEY("for.honey"), MILK, JUICE, ICE, GLASS, OIL, SEEDOIL, SHORT_MEAD("short.mead"); private final String tag; @@ -50,15 +45,6 @@ public enum Fluids { return FluidRegistry.getFluid(tag); } - public void register() { - Fluid fluid = get(); - if (fluid == null) { - fluid = new Fluid(tag); - FluidRegistry.registerFluid(fluid); - myLiquids.add(tag); - } - } - /** * Gets a FluidStack filled with mb milliBuckets worth of Fluid. */ @@ -84,12 +70,5 @@ public enum Fluids { return fluid == null && fluidStack == null; } - public static void resetFluidIcons(IIconRegister register) { - for (String fluidString : myLiquids) { - Fluid fluid = FluidRegistry.getFluid(fluidString); - IIcon icon = TextureManager.getInstance().registerTex(register, "liquid/" + fluid.getName()); - fluid.setIcons(icon); - } - } } diff --git a/src/main/java/forestry/core/fluids/ForestryFluids.java b/src/main/java/forestry/core/fluids/ForestryFluids.java new file mode 100644 index 000000000..aa0c0d31e --- /dev/null +++ b/src/main/java/forestry/core/fluids/ForestryFluids.java @@ -0,0 +1,317 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.fluids; + +import java.awt.Color; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; + +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import forestry.core.config.Config; +import forestry.core.config.ForestryItem; +import forestry.core.items.ItemLiquidContainer; +import forestry.core.proxy.Proxies; +import forestry.core.utils.LiquidHelper; + +public enum ForestryFluids { + + ETHANOL(Fluids.BIOETHANOL, new Color(255, 111, 0), 790, 1000) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this, 300, true); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketEthanol.getItemStack(), + ForestryItem.canEthanol.getItemStack(), + ForestryItem.waxCapsuleEthanol.getItemStack(), + ForestryItem.refractoryEthanol.getItemStack() + ); + } + }, + BIOMASS(Fluids.BIOMASS, new Color(100, 132, 41), 400, 6560) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this, 100, true); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketBiomass.getItemStack(), + ForestryItem.canBiomass.getItemStack(), + ForestryItem.waxCapsuleBiomass.getItemStack(), + ForestryItem.refractoryBiomass.getItemStack() + ); + } + }, + LIQUID_GLASS(Fluids.GLASS, new Color(164, 164, 164), 2400, 10000, 1200) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this, 0, true); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketGlass.getItemStack() + ); + } + }, + HONEY(Fluids.HONEY, new Color(255, 173, 31), 1420, 73600) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketHoney.getItemStack(), + ForestryItem.canHoney.getItemStack(), + ForestryItem.waxCapsuleHoney.getItemStack(), + ForestryItem.refractoryHoney.getItemStack() + ); + } + }, + ICE(Fluids.ICE, new Color(175, 242, 255), 920, 1000, 265) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketIce.getItemStack(), + ForestryItem.canIce.getItemStack(), + ForestryItem.waxCapsuleIce.getItemStack(), + ForestryItem.refractoryIce.getItemStack() + ); + } + }, + JUICE(Fluids.JUICE, new Color(168, 201, 114), 1000, 1000) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketJuice.getItemStack(), + ForestryItem.canJuice.getItemStack(), + ForestryItem.waxCapsuleJuice.getItemStack(), + ForestryItem.refractoryJuice.getItemStack() + ); + } + }, + MILK(Fluids.MILK, new Color(255, 255, 255), 1030, 3000) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + @Override + List getFilledContainers() { + return Arrays.asList( + new ItemStack(Items.milk_bucket) + ); + } + }, + SEEDOIL(Fluids.SEEDOIL, new Color(255, 255, 168), 885, 5000) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this, 2, true); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketSeedoil.getItemStack(), + ForestryItem.canSeedOil.getItemStack(), + ForestryItem.waxCapsuleSeedOil.getItemStack(), + ForestryItem.refractorySeedOil.getItemStack() + ); + } + }, + SHORT_MEAD(Fluids.SHORT_MEAD, new Color(239, 153, 0), 1000, 1200) { + @Override + public Block makeBlock() { + return new BlockForestryFluid(this); + } + @Override + List getFilledContainers() { + return Arrays.asList( + ForestryItem.bucketShortMead.getItemStack() + ); + } + }; + + public static final ForestryFluids[] VALUES = values(); + public final String tag; + public final Fluids standardFluid; + public final int density, viscosity, temperature; + private final Color color; + protected Fluid fluid; + protected Block fluidBlock; + + private ForestryFluids(Fluids standardFluid, Color color, int density, int viscosity) { + this(standardFluid, color, density, viscosity, 295); + } + + private ForestryFluids(Fluids standardFluid, Color color, int density, int viscosity, int temperature) { + this.tag = "fluid." + standardFluid.getTag(); + this.standardFluid = standardFluid; + this.color = color; + this.density = density; + this.viscosity = viscosity; + this.temperature = temperature; + } + + private void initFluid() { + if (fluid == null && Config.isFluidEnabled(this)) { + fluid = new Fluid(standardFluid.getTag()).setDensity(density).setViscosity(viscosity).setTemperature(temperature); + FluidRegistry.registerFluid(fluid); + initBlock(); + } + } + + List getFilledContainers() { + return Collections.emptyList(); + } + + abstract Block makeBlock(); + + private void initBlock() { + if (fluidBlock != null) + return; + + Fluid fluid = standardFluid.get(); + if (fluid == null) + return; + + fluidBlock = fluid.getBlock(); + + if (Config.isBlockEnabled(tag)) + if (fluidBlock == null) { + fluidBlock = makeBlock(); + fluidBlock.setBlockName("forestry." + tag); + Proxies.common.registerBlock(fluidBlock, ItemBlock.class); + } else { + GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock); + Proxies.log.severe("Pre-existing {0} fluid block detected, deferring to {1}:{2}, " + + "this may cause issues if the server/client have different mod load orders, " + + "recommended that you disable all but one instance of {0} fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name); + } + } + + public static void resetFluidIcons(IIconRegister register) { + for (ForestryFluids fluid : VALUES) { + fluid.getBlock().registerBlockIcons(register); + } + } + + public Block getBlock() { + return fluidBlock; + } + + public Color getColor() { + return color; + } + + public static class MissingFluidException extends RuntimeException { + + public MissingFluidException(String tag) { + super("Fluid '" + tag + "' was not found. Please check your configs."); + } + + } + + public static void preInit() { + for (ForestryFluids fluidType : VALUES) { + fluidType.initFluid(); + } + } + + public static void init() { + for (ForestryFluids fluidType : VALUES) { + if (fluidType.standardFluid.get() == null) + continue; + + for (ItemStack filledContainer : fluidType.getFilledContainers()) { + LiquidHelper.injectLiquidContainer(fluidType.standardFluid, filledContainer); + } + } + } + + public static void postInit() { + for (ForestryFluids fluidType : VALUES) { + fluidType.initBlock(); + if (fluidType.standardFluid.get() == null) + throw new MissingFluidException(fluidType.standardFluid.getTag()); + } + } + + public static class TextureHook { + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void textureHook(TextureStitchEvent.Post event) { + if (event.map.getTextureType() == 0) { + for (ForestryFluids fluidType : VALUES) { + if (fluidType.fluid != null) + fluidType.fluid.setIcons(fluidType.fluidBlock.getBlockTextureFromSide(1), fluidType.fluidBlock.getBlockTextureFromSide(2)); + } + } + } + + } + + public static Object getTextureHook() { + return new TextureHook(); + } + + public static class FillBucketHook { + @SubscribeEvent + public void fillBucket(FillBucketEvent event) { + MovingObjectPosition movingObjectPosition = event.target; + int x = movingObjectPosition.blockX; + int y = movingObjectPosition.blockY; + int z = movingObjectPosition.blockZ; + Block targetedBlock = event.world.getBlock(x, y, z); + if (targetedBlock instanceof BlockForestryFluid) { + Item filledBucket = ItemLiquidContainer.getExistingBucket(targetedBlock); + if (filledBucket != null) { + event.result = new ItemStack(filledBucket); + event.setResult(Event.Result.ALLOW); + } + } + } + } + + public static Object getFillBucketHook() { + return new FillBucketHook(); + } +} \ No newline at end of file diff --git a/src/main/java/forestry/core/items/ItemLiquidContainer.java b/src/main/java/forestry/core/items/ItemLiquidContainer.java index 0b2056840..9007cb4e0 100755 --- a/src/main/java/forestry/core/items/ItemLiquidContainer.java +++ b/src/main/java/forestry/core/items/ItemLiquidContainer.java @@ -10,17 +10,18 @@ ******************************************************************************/ package forestry.core.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.CreativeTabForestry; -import forestry.core.fluids.FluidHelper; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; +import java.awt.Color; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; +import java.util.Random; + import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -28,17 +29,29 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import forestry.core.CreativeTabForestry; +import forestry.core.fluids.BlockForestryFluid; +import forestry.core.fluids.FluidHelper; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; + public class ItemLiquidContainer extends Item { public static enum EnumContainerType { - - GLASS, JAR, CAN, CAPSULE, REFRACTORY + GLASS, JAR, CAN, CAPSULE, REFRACTORY, BUCKET } + private static final Map buckets = new HashMap(); + private boolean isDrink = false; private boolean isAlwaysEdible = false; @@ -46,14 +59,25 @@ public class ItemLiquidContainer extends Item { private float saturationModifier = 0.0f; private final EnumContainerType type; - private final int colour; + private final Block contents; + private final Color color; - public ItemLiquidContainer(EnumContainerType type, int colour) { + public ItemLiquidContainer(EnumContainerType type, Block contents, Color color) { super(); this.type = type; - this.colour = colour; + this.contents = contents; + this.color = color; setCreativeTab(CreativeTabForestry.tabForestry); setMaxStackSize(16); + if (type == EnumContainerType.BUCKET) { + setContainerItem(Items.bucket); + this.maxStackSize = 1; + buckets.put(contents, this); + } + } + + public static ItemLiquidContainer getExistingBucket(Block contents) { + return buckets.get(contents); } private int getMatchingSlot(EntityPlayer player, ItemStack stack) { @@ -141,8 +165,8 @@ public class ItemLiquidContainer extends Item { } } - if (fluid == null || fluid.amount <= 0) - return itemstack; + if (fluid == null || fluid.amount <= 0 && this.type == EnumContainerType.BUCKET) + return tryPlaceLiquid(itemstack, world, entityplayer, movingobjectposition); ItemStack filledContainer = FluidHelper.getFilledContainer(fluid.getFluid(), itemstack); if (filledContainer == null) @@ -179,6 +203,81 @@ public class ItemLiquidContainer extends Item { } + private ItemStack tryPlaceLiquid(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { + + if (this.type != EnumContainerType.BUCKET) { + return itemstack; + } + + if (this.contents == Blocks.air) { + return new ItemStack(Items.bucket); + } + + int x = movingobjectposition.blockX; + int y = movingobjectposition.blockY; + int z = movingobjectposition.blockZ; + + switch (movingobjectposition.sideHit) { + case 0: --y; break; + case 1: ++y; break; + case 2: --z; break; + case 3: ++z; break; + case 4: --x; break; + case 5: ++x; break; + } + + if (!player.canPlayerEdit(x, y, z, movingobjectposition.sideHit, itemstack)) { + return itemstack; + } + + if (this.tryPlaceLiquidAtPosition(world, x, y, z) && !player.capabilities.isCreativeMode) { + return new ItemStack(Items.bucket); + } + + return itemstack; + } + + private boolean tryPlaceLiquidAtPosition(World world, int x, int y, int z) { + if (this.contents == Blocks.air) { + return false; + } else { + Material material = world.getBlock(x, y, z).getMaterial(); + boolean isLiquid = !material.isSolid(); + + if (!world.isAirBlock(x, y, z) && !isLiquid) { + return false; + } else { + // Can't put down liquids in the nether. + // Explode if it's flammable, evaporate otherwise. + if (world.provider.isHellWorld && this.contents != Blocks.flowing_lava) { + int flammability = contents.getFlammability(world, x, y, z, ForgeDirection.UNKNOWN); + if (contents instanceof BlockForestryFluid && flammability > 0) { + // Explosion size is determined by flammability, up to size 4. + float explosionSize = 4F * flammability / 300F; + world.newExplosion(null, x, y, z, explosionSize, true, true); + return true; + } else { + Random random = world.rand; + world.playSoundEffect(x + 0.5, y + 0.5F, z + 0.5F, "random.fizz", 0.5F, 2.6F + (random.nextFloat() - random.nextFloat()) * 0.8F); + + for (int l = 0; l < 8; ++l) { + world.spawnParticle("largesmoke", x + random.nextDouble(), y + random.nextDouble(), z + random.nextDouble(), 0.0, 0.0, 0.0); + } + } + } else { + if (!world.isRemote && isLiquid && !material.isLiquid()) { + world.func_147480_a(x, y, z, true); + } + + world.setBlock(x, y, z, this.contents, 0, 3); + } + + return true; + } + } + } + + public int getHealAmount() { return healAmount; } @@ -218,7 +317,7 @@ public class ItemLiquidContainer extends Item { @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j > 0 && colour >= 0) + if (j > 0 && color != null) return icons[1]; else return icons[0]; @@ -232,9 +331,13 @@ public class ItemLiquidContainer extends Item { @Override public int getColorFromItemStack(ItemStack itemstack, int j) { - if (j > 0 && colour >= 0) - return colour; + if (j > 0 && color != null) + return color.getRGB() & 0xffffff; // remove alpha else return 0xffffff; } + + public EnumContainerType getType() { + return type; + } } diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index cfad6e3ac..e41783504 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -31,7 +31,11 @@ import forestry.core.network.PacketFXSignal; import forestry.core.network.PacketIds; import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; +import forestry.plugins.PluginManager; + import java.io.File; +import java.util.EnumSet; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResourceManager; @@ -62,6 +66,8 @@ public class ProxyCommon { } public void registerBlock(Block block, Class itemClass) { + if (!EnumSet.of(PluginManager.Stage.PRE_INIT).contains(PluginManager.getStage())) + throw new RuntimeException("Tried to register Block outside of Pre-Init"); GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block)); } diff --git a/src/main/java/forestry/core/render/EntityColoredDropParticleFX.java b/src/main/java/forestry/core/render/EntityColoredDropParticleFX.java new file mode 100644 index 000000000..bccc400b6 --- /dev/null +++ b/src/main/java/forestry/core/render/EntityColoredDropParticleFX.java @@ -0,0 +1,84 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render; + +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.material.Material; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class EntityColoredDropParticleFX extends EntityFX { + + /** + * The height of the current bob + */ + private int bobTimer; + + public EntityColoredDropParticleFX(World world, double x, double y, double z, float red, float green, float blue) { + super(world, x, y, z); + this.particleRed = red; + this.particleGreen = green; + this.particleBlue = blue; + + this.setParticleTextureIndex(113); + this.setSize(0.01F, 0.01F); + this.particleGravity = 0.06F; + this.bobTimer = 40; + this.particleMaxAge = (int) (64.0D / (Math.random() * 0.8D + 0.2D)); + } + + /** + * Called to update the entity's position/logic. + */ + public void onUpdate() { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + this.motionY -= (double) this.particleGravity; + + if (this.bobTimer-- > 0) { + this.motionX *= 0.02D; + this.motionY *= 0.02D; + this.motionZ *= 0.02D; + this.setParticleTextureIndex(113); + } else { + this.setParticleTextureIndex(112); + } + + this.moveEntity(this.motionX, this.motionY, this.motionZ); + this.motionX *= 0.9800000190734863D; + this.motionY *= 0.9800000190734863D; + this.motionZ *= 0.9800000190734863D; + + if (this.particleMaxAge-- <= 0) { + this.setDead(); + } + + if (this.onGround) { + this.setParticleTextureIndex(114); + + this.motionX *= 0.699999988079071D; + this.motionZ *= 0.699999988079071D; + } + + Material material = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)).getMaterial(); + + if (material.isLiquid() || material.isSolid()) { + double d0 = (double) ((float) (MathHelper.floor_double(this.posY) + 1) - BlockLiquid.getLiquidHeightPercent(this.worldObj.getBlockMetadata(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)))); + + if (this.posY < d0) { + this.setDead(); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java index a47334ddf..66b5e09dc 100755 --- a/src/main/java/forestry/core/render/TextureManager.java +++ b/src/main/java/forestry/core/render/TextureManager.java @@ -10,15 +10,18 @@ ******************************************************************************/ package forestry.core.render; +import java.util.ArrayList; +import java.util.HashMap; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.core.ForestryAPI; import forestry.api.core.IIconProvider; import forestry.api.core.ITextureManager; -import java.util.ArrayList; -import java.util.HashMap; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; @SideOnly(Side.CLIENT) public class TextureManager implements ITextureManager { diff --git a/src/main/java/forestry/core/utils/LiquidHelper.java b/src/main/java/forestry/core/utils/LiquidHelper.java index fda0feff9..56d42c337 100755 --- a/src/main/java/forestry/core/utils/LiquidHelper.java +++ b/src/main/java/forestry/core/utils/LiquidHelper.java @@ -10,18 +10,44 @@ ******************************************************************************/ package forestry.core.utils; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.ForestryItem; -import forestry.core.fluids.Fluids; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; +import forestry.api.recipes.RecipeManagers; +import forestry.core.config.Defaults; +import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; +import forestry.core.items.ItemLiquidContainer; +import forestry.core.proxy.Proxies; + public class LiquidHelper { - public static boolean isEmptyLiquidData() { - return FluidContainerRegistry.getRegisteredFluidContainerData().length <= 0; + public static void injectLiquidContainer(Fluids fluid, ItemStack filled) { + Item item = filled.getItem(); + if (item.getContainerItem() instanceof ItemBucket) { + LiquidHelper.injectLiquidContainer(fluid, Defaults.BUCKET_VOLUME, filled, new ItemStack(Items.bucket)); + return; + } else if (item instanceof ItemLiquidContainer) { + ItemLiquidContainer liquidContainer = (ItemLiquidContainer)item; + switch (liquidContainer.getType()) { + case CAN: + LiquidHelper.injectTinContainer(fluid, Defaults.BUCKET_VOLUME, filled, ForestryItem.canEmpty.getItemStack()); + return; + case CAPSULE: + LiquidHelper.injectWaxContainer(fluid, Defaults.BUCKET_VOLUME, filled, ForestryItem.waxCapsule.getItemStack()); + return; + case REFRACTORY: + LiquidHelper.injectRefractoryContainer(fluid, Defaults.BUCKET_VOLUME, filled, ForestryItem.refractoryEmpty.getItemStack()); + return; + } + } + Proxies.log.warning("Unable to inject liquid container: " + filled); } public static void injectLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { diff --git a/src/main/java/forestry/core/utils/Schemata.java b/src/main/java/forestry/core/utils/Schemata.java index b0adbee8f..f36670e38 100755 --- a/src/main/java/forestry/core/utils/Schemata.java +++ b/src/main/java/forestry/core/utils/Schemata.java @@ -97,7 +97,7 @@ public class Schemata { } public boolean isEnabled() { - return !Config.disabledStructures.contains(uid); + return Config.isStructureEnabled(uid); } /** diff --git a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java index eacab05c8..87798e991 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java @@ -10,15 +10,23 @@ ******************************************************************************/ package forestry.plugins; -import buildcraft.api.fuels.BuildcraftFuelRegistry; +import java.awt.Color; + +import net.minecraft.block.Block; + +import net.minecraftforge.fluids.Fluid; + import cpw.mods.fml.common.Optional; + import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; -import net.minecraftforge.fluids.Fluid; + +import buildcraft.api.fuels.BuildcraftFuelRegistry; +import forestry.core.items.ItemLiquidContainer.EnumContainerType; @Plugin(pluginID = "BC6|Fuels", name = "BuildCraft 6 Fuels", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftFuels extends ForestryPlugin { @@ -39,16 +47,41 @@ public class PluginBuildCraftFuels extends ForestryPlugin { BuildcraftFuelRegistry.coolant.addCoolant(Fluids.ICE.get(), 10.0f); Fluid ethanol = Fluids.BIOETHANOL.get(); - int ethanolPower = 40; - int ethanolBurnTime = Math.round(Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); - BuildcraftFuelRegistry.fuel.addFuel(ethanol, ethanolPower, ethanolBurnTime); + if (ethanol != null) { + int ethanolPower = 40; + int ethanolBurnTime = Math.round(Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); + BuildcraftFuelRegistry.fuel.addFuel(ethanol, ethanolPower, ethanolBurnTime); + } - LiquidHelper.injectWaxContainer(Fluids.OIL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleOil.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectWaxContainer(Fluids.FUEL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleFuel.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.OIL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryOil.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.injectRefractoryContainer(Fluids.FUEL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryFuel.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.injectTinContainer(Fluids.OIL, Defaults.BUCKET_VOLUME, ForestryItem.canOil.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectTinContainer(Fluids.FUEL, Defaults.BUCKET_VOLUME, ForestryItem.canFuel.getItemStack(), ForestryItem.canEmpty.getItemStack()); + Fluid oil = Fluids.OIL.get(); + if (oil != null) { + Block oilBlock = oil.getBlock(); + if (oilBlock != null) { + Color oilColor = new Color(0x404040); + ForestryItem.waxCapsuleOil.registerContainer(EnumContainerType.CAPSULE, oilBlock, oilColor); + ForestryItem.canOil.registerContainer(EnumContainerType.CAN, oilBlock, oilColor); + ForestryItem.refractoryOil.registerContainer(EnumContainerType.REFRACTORY, oilBlock, oilColor); + + LiquidHelper.injectLiquidContainer(Fluids.OIL, ForestryItem.waxCapsuleOil.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.OIL, ForestryItem.refractoryOil.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.OIL, ForestryItem.canOil.getItemStack()); + } + } + + Fluid fuel = Fluids.FUEL.get(); + if (fuel != null) { + Block fuelBlock = fuel.getBlock(); + if (fuelBlock != null) { + Color fuelColor = new Color(0xffff00); + ForestryItem.waxCapsuleFuel.registerContainer(EnumContainerType.CAPSULE, fuelBlock, fuelColor); + ForestryItem.canFuel.registerContainer(EnumContainerType.CAN, fuelBlock, fuelColor); + ForestryItem.refractoryFuel.registerContainer(EnumContainerType.REFRACTORY, fuelBlock, fuelColor); + + LiquidHelper.injectLiquidContainer(Fluids.FUEL, ForestryItem.waxCapsuleFuel.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.FUEL, ForestryItem.refractoryFuel.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.FUEL, ForestryItem.canFuel.getItemStack()); + } + } } } diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index ba033a27e..30a62f5af 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -10,8 +10,22 @@ ******************************************************************************/ package forestry.plugins; +import java.awt.Color; +import java.util.ArrayList; + +import net.minecraft.block.material.Material; +import net.minecraft.command.ICommand; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; + import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.network.IGuiHandler; + import forestry.api.circuits.ChipsetManager; import forestry.api.core.Tabs; import forestry.api.genetics.AlleleManager; @@ -29,6 +43,7 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.fluids.ForestryFluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.BlockResource; import forestry.core.gadgets.BlockResourceStorageBlock; @@ -51,7 +66,6 @@ import forestry.core.items.ItemForestryPickaxe; import forestry.core.items.ItemForestryShovel; import forestry.core.items.ItemFruit; import forestry.core.items.ItemLiquidContainer; -import forestry.core.items.ItemLiquidContainer.EnumContainerType; import forestry.core.items.ItemMisc; import forestry.core.items.ItemOverlay; import forestry.core.items.ItemOverlay.OverlayInfo; @@ -61,15 +75,11 @@ import forestry.core.items.ItemWrench; import forestry.core.proxy.Proxies; import forestry.core.utils.ForestryModEnvWarningCallable; import forestry.core.utils.ShapedRecipeCustom; -import java.util.ArrayList; -import net.minecraft.block.material.Material; -import net.minecraft.command.ICommand; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; + +import static forestry.core.items.ItemLiquidContainer.EnumContainerType.BUCKET; +import static forestry.core.items.ItemLiquidContainer.EnumContainerType.CAN; +import static forestry.core.items.ItemLiquidContainer.EnumContainerType.CAPSULE; +import static forestry.core.items.ItemLiquidContainer.EnumContainerType.REFRACTORY; @Plugin(pluginID = "Core", name = "Core", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.core.description") public class PluginCore extends ForestryPlugin { @@ -86,6 +96,10 @@ public class PluginCore extends ForestryPlugin { rootCommand.addChildCommand(new CommandVersion()); rootCommand.addChildCommand(new CommandPlugins()); + ForestryFluids.preInit(); + MinecraftForge.EVENT_BUS.register(ForestryFluids.getTextureHook()); + MinecraftForge.EVENT_BUS.register(ForestryFluids.getFillBucketHook()); + ChipsetManager.solderManager = new ItemSolderingIron.SolderManager(); CircuitRegistry circuitRegistry = new CircuitRegistry(); @@ -135,6 +149,8 @@ public class PluginCore extends ForestryPlugin { public void doInit() { super.doInit(); + ForestryFluids.init(); + definitionEscritoire.register(); crashCallable = new ForestryModEnvWarningCallable(); @@ -264,49 +280,56 @@ public class PluginCore extends ForestryPlugin { ForestryItem.fruits.registerItem(new ItemFruit(), "fruits"); // / EMPTY LIQUID CONTAINERS - ForestryItem.waxCapsule.registerItem(new ItemLiquidContainer(EnumContainerType.CAPSULE, -1).setMaxStackSize(64), "waxCapsule"); - ForestryItem.canEmpty.registerItem(new ItemLiquidContainer(EnumContainerType.CAN, -1).setMaxStackSize(64), "canEmpty"); - ForestryItem.refractoryEmpty.registerItem(new ItemLiquidContainer(EnumContainerType.REFRACTORY, -1).setMaxStackSize(64), "refractoryEmpty"); + ForestryItem.waxCapsule.registerItem(new ItemLiquidContainer(CAPSULE, Blocks.air, null).setMaxStackSize(64), "waxCapsule"); + ForestryItem.canEmpty.registerItem(new ItemLiquidContainer(CAN, Blocks.air, null).setMaxStackSize(64), "canEmpty"); + ForestryItem.refractoryEmpty.registerItem(new ItemLiquidContainer(REFRACTORY, Blocks.air, null).setMaxStackSize(64), "refractoryEmpty"); // / BUCKETS - ForestryItem.bucketBiomass.registerItem(new ItemForestry().setContainerItem(Items.bucket).setMaxStackSize(1), "bucketBiomass"); - ForestryItem.bucketBiofuel.registerItem(new ItemForestry().setContainerItem(Items.bucket).setMaxStackSize(1), "bucketBiofuel"); + ForestryItem.bucketBiomass.registerContainer(BUCKET, ForestryFluids.BIOMASS); + ForestryItem.bucketEthanol.registerContainer(BUCKET, ForestryFluids.ETHANOL); + ForestryItem.bucketGlass.registerContainer(BUCKET, ForestryFluids.LIQUID_GLASS); + ForestryItem.bucketHoney.registerContainer(BUCKET, ForestryFluids.HONEY); + ForestryItem.bucketIce.registerContainer(BUCKET, ForestryFluids.ICE); + ForestryItem.bucketJuice.registerContainer(BUCKET, ForestryFluids.JUICE); + ForestryItem.bucketSeedoil.registerContainer(BUCKET, ForestryFluids.SEEDOIL); + ForestryItem.bucketShortMead.registerContainer(BUCKET, ForestryFluids.SHORT_MEAD); + + Color colorWater = new Color(0x2432ec); + Color colorLava = new Color(0xfd461f); // / WAX CAPSULES - ForestryItem.waxCapsuleWater.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x2432ec)), "waxCapsuleWater"); - ForestryItem.waxCapsuleBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x83d41c)), "waxCapsuleBiomass"); - ForestryItem.waxCapsuleBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xff7909)), "waxCapsuleBiofuel"); - ForestryItem.waxCapsuleOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x404040)), "waxCapsuleOil"); - ForestryItem.waxCapsuleFuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffff00)), "waxCapsuleFuel"); - ForestryItem.waxCapsuleSeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffffa9)), "waxCapsuleSeedOil"); - ForestryItem.waxCapsuleHoney.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "waxCapsuleHoney"); - ForestryItem.waxCapsuleJuice.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "waxCapsuleJuice"); - ForestryItem.waxCapsuleIce.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xdcffff)), "waxCapsuleIce"); + ForestryItem.waxCapsuleBiomass.registerContainer(CAPSULE, ForestryFluids.BIOMASS); + ForestryItem.waxCapsuleEthanol.registerContainer(CAPSULE, ForestryFluids.ETHANOL); + ForestryItem.waxCapsuleHoney.registerContainer(CAPSULE, ForestryFluids.HONEY, Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION); + ForestryItem.waxCapsuleIce.registerContainer(CAPSULE, ForestryFluids.ICE); + ForestryItem.waxCapsuleJuice.registerContainer(CAPSULE, ForestryFluids.JUICE, Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION); + ForestryItem.waxCapsuleSeedOil.registerContainer(CAPSULE, ForestryFluids.SEEDOIL); + ForestryItem.waxCapsuleWater.registerContainer(CAPSULE, Blocks.flowing_water, colorWater); // / CANS - ForestryItem.canWater.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x2432ec)), "waterCan"); - ForestryItem.canBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x83d41c)), "biomassCan"); - ForestryItem.canBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xff7909)), "biofuelCan"); - ForestryItem.canOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x404040)), "canOil"); - ForestryItem.canFuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffff00)), "canFuel"); - ForestryItem.canLava.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xfd461f)), "canLava"); - ForestryItem.canSeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffffa9)), "canSeedOil"); - ForestryItem.canHoney.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "canHoney"); - ForestryItem.canJuice.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "canJuice"); - ForestryItem.canIce.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xdcffff)), "canIce"); + ForestryItem.canBiomass.registerContainer(CAN, ForestryFluids.BIOMASS); + ForestryItem.canEthanol.registerContainer(CAN, ForestryFluids.ETHANOL); + ForestryItem.canLava.registerContainer(CAN, Blocks.flowing_lava, colorLava); + ForestryItem.canHoney.registerContainer(CAN, ForestryFluids.HONEY, Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION); + ForestryItem.canIce.registerContainer(CAN, ForestryFluids.ICE); + ForestryItem.canJuice.registerContainer(CAN, ForestryFluids.JUICE, Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION); + ForestryItem.canSeedOil.registerContainer(CAN, ForestryFluids.SEEDOIL); + ForestryItem.canWater.registerContainer(CAN, Blocks.flowing_water, colorWater); // / REFRACTORY CAPSULES - ForestryItem.refractoryWater.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x2432ec)), "refractoryWater"); - ForestryItem.refractoryBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x83d41c)), "refractoryBiomass"); - ForestryItem.refractoryBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xff7909)), "refractoryBiofuel"); - ForestryItem.refractoryOil.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x404040)), "refractoryOil"); - ForestryItem.refractoryFuel.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffff00)), "refractoryFuel"); - ForestryItem.refractoryLava.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xfd461f)), "refractoryLava"); - ForestryItem.refractorySeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffffa9)), "refractorySeedOil"); - ForestryItem.refractoryHoney.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "refractoryHoney"); - ForestryItem.refractoryJuice.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "refractoryJuice"); - ForestryItem.refractoryIce.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xdcffff)), "refractoryIce"); + ForestryItem.refractoryBiomass.registerContainer(REFRACTORY, ForestryFluids.BIOMASS); + ForestryItem.refractoryEthanol.registerContainer(REFRACTORY, ForestryFluids.ETHANOL); + ForestryItem.refractoryLava.registerContainer(REFRACTORY, Blocks.flowing_lava, colorLava); + ForestryItem.refractoryHoney.registerContainer(REFRACTORY, ForestryFluids.HONEY, Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION); + ForestryItem.refractoryIce.registerContainer(REFRACTORY, ForestryFluids.ICE); + ForestryItem.refractoryJuice.registerContainer(REFRACTORY, ForestryFluids.JUICE, Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION); + ForestryItem.refractorySeedOil.registerContainer(REFRACTORY, ForestryFluids.SEEDOIL); + ForestryItem.refractoryWater.registerContainer(REFRACTORY, Blocks.flowing_water, colorWater); + } + @Override + public void postInit() { + ForestryFluids.postInit(); } @Override @@ -365,7 +388,7 @@ public class PluginCore extends ForestryPlugin { Proxies.common.addSmelting(ForestryBlock.resources.getItemStack(1, 2), ForestryItem.ingotTin.getItemStack(), 0.5f); /* BRONZE INGOTS */ - if (Config.getCraftingBronzeEnabled()) + if (Config.isCraftingBronzeEnabled()) Proxies.common.addShapelessRecipe(ForestryItem.ingotBronze.getItemStack(4), "ingotTin", "ingotCopper", "ingotCopper", "ingotCopper"); /* STURDY MACHINE */ diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index 5bf4f5b29..dc4cd9a21 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -67,7 +67,6 @@ public class PluginFood extends ForestryPlugin { ItemStack meadBottle = ForestryItem.beverage.getItemStack(); ((ItemBeverage) ForestryItem.beverage.item()).beverages[0].saveEffects(meadBottle, new IBeverageEffect[] { BeverageEffect.weakAlcoholic }); - Fluids.SHORT_MEAD.register(); LiquidHelper.injectLiquidContainer(Fluids.SHORT_MEAD, Defaults.BUCKET_VOLUME, meadBottle, new ItemStack(Items.glass_bottle)); } diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png b/src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol_still.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol_still.png diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol_still.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol_still.png.mcmeta diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png b/src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png deleted file mode 100755 index 3f226d8c5462ba5381b5e63996be661858db247c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4876 zcmX|_c{Eh-AIC={jHR)Cv!qL7DZ4>Jw~;N|h$u<2?^|OjgOnu=Stg7%TSSNmDPk;x zk$uZ9gecqCnZj@S{(k58Iq&m&UZ2mo|2*fO=iKMqDC6roY|Q-35D0`#Pgl!?wz5MY zCm>8vn$$)@&|B@EH z#{cnpBjo=vB0+AFApfOV3q)PdNS(I3YknrzO$&>QOH0ej-qWgzR@K#?YU}Fih_q^G zY9f(Ht+XPO+dI0ty1To3d;9wO`v-=GzJ47U9UB{;n4J1HJu@@=-6w}t3IgHC)6-JF ziM6_w1`nE3@@adO-#Gh^jg#}$CYY}03gLZ*;Z5@5WLDz0dx4%?hYco+XI&D3QZiom zg%E{w`8cO9^(Pj*CicDJc(WG+0;iDiXK|zr49Jk{l5&dNQp`Wc-Y#SMwaes8ugaKk zyie8fQk3#D67p0$bMz2*DM={m0%tcuVM@(Paq@UGR9HGqD*#GCeNmas=Xk^Dri@LH0J2N@j^g>`^hJ6= z%R~4q!lDH$u##3Y-xZPjo)x_$m%!9ttLCcQP%2R5-E+-L9+h==pqM)Hw zff+?kDU*yyY8+Z+5qn{f71bEdTgJdeBrKK#ZXe~YHNT%UXd`{ygLhjh!H`(ehYIJp2;{v$NXBJAx?&!QV0?3>(iOu&1N~P zX_veOPiYR+X_jUE}p(gJS!8}7}~K#GZY-Mw_#P(Md|kzaa&a#y zsuCIVn9*FBJ)Hd+uR7EK0%$IB%xM+zA1$#gTyh@%eTkA2A(^q~;iHDMzfH*bb zet>h2xEv7j561?`x8s6k*ZH$hkq@+s2V+jtF)LLpKZm z`S4@k*p7)ApMekoQiZnX#FS1Wq4du+lc0hb1=3Xk#1@6 zOqN??g8lrB_<1l++0Mi@`#A@m+qr0b{A4b77)ofY+Ec?)?GU=F@xY)@XYWl#d#uh^ z7H1^zkq*Li<73K_Ro9V0qFke{kD(&}rFp-}fET}F8J%-$GFs0LZogu%y#u79#goW* z1C^6XttVM+3c7CbKRSnv3D)2Y|5$tBej1%Yi-CO8P7TV$Iy>~(5<~KPtLDX+;^GJqpG+UXO#!c%2-B>kx}1}SWF}YdQtQIfk;#RiTh|Gew0ZY-V5{Da{wZ6vhoi3}u7w*7 z2GDk3hgyk<6#Ky9lJKK>C&N0D0{j9|GELI=p1(M!07w%+Z}t8cuUB{K_=R{bpkH9c zgCduf8J?Qw3RAp|jc%QIP6(wpQ_v_0eKNw>t-!U32Py;NsfbI*@r0Dl<=)ca$u0Qv zfP3SJz`#HsfG4`SEpOTWw-*m0_26(fa9FxztjBBaIT*FU8`?6+iEz5B|1kx`%WRy1 z|DulW8o&|DVN?bE1N)Q4+! zn~XVee&#v-{ePyizkkcJ8hYEN+4z7{M(xk`-qufgK$P@jEv5ANw<}=k@c95L2B9?s z#a1on71#>kwpR~4M=q|&LoZ`d(ITh2+m#C!_8&5q|GOtYk89ifD#^r z7;AUb^SrJ99)TLg&OqSqKSBQIVZ*87cEgds>vMz|IiXea;A!#Sv5dW43sh?FZ<81u zPmP%yf<3iDYoy=chil%SHq5PwWs?Cb4Uaq)F{P}bwbpj_ywB*mUOkJ7@e68LeVi zcy*ErA08QK#RPD>J_H{6T#X)ozv&E&Ve9@pEK7*hNn*wK?=lwU@|W|cSbT{V-XGi{ zzmZ_#J*YTd4Y-UOF>HjUmACu2y~3Rq`<%ZOvX{xpmHbo8((cE~L7-<3DQh=0u-<~C zGAJdZk1$)x8(6C36NXK5?mrf&-M=SQKhH)7`lNA42oi!1a|W}r2L!2@pmVp>t7k!n z0?T(J(`ylf0;d>uyr-V{%^`)@T=Y;r7?`9Ws^ zY+IND2Q!TO#zUJ^mw>1=(>q66Z)$aC#xmrJtr-*a&3*MR0lo=`6FEI37RQ7x|DL?% z#$aabB={?mVSZVo4O@RRz9-LFlH;q0@nyI}>`YU7qcCSLVf%nO!D#N+SB%y}y~_@W zdB24FtZLtle2F>QH}5}g?8QHMGG>AOEUP)9Gc=yQ!5cV#5l|ra*h6B~uv#6>3F~V| ziZ4;hav*2^k_7D@k?OlUsGB&M9j^GxRWSL*9S@%#C~DX}qHiG#+t2b@PCIUwH1#*H`gOW+v%CvtKLaS)N*$~-)%Y0=7_ZxwBYgQZ&;DJ8$`AB#ftK*Mos-9 z`l?33DsdxMIUqahad0vJk!7oS(Z!fW5>bZ0u}oPj4xdCC8PfEkRH zC4+0NQiluI(HuMn^LK-pwCA~ukTXcHBy+ilKS@J4Q?9qjTH0w${|&G3-d^z(5O?$e zgh^Jpn=8q&`P&)P-ri$Nz7WM;tvaw2Zb)dLstPQ%xPi5owSy-d;>`8tHt_YjSPAeU zIrGDFv%Iy5P~9I;pHMUVwt~G4UaWQ< zMA3>ePmcIq_PDC@VmteW2^JouFmI87VCqD@&uG%;MZ8pWxhj0GLAX036Gs=_V^4{{ zj;x>zKU{pzVy1R&k*>329m-p%ajx=$!ZcQh4%xBGxX5H0)v%m*KBDmE%&o!(C6j|s za{j@en#(aZU86o{Yo`a$b$(C{uyf%jbuXQ()i|MaS;YFItV(^#DpJ5sulV~WCRilx zySEa!xw$_q5@DEdaaOZrJ&|{3W4c{b;hNq$xlh~Be&zRM9-9Xmarf{v*n{WXHfSz> z5X8U5-4ZA3j=@mKUW14>-MI43wwWC zODtmSp2^K>)Yyoh`}t^s%;hvF{tK6S<#D6nGwvvDL&2}VQgG2vD=KicbXT-P1@yR)D%|6SAEXuozk;fbc0h!=T8qp5S$0{;S=1`*b{PLuq#QjJ zkub;88fz<}K9}~Ktwf&XX}$LFcWs(t9M9_g01@u@!#Cc+Z#y!p-kJK9B^xFGe!?KG zzN$k?lNT>+mN}^w$9<#6X=!ejQ26Z(zV-}@$#WU&*&K^)(z|tWu{({Vm){O0;g2S{ zGjUH;{s08={Q$IeCChyb5Qh=Em&&!4+7ClkuJweskGrX?PfK>AUpX0xX}4bQoO4%Z z=Q7w#AFCATVE10pD-mJV(1m*Im@E*U93P(kZlGtk{qa9Xja3p=Tt=GD|jxQWG07`%>7y3H~T324kECB*t&ycUtgV0L$o{* znKUX%Fwy9v{s|hos&|bdcM_IQ?;eAcyRrEQ9ZM!9K3xsai)Ze3us|f0SG%2g(@k-* zN`2{G()(4?{OUt%Zn`Na!AzY?h-^g_`1UoeO!A~*w6XePS_W=9BjB!@guG5c)uXN0 z>gq7Yh;+FrVI;yh=;-A}Bq`&SAMG=KfoCG(z*16Gl-0N;i4B;tQpM}GtbO3f=5ik8 z$956K%*+hE!;eR;&S23n&4OIpCoZ*W*`mHqj_>I1<1Vjg(N0_eFYMb0-GQz2j5p;n zf<(+&q!EuEak{^<%&i}vTDKU+Y!^&?a`hzDZp#eb|F psQuZi@gq;ZGm^-KiIR`$a%9a!AwDa6v>!kaJ?-mS?=)<}{sZieFb4nt diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/biomass_still.png b/src/main/resources/assets/forestry/textures/blocks/liquid/biomass_still.png new file mode 100644 index 0000000000000000000000000000000000000000..79660a1b6c2d87199a6f74aa5ff00517317a8e95 GIT binary patch literal 9753 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 diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/ice_still.png b/src/main/resources/assets/forestry/textures/blocks/liquid/ice_still.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb2d11a227dd44edea10ffdcdfbbe8e34721090 GIT binary patch literal 3792 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 g8ViJYs{W4d4~k^n9)6Pb?@NM=Q0B;bU6SssI20 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/ice.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/ice_still.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/ice.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/ice_still.png.mcmeta diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/juice.png b/src/main/resources/assets/forestry/textures/blocks/liquid/juice.png deleted file mode 100755 index 1ccbd8b94f8d6cfc93a7fe9a001dd6b6c0d9f544..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4859 zcmX|_byySXlbnu{?(UEf2^r#~89hLdkWf;PQY3|uf^@4i zV@O;=UcF4n0#pb7-3R`_fAs<`j2Z^0|LY4t|GWID zga3|$0L_s@)>% zn*#ioZj%7*=sDwyOR4!A=or2!FR!euu6}o+4;QMhZ)|R9X(3#wt)ru>tLxK+dV4?j z4-O6ujf{?tjg3!EO?~|~Jv}o!H@~pBv_xFKf4{2^0AR_}K&cpEY>cxKACqKLqh6P^ zJ8;;Qzg6yFP!HI;>4-?;!%s})=4NdTdM}*6uJ=~S-5Qlw6i^9o$61ExxefXwA%bj= zrbB+a!XY4B=I5j?A_fit>VMF}IXW08KB9NZD0|>imbjL)m7QQ$e z#C@?(MzP1bq-5~kZz@W)a~ zFeVm5ctM|cFmCLV;|Fw);AJFu+oERg5^NQbYQnP&!;mF=j23O4S+8>WvMtzDXPb+$ zj@Xm5S&*#GcS58fvcaRVxt;u6;Z*Z_1~3S05N<9b`XYOc27>YwyeeSPjp5tMYFZhL zDtLEEdtEY>eymx^9UfwVFd*e5&N(6TBs^N5&ZTp=_D^RLf{(=E_`T3+>YErok`Q}V z4p-)}E8KybZ0BVEo|@@E!$ z!#Jba$YK-_v+~|nF}zo3aBcIs6vpYkefml*m`gi2LeYvmw&MKYFOcIz&`kpd?RkP7 zb<;`~Ju+tRfh18OfjvWJqC1%zgNjpId$(=Myj|=&=vuPTL;Cf2!KPhM%i4U-CZ`vc zEkCYIsDDLujN+bD0DavX4FW)3DgW)bv`$ThXWXS?#vXW`Tdi}k*5-sXvwu+#pata? zY9wEgH9wyTa*BN<)0ynS)gF=LC`3we*>C6`T)CP|epLl>lv1aBRfT@ZY;OHl(dUz_ z3SDgD!k2#3?s23onUwJin0SXGw!GOHC4qWLd93sZBHEVeb@2WHga=DpkOdgstQ}o&PvSK|? zCrmos-Dfu?T(eRaY>i|a;{*9=NU(OxcCCQ;jyOYYHMp{}9K?;G%5iBk%^`Wm&!ykX zKF->pv9rKqO(k}=*~DvBCVuZ&&(2@JTtt)URP57rEq`u#P=D=E2^sFE6SfDah>2P2 zdxP$ZfG_D2+qLo_DfdZ3^B;(}gG7Rv zgyT(0H*67m0-Zo7SXe{73H*LZF#F-Vro)Iv_5!H8P7hE#DY^

gWJN+XXNCsO6$% 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 X89g!0qRzee_yK6#)j?IM+J*lguH`BA diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/juice_still.png b/src/main/resources/assets/forestry/textures/blocks/liquid/juice_still.png new file mode 100644 index 0000000000000000000000000000000000000000..853306a2f46a3b3ff5485e37955c27a797147761 GIT binary patch literal 3282 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 QiU0rr07*qoM6N<$g3otb#sB~S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/juice.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/juice_still.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/juice.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/juice_still.png.mcmeta diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/milk.png b/src/main/resources/assets/forestry/textures/blocks/liquid/milk_still.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/milk.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/milk_still.png diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png b/src/main/resources/assets/forestry/textures/blocks/liquid/seedoil_still.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/seedoil_still.png diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/seedoil_still.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/seedoil_still.png.mcmeta diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png b/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png deleted file mode 100755 index 49cdec0cfbe70f51f8745d28f07b1c591e1c624f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5000 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 EAKjzMp8x;= diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead_still.png b/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead_still.png new file mode 100644 index 0000000000000000000000000000000000000000..f4c8026727fd7cc53f0048c3210cc5d31d242c0d GIT binary patch literal 6923 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead_still.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/short.mead_still.png.mcmeta