From 3822e90adadd05cbe4d178035cc811f651df0102 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 16 Jun 2016 14:03:30 -0700 Subject: [PATCH] Fix #1299 use dynamic textures for fluid containers --- .../items/ItemFluidContainerForestry.java | 25 +++++++----------- .../forestry/blockstates/liquids/can.json | 13 +++++++++ .../forestry/blockstates/liquids/capsule.json | 13 +++++++++ .../blockstates/liquids/refractory.json | 13 +++++++++ .../forestry/models/item/liquids/can.json | 7 ----- .../forestry/models/item/liquids/capsule.json | 7 ----- .../models/item/liquids/refractory.json | 7 ----- .../textures/items/liquids/can.bottle.png | Bin 168 -> 165 bytes .../textures/items/liquids/can.contents.png | Bin 135 -> 174 bytes .../textures/items/liquids/capsule.bottle.png | Bin 168 -> 169 bytes .../items/liquids/capsule.contents.png | Bin 135 -> 171 bytes .../items/liquids/refractory.bottle.png | Bin 168 -> 164 bytes .../items/liquids/refractory.contents.png | Bin 135 -> 183 bytes 13 files changed, 49 insertions(+), 36 deletions(-) create mode 100644 src/main/resources/assets/forestry/blockstates/liquids/can.json create mode 100644 src/main/resources/assets/forestry/blockstates/liquids/capsule.json create mode 100644 src/main/resources/assets/forestry/blockstates/liquids/refractory.json delete mode 100644 src/main/resources/assets/forestry/models/item/liquids/can.json delete mode 100644 src/main/resources/assets/forestry/models/item/liquids/capsule.json delete mode 100644 src/main/resources/assets/forestry/models/item/liquids/refractory.json diff --git a/src/main/java/forestry/core/items/ItemFluidContainerForestry.java b/src/main/java/forestry/core/items/ItemFluidContainerForestry.java index 37481bc3c..8f83ba0cf 100644 --- a/src/main/java/forestry/core/items/ItemFluidContainerForestry.java +++ b/src/main/java/forestry/core/items/ItemFluidContainerForestry.java @@ -13,7 +13,7 @@ package forestry.core.items; import java.util.List; import java.util.Locale; -import forestry.core.fluids.Fluids; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -22,14 +22,16 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import net.minecraft.stats.StatList; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.FoodStats; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; + +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -40,9 +42,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; +import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; import forestry.core.utils.Translator; -public class ItemFluidContainerForestry extends ItemForestry implements IColoredItem { +public class ItemFluidContainerForestry extends ItemForestry { private final EnumContainerType type; public ItemFluidContainerForestry(EnumContainerType type) { @@ -54,8 +58,9 @@ public class ItemFluidContainerForestry extends ItemForestry implements IColored @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + "_empty"); - manager.registerItemModel(item, 1, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH)); + String identifier = "liquids/" + type.toString().toLowerCase(Locale.ENGLISH); + manager.registerItemModel(item, 0, identifier + "_empty"); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(new ResourceLocation(Constants.MOD_ID, identifier), "inventory")); } @SideOnly(Side.CLIENT) @@ -74,16 +79,6 @@ public class ItemFluidContainerForestry extends ItemForestry implements IColored } } - @Override - public int getColorFromItemstack(ItemStack itemStack, int tintIndex) { - if (tintIndex > 0) { - FluidStack fluidStack = getContained(itemStack); - return Fluids.getFluidColor(fluidStack).getRGB(); - } else { - return 0xffffff; - } - } - public EnumContainerType getType() { return type; } diff --git a/src/main/resources/assets/forestry/blockstates/liquids/can.json b/src/main/resources/assets/forestry/blockstates/liquids/can.json new file mode 100644 index 000000000..4fc8dfa7a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/liquids/can.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "inventory": { + "model": "forge:forgebucket", + "textures": { + "base": "forestry:items/liquids/can.bottle", + "fluid": "forestry:items/liquids/can.contents" + }, + "transform": "forge:default-item" + } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/liquids/capsule.json b/src/main/resources/assets/forestry/blockstates/liquids/capsule.json new file mode 100644 index 000000000..220a77de7 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/liquids/capsule.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "inventory": { + "model": "forge:forgebucket", + "textures": { + "base": "forestry:items/liquids/capsule.bottle", + "fluid": "forestry:items/liquids/capsule.contents" + }, + "transform": "forge:default-item" + } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/liquids/refractory.json b/src/main/resources/assets/forestry/blockstates/liquids/refractory.json new file mode 100644 index 000000000..edf1e7e23 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/liquids/refractory.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "inventory": { + "model": "forge:forgebucket", + "textures": { + "base": "forestry:items/liquids/refractory.bottle", + "fluid": "forestry:items/liquids/refractory.contents" + }, + "transform": "forge:default-item" + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/can.json b/src/main/resources/assets/forestry/models/item/liquids/can.json deleted file mode 100644 index ddb1d78a3..000000000 --- a/src/main/resources/assets/forestry/models/item/liquids/can.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/liquids/can.bottle", - "layer1": "forestry:items/liquids/can.contents" - } -} diff --git a/src/main/resources/assets/forestry/models/item/liquids/capsule.json b/src/main/resources/assets/forestry/models/item/liquids/capsule.json deleted file mode 100644 index 396d8b971..000000000 --- a/src/main/resources/assets/forestry/models/item/liquids/capsule.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/liquids/capsule.bottle", - "layer1": "forestry:items/liquids/capsule.contents" - } -} diff --git a/src/main/resources/assets/forestry/models/item/liquids/refractory.json b/src/main/resources/assets/forestry/models/item/liquids/refractory.json deleted file mode 100644 index a98330c38..000000000 --- a/src/main/resources/assets/forestry/models/item/liquids/refractory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/liquids/refractory.bottle", - "layer1": "forestry:items/liquids/refractory.contents" - } -} diff --git a/src/main/resources/assets/forestry/textures/items/liquids/can.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/can.bottle.png index 50df9ba8c64f9d57d11d01f5bbcee761d3871fb6..49819f0defc9e9e39fa48ea9bae50f26a5f75e29 100755 GIT binary patch delta 137 zcmV;40CxYV0i^+uB!3c6OjJex|No$%pycG_&d$!Tu&}zix^#%?N&o-=0d!JMQvg8b z*k%9#06|GaK~#8NeayQJfItjH!4Z;kXn__G9Z-M+`mcriSQql5307;x*@Erj-8*hk rNCgGKM2dkR2M9I(`*}JXEh`@t0tY$zl%#P00000*00002bW%=J z004HA%{Tx606RtNtU=qlmzFem6RtIr7}3CdXBA-T2xMqkZ@a&ktG)ts=<3xs*!~_=6L^FW~Z^3jvH3o+Dj!Z?{ Ti+BgQYtw9K#f6 v!JL248v^vgK{is$sh_tyidn#w;R_EuTMJ)a3_vOX0000dZNl delta 140 zcmV;70CWGT0jL3xB!3l9OjJc{KY!ML|NrWB=+$b>yIr!RQkjfKM~s@k00002bW%=J z004HA%{Tx606J5! diff --git a/src/main/resources/assets/forestry/textures/items/liquids/capsule.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/capsule.contents.png index 3e9106f2772b177b4a934f23668c48a6c4b3f085..48e176fde31d334bb3fb7e5b3e9b68ef5d027c06 100755 GIT binary patch delta 155 zcmZo?T+KK^qMn19fq_9omp>RtNtU=qlmzFem6RtIr7}3CSXYA^>bP0l+XkK?9ef6 delta 118 zcmZ3@*v>dXBA-T2xMqkZ@a&ktG)ts=<3xs*!~_=6L^FW~Z^3jvH3o+Dj!Z?{ Ti+%V{CaQVwoD1@ZQwNY$2@)8OZQcL?002ovPDHLkU;%<65Hw!^ delta 140 zcmV;70CWGO0jL3xB!3l9OjJc{KY!ML|Iaiuzc4VeEiI-hDw!rGD8epu00002bW%=J z004HA%{Tx606bqMn19fq_9omp>RtNtU=qlmzFem6RtIr7}3CFMGaQgLfazatle0?*+` z|Lxyumimd@G1N6l-tw3&fxTsd6T8qERh8u?S_gR*%BQidXBA-T2xMqkZ@a&ktG)ts=<3xs*!~_=6L^FW~Z^3jvH3o+Dj!Z?{ Ti+