From 1b83510e1dfc0cfd3e96abf443bba53f672ec114 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 26 Jul 2016 17:55:15 -0700 Subject: [PATCH] Colors for flasks Blends effect colors Needs a new texture. --- .../bloodmagic/proxy/ClientProxy.java | 18 ++++++++++++++++++ .../blockstates/item/ItemPotionFlask.json | 3 ++- .../textures/items/PotionFlask_outline.png | Bin 0 -> 15157 bytes .../textures/items/PotionFlask_overlay.png | Bin 0 -> 15171 bytes 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/bloodmagic/textures/items/PotionFlask_outline.png create mode 100644 src/main/resources/assets/bloodmagic/textures/items/PotionFlask_overlay.png 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 0000000000000000000000000000000000000000..0d78663839f5a047e5f5128a93f62a6068256ca2 GIT binary patch literal 15157 zcmeI3U1%It6vwYEN=#d9(t^^L4%?P0?d;6#XLi`#nr71`=*Eyln`ot(kGt8iyEE&| zq`L_eMOzw6srCacT4@5j>-COD#vjAAK z!g=2XUO)Z-0Eu6;kx_dz`>3cG#h|1bG7MIVB{Um=P}+fs$qtunfJ&iFB*V4pHPPQi&6SJlD)gRq8&aNweTy znyPTH0E%QZG1htBQGWo2IKq*?K6+;VzB+ZbX9_$%biEk1>{yv!U3C5EuEd80L|Qs?rz4 zn~BB98mg9?Y7!$Xh|!2YhHoYw1NDz8+0ufd_~-iKsEU{~%%WtcwW2fuxspDS;(d zAXH+4RcPY|8E-_RjlMCeFCa! zu2#Ucfragyx1V!6tJbaaJ2C0}IfW*R2{vo^4*rXJ?M?1n?7{E$<=Q-=e1}36uXl@8Y{Y!QL$Jw z2?m60Qe0#{m`ZVBK*%P=MdpL46c+}BY*JigKA1{zVL-?x#YN_WsT3Cmgltk=WImWm zabZBnCdEbOgQ*l3283)KC=0;!Isl%35rFHr(DzROO!5HyJPv?(41oKM!#h6P zg64kOpXnZ{e0%E1`DKfQrF)C^;)iz+t1}sS(dm*jj zp(B^O*FJJ^<&E9H-M9GUb6>6HzTE!L=htVBc6M}}zp`5V?!?CLb620S8~EY;zCS&eTPZk+h=)qTAe+t%(q9lZ9$x*vCUv+{wC+2rh*^dI|2 z-#C@;EDU|qwz=)hboR~8J>w3>E*|g%oGp}rY>cV@49apv#f1jB- fZf!TNmBHPIxxa6od+lqq9MIo8ka>6W_zV96l5Kys literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3034e3ed1962ebf126958f486583952921226065 GIT binary patch literal 15171 zcmeI3U2NM_6o3s6)mFBu8WT)IfXNsz3CDI4C$UK~x~5$N%ht7>)(Ql5?3>1FVu#pW z(h61xOp3bY zR{MPu_4bhs6ea$qjf`5O=^c_{6#TMkWPra?D8k(o728@V%E~0L=nR<9^tf-~CyBc-D{KpE%*gS;Q~Az5&gU%L?VF)=>W%vSdM4;Aj6ANC?s(lU48iy zo$yzzq-Ld|WPddrl;XaeWfdisEtkvwa?o#-CRkn+MV1S&fdB({Fy^#w$rVO7H@Qw~ zev-gcN?Os<44t<9${AzIiu-(ap!%zNu0pXMNH?qOAVsz!7g^rVv8{|$rEXK4D&?I^ zQxz8EK>_HN3GMincEy}w8D`FC6SA&u8yMy!ovz1jdA)@~%h0CPw+|wyB5i4Dj!YK; zI|NK)s-%FveefuoTAkj~vW?^{^JHtJ0OdveMMM&mb@Y_-n||_sv>2LQbD#7T0x!wY*C+xv5iH~ z&U#fzy++^gGDtI=)Q4TT$Y1FBPudNP=r&12Vo|v zC_D_QDk>)iG66+(vIPTqoHYg7Rnp+xlk=WE_E}UIObkZDTv&yb5QPU4`A~!r6;Wn{ zXf~XQsF_Gch}1%~aMKiOKr>;rPJ5~t*0M9%hQU+IS8IyA=1i!fTrz>(e{o-}0qY~J zKCx^Yr;jCBv1eOCvD*Vc3d>d-msPi{nrY4HTp0q_zsJ0NjB*a>xb|{gIlJ0BF^#NM zmP?>#0#?XMI^XrW+zfReW9|Qfy!Ia?!j$)2Um8}{Ro9n>WfSWEOGBfIm7J_k05!qZ z3b?kgvdp>pT;5r=Zf)+wnEmG@!7hdsB|F{2$JnN|Mr3#YsNIeEDQABqz`+;G+n-fa zuNpNS!<%~5sAE`{4QEq()~DEw{Lwhkjr5B6B0&%! zc#+`3^Fg!(7Xkz?5?pvbh?d|&fZ#=f3(p795?lxnyhw22`5;?sK=ZM0!2$SiC#?(&r73D=GetdfkfIi^!S7!vYKo(%U&kp*I!sZw8}m<| z>W6#Jrjk7)mGd9J@kQ4xxBk$X&0XC1?0r{n?z-BshWq`zb@`+2;f^tGJa=&XD7|j~ z+9MyNUU=ung`dvNf46Z`9slq%_Tl7<7dJfe^AWz|^yta^ecih+E$PQjEPVd-Z9S70 z#$J7{d#>*^c>ND<&Gz`G@OipBzPxnhFl08hsu919_Sc)bM9FFn@^U07}~LJ>B{-T8;|blx+^7J t*tY({!4t<9=k7_Ld-tEezTbaofm+%!TkOAcbr(DwmFnA>Jicvw_Fu(Mf$9JN literal 0 HcmV?d00001