From caefa0851a21d7e020cc7e6e0d54b22efe91f255 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 14 Jul 2020 15:30:15 -0500 Subject: [PATCH] Adjust king key weapon rendering --- .../render/entity/RenderBabylonWeapon.java | 8 ++------ .../botania/textures/item/gate_weapon_0.png | Bin 345 -> 467 bytes .../botania/textures/item/gate_weapon_6.png | Bin 422 -> 550 bytes .../botania/textures/item/gate_weapon_7.png | Bin 496 -> 649 bytes .../botania/textures/item/gate_weapon_8.png | Bin 310 -> 455 bytes 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index 0fc537181..f146f6d20 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -50,14 +50,10 @@ public class RenderBabylonWeapon extends EntityRenderer { ms.push(); float s = 1.5F; ms.scale(s, s, s); - ms.rotate(Vector3f.YP.rotationDegrees(-90F)); - ms.rotate(Vector3f.ZP.rotationDegrees(45F)); - - // todo 1.15 get the alpha in to the BMR - // GlStateManager.color4f(1F, 1F, 1F, chargeMul); + ms.rotate(Vector3f.YP.rotationDegrees(90F)); IBakedModel model = MiscellaneousIcons.INSTANCE.kingKeyWeaponModels[weapon.getVariety()]; - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentCullBlockType()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.func_239280_i_()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY); ms.pop(); Random rand = new Random(weapon.getUniqueID().getMostSignificantBits()); diff --git a/src/main/resources/assets/botania/textures/item/gate_weapon_0.png b/src/main/resources/assets/botania/textures/item/gate_weapon_0.png index 9d4313c662c6eaddc41728b2b99e70dfe7677176..8aae38acfea392a3836f2e4ac5cbef1cfec6cbe7 100644 GIT binary patch delta 400 zcmcb~beVaAqy#eq1A~Sxe=v|@Nq6*hWMJ6X&;2Knb)uPmyJeyUX%?IL)9h#Qy)oEL{QC|IcEKM7jQd*<>ifX)DHNBF^I=$!RRcZ6?VV?#W;v z%%Q{2q9@2^C(dpv!3#7>`=YuB&^V@&AU~j$Ws}cZ0C|i_-tI089jvk-Db50q$YKTt zZefOrdffHwC7!;n>`&PFM5F|kdhcWbDv0-VaSV~TJol_OUxNY&09A3m=s`QTWRz+H#{)L6y1(!a%!C8<`)MX5lF!N|bK zK-a)r*U%)y$iT|T%*wz*+rYrez+lobO+%0lxQ5*Pl+3hB+!`Lwp4bc2z~JfX=d#Wz Gp$PykjCoA} delta 285 zcmV+&0pkAC1K9$Q865@y001BJ|6u?C010qNS#tmY3ljhU3ljkVnw%JsF)x4LNkl5=HtCrmpvK3=96yXFa25K}G<2DfH&=+D4_hfLiU;x@>|6|t~pdErG zK`MSASD}K#vS;4`MHrL3-CY;mLR^^WEA-N4A*`izj{I{2yBlf{2C9V9MDnqLDQjv>HQLlAQtZVAnR%mwqtyRo>!l_w~P$;nV3D$ z`7)$&V<1T_-NBO2@q14;NTM$QjD41Zby|UX8HYD}s+{~v`vqAF^82F#RLGe#&Wgps9@9cY$B)%7?R=QW!rAo z3~r7O_;5aA~U+I7F^?08$5RifBf99cM;qGLF*+fL>vTN}1;;>&p z5;6hjzRk!T7&k}mpkE-9YO*qchC|1~F27U@WCD7xZ#zTH{0soGk5`YSHy(We0000< KMNUMnLSTY1IH8UJ diff --git a/src/main/resources/assets/botania/textures/item/gate_weapon_7.png b/src/main/resources/assets/botania/textures/item/gate_weapon_7.png index 9c315a998d0d6f9ffdda9095fe3398428b48832b..882a9f997ea71e98da8fef27c255b4e5a219b72f 100644 GIT binary patch literal 649 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)vgHe332`Z|NrmbzyJLC z^Xu0yGf6&2DK1wzK5nl>iKRDw{`_eu!ujvtKLcS7cLf2@1Fwxlx!mOWb7C00l!YB6 zIsZQ})fHfMk>xcJ=dlxKcarAT=3}-MWAjiH)E8p^|7DZC1jpaMe}U?O8ubL(KAdI% zY5|%C)CIH!r~s(mS%wE_3s4u(5TNZqV~xeQfiBVEX91cCG{;ne7wAal>bE*TH!GF| z`GNe6A1s)(feEOBG0EHAg`tC0)&t1lEbxddW?qry4XD8Hs*;VJVaF5KJ^!qywCakN{s#t*Z&K1P+L@aavxJJ%4Z2=DkmT%2^LfDhg#F5|4COxQ z9`&Q1z7r3)Jczm0Xkxq!^40j0|)QjCBpo wLktY8OwFwf47Gs_1A_;d`HxUEmdKI;Vst0GG7N6aWAK delta 439 zcmV;o0Z9Id1@Hrq865@y001BJ|6u?C010qNS#tmY3ljhU3ljkVnw%JsF)n`rc1c7* zRCwB?lRIw0KoEw1iD2*=jCmMil0c%AgqH(!5Xd_|0}Vab$^~+Q^tk{feHscH4CYUP zSOGRDQi@L+jds4Bnbm?M{zD)!9)cnKO)wsUoPP#5B|3RCr|k^~qFP#EEv@iSfbkIE z{8Mr$ntgBL@ep)O5iZz;(>8xNZR40EbcwrY?g*MYl9H`x_Knj5-}g~9qNwN*w5$Xi zQ}DT@vyqMO@90zq^-K(nY#hy;%EyZYt45TXJHq?d4+6h0=wXY@P|%jHtWcX^H7 zyuyke;o(@CI|>SX-u6PR@t%=d?}~U%&BPRRJ@c^c)c<(C<=6JJ^U}!GcgW|f{rQpaIWF$GAR!` zrr0i4Uba`E&+HF~bmIU3002ovPDHLkV1hx$z`+0j diff --git a/src/main/resources/assets/botania/textures/item/gate_weapon_8.png b/src/main/resources/assets/botania/textures/item/gate_weapon_8.png index 30abe1aed1bab6259e144b61ab311d7def13a154..1ef578c831e4f230a6c14f5841118098caefecbc 100644 GIT binary patch delta 375 zcmdnSbewsDqy#eq1A~Sxe=v|@Nq6*hWMJ6X&;2Knb)uPmf@OeDh$~Ry|A$%s|Nqa4 zVc_;k1d{)s#Q;SdEg05JV)$^H!AO+LL6Xxzn8Q(uONXDuPMlp|h#jc@)wO0>pk~&R zAU}}l3=D^|*){?x#w2fd7p64snv{u(67}pQp1!W^PuTfHqy?)FK#IZ0z{o(?z*yJNJjB4j%GBJ-z)%~=Ffe$Kng0ky dLvDUbW?Cg~4HHeS#{o4kc)I$ztaD0e0szM8fV2Pr delta 232 zcmVing`kM& z83e^Dm6+BuOkvqA?uX8@AfV#zs32QC7<>t-uC2SNP`y#v!7^bV{!n*k+f zQmrcB6XG2>Jzwmva623Ew4P8Qx9cm71+bep^qZE4WlK$>2l^GD8;`4o`^A{Gzfo0x iW(<)g=+F9#o&x~djBooPpINa00000