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 50df9ba8c..49819f0de 100755 Binary files a/src/main/resources/assets/forestry/textures/items/liquids/can.bottle.png and b/src/main/resources/assets/forestry/textures/items/liquids/can.bottle.png differ diff --git a/src/main/resources/assets/forestry/textures/items/liquids/can.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/can.contents.png index 3e9106f27..09297fa3b 100755 Binary files a/src/main/resources/assets/forestry/textures/items/liquids/can.contents.png and b/src/main/resources/assets/forestry/textures/items/liquids/can.contents.png differ diff --git a/src/main/resources/assets/forestry/textures/items/liquids/capsule.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/capsule.bottle.png index 93a2bdb8f..0f987aaa2 100755 Binary files a/src/main/resources/assets/forestry/textures/items/liquids/capsule.bottle.png and b/src/main/resources/assets/forestry/textures/items/liquids/capsule.bottle.png differ 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 3e9106f27..48e176fde 100755 Binary files a/src/main/resources/assets/forestry/textures/items/liquids/capsule.contents.png and b/src/main/resources/assets/forestry/textures/items/liquids/capsule.contents.png differ diff --git a/src/main/resources/assets/forestry/textures/items/liquids/refractory.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/refractory.bottle.png index b2bd85bf4..3d34ee6d1 100755 Binary files a/src/main/resources/assets/forestry/textures/items/liquids/refractory.bottle.png and b/src/main/resources/assets/forestry/textures/items/liquids/refractory.bottle.png differ diff --git a/src/main/resources/assets/forestry/textures/items/liquids/refractory.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/refractory.contents.png index 3e9106f27..ee0f6359b 100755 Binary files a/src/main/resources/assets/forestry/textures/items/liquids/refractory.contents.png and b/src/main/resources/assets/forestry/textures/items/liquids/refractory.contents.png differ