diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 2ab25450..92ae3c6a 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.proxy; import java.awt.Color; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -10,6 +11,8 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; @@ -118,6 +121,21 @@ public class ClientProxy extends CommonProxy return -1; } }, ModItems.sigilHolding); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() + { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) + { + if (tintIndex != 1) + return -1; + + List effects = PotionUtils.getEffectsFromStack(stack); + if (effects.isEmpty()) + return -1; + + return PotionUtils.getPotionColorFromEffectList(effects); + } + }, ModItems.potionFlask); addElytraLayer(); } diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemPotionFlask.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemPotionFlask.json index 35baf151..13f65320 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemPotionFlask.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemPotionFlask.json @@ -8,7 +8,8 @@ "type": { "normal": { "textures": { - "layer0": "bloodmagic:items/PotionFlask" + "layer0": "bloodmagic:items/PotionFlask_outline", + "layer1": "bloodmagic:items/PotionFlask_overlay" } } } diff --git a/src/main/resources/assets/bloodmagic/textures/items/PotionFlask_outline.png b/src/main/resources/assets/bloodmagic/textures/items/PotionFlask_outline.png new file mode 100644 index 00000000..0d786638 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/PotionFlask_outline.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/PotionFlask_overlay.png b/src/main/resources/assets/bloodmagic/textures/items/PotionFlask_overlay.png new file mode 100644 index 00000000..3034e3ed Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/PotionFlask_overlay.png differ