From 87266364c888ffc37475e1fb7f0531d8a3c9296e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 29 Sep 2016 21:06:53 +0100 Subject: [PATCH] Implemented wiiv's new cloak models. Also fixed render issues regarding them and the flugel tiara. --- .../botania/client/lib/LibResources.java | 2 + .../botania/client/model/ModelCloak.java | 46 ++++++++++++++++ .../equipment/bauble/ItemFlightTiara.java | 6 +++ .../item/equipment/bauble/ItemHolyCloak.java | 38 +++++++++---- .../equipment/bauble/ItemUnholyCloak.java | 12 ++++- .../botania/textures/model/holyCloak.png | Bin 19284 -> 17803 bytes .../armor_holycloak.png => holyCloakGlow.png} | Bin 18126 -> 18103 bytes .../botania/textures/model/unholyCloak.png | Bin 20188 -> 21042 bytes ...or_unholycloak.png => unholyCloakGlow.png} | Bin 21292 -> 21285 bytes .../textures/model/unused/armor_cloak.java | 50 ------------------ .../textures/model/unused/dreamwoodChest.png | Bin 1393 -> 0 bytes .../textures/model/unused/livingwoodChest.png | Bin 1483 -> 0 bytes 12 files changed, 93 insertions(+), 61 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/ModelCloak.java rename src/main/resources/assets/botania/textures/model/{unused/armor_holycloak.png => holyCloakGlow.png} (84%) rename src/main/resources/assets/botania/textures/model/{unused/armor_unholycloak.png => unholyCloakGlow.png} (86%) delete mode 100644 src/main/resources/assets/botania/textures/model/unused/armor_cloak.java delete mode 100644 src/main/resources/assets/botania/textures/model/unused/dreamwoodChest.png delete mode 100644 src/main/resources/assets/botania/textures/model/unused/livingwoodChest.png diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b51db2461..8b099de13 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -103,6 +103,8 @@ public final class LibResources { public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png"; public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "holyCloak.png"; public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "unholyCloak.png"; + public static final String MODEL_HOLY_CLOAK_GLOW = PREFIX_MODEL + "holyCloakGlow.png"; + public static final String MODEL_UNHOLY_CLOAK_GLOW = PREFIX_MODEL + "unholyCloakGlow.png"; public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png"; public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png"; public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; diff --git a/src/main/java/vazkii/botania/client/model/ModelCloak.java b/src/main/java/vazkii/botania/client/model/ModelCloak.java new file mode 100644 index 000000000..fc223a47e --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ModelCloak.java @@ -0,0 +1,46 @@ +package vazkii.botania.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +/** + * armor_cloak - wiiv + * Created using Tabula 4.1.1 + */ +public class ModelCloak extends ModelBase { + + public ModelRenderer armRpauldron; + public ModelRenderer armLpauldron; + public ModelRenderer helm; + + public ModelCloak() { + textureWidth = 64; + textureHeight = 64; + armLpauldron = new ModelRenderer(this, 0, 15); + armLpauldron.mirror = true; + armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); + armLpauldron.addBox(-1.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); + setRotateAngle(armLpauldron, 0.08726646259971647F, -0.2617993877991494F, -0.17453292519943295F); + armRpauldron = new ModelRenderer(this, 0, 15); + armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armRpauldron.addBox(-8.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); + setRotateAngle(armRpauldron, 0.08726646259971647F, 0.2617993877991494F, 0.17453292519943295F); + helm = new ModelRenderer(this, 0, 0); + helm.setRotationPoint(0.0F, 0.0F, 0.0F); + helm.addBox(-4.5F, -3.0F, -5.5F, 9, 4, 11, 0.0F); + setRotateAngle(helm, 0.2617993877991494F, 0.0F, 0.0F); + } + + public void render(float f5) { + armLpauldron.render(f5); + armRpauldron.render(f5); + helm.render(f5); + } + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 1492b6cda..370a04b2e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -354,6 +354,10 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; + + float lbx = OpenGlHelper.lastBrightnessX; + float lby = OpenGlHelper.lastBrightnessY; + switch(meta) { case 1 : { // Jibril h = 0.4F; @@ -451,6 +455,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.color(1F, 1F, 1F); GlStateManager.popMatrix(); + + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lbx, lby); } } else if(meta == 1) // Jibril's Halo renderHalo(player, partialTicks); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 34b7600c5..056854ef8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -14,8 +14,10 @@ import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -30,6 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.ModelCloak; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; @@ -37,8 +40,10 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemHolyCloak extends ItemBauble implements IBaubleRender { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOLY_CLOAK); + private static final ResourceLocation textureGlow = new ResourceLocation(LibResources.MODEL_HOLY_CLOAK_GLOW); + @SideOnly(Side.CLIENT) - private static ModelBiped model; + private static ModelCloak model; private static final String TAG_COOLDOWN = "cooldown"; private static final String TAG_IN_EFFECT = "inEffect"; @@ -121,25 +126,40 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { } @SideOnly(Side.CLIENT) - ResourceLocation getRenderTexture() { + ResourceLocation getCloakTexture() { return texture; } + + @SideOnly(Side.CLIENT) + ResourceLocation getCloakGlowTexture() { + return textureGlow; + } @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); - - float s = 0.1F; + + float s = 1F / 16F; GlStateManager.scale(s, s, s); if(model == null) - model = new ModelBiped(); - - model.bipedBody.render(1F); + model = new ModelCloak(); + + GlStateManager.enableLighting(); + GlStateManager.enableRescaleNormal(); + + Minecraft.getMinecraft().renderEngine.bindTexture(getCloakTexture()); + model.render(1F); + + int light = 15728880; + int lightmapX = light % 65536; + int lightmapY = light / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); + Minecraft.getMinecraft().renderEngine.bindTexture(getCloakGlowTexture()); + model.render(1F); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 17a4cc7b4..ca96f6b7f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -21,6 +21,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; @@ -31,6 +33,7 @@ import java.util.List; public class ItemUnholyCloak extends ItemHolyCloak { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_UNHOLY_CLOAK); + private static final ResourceLocation textureGlow = new ResourceLocation(LibResources.MODEL_UNHOLY_CLOAK_GLOW); public ItemUnholyCloak() { super(LibItemNames.UNHOLY_CLOAK); @@ -61,9 +64,14 @@ public class ItemUnholyCloak extends ItemHolyCloak { return false; } - @Override - ResourceLocation getRenderTexture() { + @SideOnly(Side.CLIENT) + ResourceLocation getCloakTexture() { return texture; } + + @SideOnly(Side.CLIENT) + ResourceLocation getCloakGlowTexture() { + return textureGlow; + } } diff --git a/src/main/resources/assets/botania/textures/model/holyCloak.png b/src/main/resources/assets/botania/textures/model/holyCloak.png index 35368af81d2f55cfad0ccff23b2ee966385a0987..4a642118100e78231567d391fde0add6fb013c06 100644 GIT binary patch delta 2822 zcma)83pA8zAAiS;jQhA$6c*Vsnc(HjSw+6OUOuKS2f6OC1fUFk;{tx z+S!beP0`9Fw^ku6jn-*cYf zBGiQoDCRfbUI#VRcBugXpviW3@kOHJ9|OA$nWd3&Pm!Q1bPtRN0Cl}T1_~&?W&i+o z5#q~gd7n~=JdjE=r7^5YFpUP$2&QC^1lxcV8wyAyQIalCe{6_zG;Q@s zAdy5pOeQly29pe1fg~mfiib6=aa1D6Ad(q}$q0zfBs0XiTGYQT259Apt+gGQ9DXcU zz~smBBKb^VMC_^9_=s2`lT0Cp!!VCaq*EY>NFoWSL^>pZi5w83hLdPq7zDZEVr{d( zfzvs37~;SPoJ?i>JsfWVhr?V*K;sj6d|o(_!H19(T#kT9fj};a!ll4;h=JtUzlTC4 zLE+&L5$1%Gh~YelL1a(_BqEPN;c#hmD#Q=xiKY5RVl>X12$RAo3>c&kDO4Vb$QM9V zBA3S{6CnYW%m5(Y{W}AL$S9` z$Hxh$>(Vs;RA%w2-Z@0(4zXNYO-rPV$JmDOz<=$fH9fEY_T@qSm)mG$5P8JZ?ePCT zr%RPC`)8*-AeSF(qq82z9h@sL%W_Zau}SRty-BNk zTE~T79k~mqlh?gxyuoz{q8n+Mn$MrMO}>~tkYGFk=aQ;!@2!EiyE?gGYG6a&4NJBC zIccv%O>T;Y{->Y0Ohx(m+1-1u!==?tE;_kb=8&knD+smTMMuUKPF$L8J&|~!`(TA- z7v1RobwaKD7&<6lJ}EjdH1RE=mH=$>ftx>#6u(;A7L-2#B?i=@c=s!0QR-VpSG1MA z^?4C??I#kWE{9sD{(EzG4mX#8mMBq6_Tl_Q2^R_I21RW^ZR)#S0oHG#jAKv+yfPHn zUt z_~iM(lzeP)#UJH=t>&@Ez4FLnbG9yv#d5@^uCFJ5xSwyCGxe28c)g*-_xGmP(Cj zLW=;x4u5v0kZvUZ^~53P^OxtF`r4mK+c`K)s%EMw7KcGqTDEiRTKVL*Q%pP6Mr~!e zV!^b!>fM)w!@+$r87Gw^o3}~Zx z8meZ<$p;}IeH=bAZO_6WD@NVfl|5erM=h~R>749NZrq@a9Mss>_US-# zR&(a^gEJ!ggT>z=<~!lS8iToY0b}x>Wuujql?Umq$u<$W-+mX_x3}%P$mql*FQjPg z;E&wg)pgW|d#V$AJ7a=_@x5nrSb`d2A zEc;x%wPGaflm5HlCHkui8=DI3Zj$|_L#S4R0|_Bp)t^r4wNhK0ZvW(ZHDr1yDP>NY z5K^B0u>9R-?4^qa*Mpuqf9*(Iv{y;l3{d1R$1|SQRGw+A3a!g?E8mCd!!NX(nx{KV zep#O-de`FJYdic_D<5UQ6X-+FPHZ&;H?QkRv}fYOwx2Txf}(sqN^6!ERS~#P_~_Vg zv;b>+9e}5Suf8Fb)-$G>0Y0U|T_#sc{q4>AEXp)pZZfc_HK~W>m#d+SMX7I9mVmsN zJLvf@&(^@MJ}w^L*Behq0e4#rq*txeu|VJv-t{7%6yLgKmyL5)Lhfqklee$8q?mX}d?{|KdPz%AFO z*EYH%>56>{Z2;2T_oKM(AE>*GF!EJzeb-?~Glp7n1T_%!#SmnXUh$C6wTo#CE+l0( ztZG)NAnty?mS6zP7kUoiMC$kG=$z>*5?`p)i;Wl1`sy}(fs)5vX~8xA|5{pd^uW*Q zC^ok3Cb?13RkRcpVb)Ge8(Vj#sb3J=GWmtRD^&8BKv=Pug-xc)Ha_30HyETK_lz8| zmp_ipoI?k2`ZleBK9mREqp%~WK>Q3beyK__vu@AE<24Qpih_oCOI1l%Lk@I@W?G$} zPm`$#YfjI>lcTj*8|9_XRvnlu8@ZrJ`L zJQ=Nc-)Yhc(5oimv3GVwcNh#Nd!(G7N!e75-AZhWf4-@^Q4}d}$y@h&fnNVb`{wm0 qVCj^@rt=os8u*xZ)8}mq3UEGMr>wvK)+lnL1=y}$E;8q^wEqB&%#t4f delta 4708 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 delta 2462 zcma)4X*ipS7XBhZ6m3ehYGS7&ZH!ooL=kFN?Vvhnb!@RrX=Ow$#h0S0t$m3t!ccVV zRi&jRM4NUHK|8h~mflGtmiE%7D7m?R?)`Ir-1D42=bY!f=RNN^U0D!z7NqSN6pqE> zjZWc>O$z#o9Ic zvHch}vz>8?iLk@R8U-qLX)KnbiCb!S%cI#fg56Yv>E9}ce~Y}d#e2O;Ysb`JhMds$ z@q>CpMt^{tv_g*uh1CrW9Fvj9F?ZoRzCP5^mKV26i>I!2X=v%aZ1aWKlkQeO9Sn(1 z)q$9ne>cpdc*yn4g(6?-Qe8EMerTIZw)Nvy>-``PBsA$7`|H(;fg2jG22V?_>>L@= z&E={8=v4#}>H5zjfm-GERf+PEERvPmt+g+TgFfJ`CjYaCvx`#%T13d#)xUu?UH&HLDs-tDJU2gHgF59B`W;pwp|L+EM-d9|6^R zwkTG~NQl@omX+ze(mNd{9hlD9W)i`oCH9iVoO+F(t#Z0@4r_t7ytoL-USthL$Ye}qcud!9X$hxO|3;5$$Hd?N zP=cbhlr3DxS%NEEj8`kGJ0=CNNZ86z%`{5nY>3cr@-||?+d9h9 z$|_KdQv5ao`xXo^9J%)f43=QyB4*Qh@wpxYB$PK*k}DjUIpYMeOVfaBq!Etl zWNLJ_dG=u#WB{8+^m*khKX9#!nef6YH~mI?}l2h{B)~X?_O%3Z24I6hQY9oY>vAR zRa)|V-GMPbr{?&BN#2w=Z$GM2j)%^Kl+N;+HF*GoSBH#!t`v)8OHt{t43k zXZMAYlx!$#>*u&uX~uXTg-i(sr7+K9VFW5sr#8`WwDqe1lIy7MKKPUO_mfV|;sTwg zQ~RJDQ#quWUp2-vNaIJmWO6HGA9egL>_&lV7>x;IR?@&uQ~yciRoYwN zf|q^b+p*$|VKC-J!I$gx##IBJDSYE^m_QS=FjSEu|Z4tDbJxXRau%LpX*6 ze5OOq;qBh@F@6)jJgMFV=~9f<;%xgEKSdr*TyX~LgM7>C3VFEZf~)ZFymyYiuE}8n zZQd9;_{@dZXLGe*>cJ)QJ;sBLG|{zrPE?}EOU}FbqQkHEU#7fTHgrbIYybJ?)J2*m zU1C6u0_h%z_A5>s$>cw8otVGTqstYB<16yX__i(nSXbpasQm>ee?X=Yf03UK!wv821j8L!Gju{1Sd@pMNY>eydv zD1)Vw!Tom@$E)h9Oxe%gyqjZVqbteu&@@kg!xp?Ys7UHAVtYQ9F~}RHD1|crgc!V} zB=d)G_3fAuSpoc9gT=m8t-{&Jkl-3HD1$AsL6FhH-;q~Hro(rC>_e=u0M)II0$+vR z4Ruam!wD78G7ECZI#$?s0od;4-cn4&qNB8}ZFfIu3aro3>A??%*aSc#fkM;I6hNq$V#$j^$hc2f0JF9BJ%0Ga`)sr?AlH}_Q z+{XCYlEsJYD08XP?w6&{s49|AUPj&?dq_>8x`>hKQ?lN%yCDxNuf_cKu0o$Y=l@Fp z!{aNOBcs`U9XvnhD+1p-;xo(Y4267Eiz3LpWolFj&fO({(5WR{MY~a}H>K^CR{0QJ8L|dwjtH>_^oJF|DLZ0T}6QfCCFSY}GhZ z^uJ#&HqBMJn0W{=X^a>bNMj@sQh|I$Ongk-iWs?ohw%^?L&PADjq*Vj3r9g7j3Xch z!KjSI6(bNNR)taNuI~TaU(A)lTttcx{#;_5f9bD^HZ!tE#4yg4f)c4j2J)pakwuK* zAP0uTERL9i@L>LED#FyzfyY5vuuKMn2qt5JG6~EF`5c@DO86X1%;ll5R3`b|Sjyod zkeH8x7@IEzF&PnA%#~pv&f~HrVip&Jxm;C&S(Jl>kMUrRSO!9Dt_0+8Mhztx0`f5k zMQ{!#;qv&Z85HJUz#3DrnH0~l6#A6XHWstVmR!?63qW<$BAKXsw*!W=2wkBNh@iL> zgjp~QicuT`Ia01f3h@wBDn(R(@@Js}gkN#g!k^^8;X^17W}zTTpd_RU;~>T(aPtwF zl*^JpGATfpcsw2( z=PrwliKa(HW6N=-eARM#d<-3v%cCMBSbRjxDyCwU)a4gFx%{p~H)dSCk0M_1M+_Co z%8|(6qa(#*BUERojKzO^bC-Nfi%aSMU?$Zms;9%4#54vnKEFgmSQ3oIBGd~>U}D|F zFbCwzP#%c$#WFF1;ZnYgH_G|fbxUyO3Lr$lVG+|DIA+j)!*&$^?{o40f&OPQ{elLQ zVp6`C4TC5|2oIIQ7%1j&P>_qthz`NyaACf5OlUrm9@EL0RaMU zLUIaRI)_lPDw*o2=k~EjLl#u$vCQZw_s$R-u)l4gWqfaZHXBD8wWkbZK+GBNYp0h6*1;Pmx8F7gIicxx1MD@LEr$1TFt&h3lZV>3Q7ltW~$Ze z5|&+3(gv4T-S57?d;luXZtpd?L_6kRvr_lb=`C(w1ydJ#n+H)BGORrEh10M45-(xh zyPf8_z9t*fbKJg)(J2Z)YttqV$~&l$aV~8*Z{1U+xo1fjFD~_+o^wR*o}1bpJUd@V z*YO({enRcprLdrAMV&PBTSyN`<(0I-lkY0wttV1f6kO_CGDkEsbwLrsw!9@E!@hs$ zY~z-tK!_-lq1x8LCX(jQqZ`krcolUD;=}aqbaLCXnY}k!vDI!inc4w|PWLvvUrx(1 zNCQesOMBeR>g(&v7)B+XHE_VSjyMNl+O22tN?;3%;uRihRRd*oo*|5wOs1c5yADQ6 zTR?89e0XtXXuiGU?m)*KxD)lplJ{?u<^)si-3EvKZ&7pC@6n&@v~PM^=Nb7VeUa#m zw&oavVPzCF7b`f}nA}q7>127=e+fY!56$t3MdZ5i_qWu3b6rNHIT%s1dXj@s>*}#^ zn%q*f-#%&H8gYu_Vw!F9)$hFk8 z^{8uVHI>okT9whYmC>h4jB25tzP_}kD1~`!f^HC1clv?Eo;q)X)aaJ%eFi%g8*k2NLF!HhkjUtd6pf4o(SGf%fhnD zh#d9x%KG7*7p}|Fo1(Iaoo?Wb&@+gM4mNQ=L($h1KB6SLw1yMfE$I}OFV+ksFV4?| z12CH2lUMvnm(44iqTU5-61rX<$%x)hU*mfg0TW0?5fg^y6)uID*TbSv^m<7*@ikyD zWv649-}$%0GS2Ng6r}dR+ocuK2a`2QU!zFv2$vk~D?jMGI5)z%T$O^pyk(>AE=h@W zefZd5S&@VAiq?3eiF>sMua#UkISXXRrxd)Y&os&4(92W8+%En^`s_hVN?gFt1qWHe z?PZ5%$D2U1MT;^`RO0fx`u^dlw@; zjBTDzkmJ$&!>#B0B;L2w{HUT#JkcIXH*&1Zv$wihxZ8hP;fx#b)}zC$V;)wyN8Jo> ze{Uz>{JOcRz0dH7YfZE5cYg5q!>r0YrTzBjE_=w~3HoJaojw=!;!Q zBmZ%+Ft>QRqs1d>TIR6Agsq>}aI!ORt;zalw+9|o{cC51p{-6`6~WHC?%lK`;2Z5o zCF8-o`!}m}9Iy6OZR0U)GV9(3uBy?m)62May6$xImFmwPG~1>ZtoeG!v-1S2er1TI zVShK7pdU(~@{^rcieqt|R*5KGCiZ6#6RNdDe8&_|-9nW5SU7#0NmU}*#-%DThbV*p zO-jKUttV^kev0HJzb2ieEfno^%BgWbY%rKZ5brKsH^2v6Mt1v`ZKc*-vejv=n9(Bw zPCnT@b~o1O6-6i~e6jXT(22hN z58eSJ50R+p7Piy5}lbh3$p4w`@w4LPw#6M0|S7%gRprPV%O3Av1f#K)B&}*5iwwZd^fsvV;l)T}!`+g$bOelmpi%^+UCx|2ckZ0~$GJ0iXP(`i@9y)=?q_#rp4o=ypt(X2F6pMRE(0wO zEdT%v`g&Ss7j5K)sX?eN>hUQY?xLab)w2lz0LIRL80hX)5)A;*ns{hx-n{AV6X+A* z?&B++j>{anBV1f@ccNu@>g*9Lfg^dm09bkxvYK%-A6UW*RAxZ0Vwsf;7xG z5(S@rW;exkv1n^k@V+le1gEA(K4dqQqEDv%M7=6lni}&gF?sNKIqaF|6!GBe$XV00 z3b|&tuyK^S6GES*Cu1rXNnfRLg=HzGzo&0`Raz~IR>T)zhBUee2Am3mfWrtSrE5Z+ z)NcS#@B|$M=rqdjg!3hwGi_+(+JPctL7jo=3OEBuBpaX>nyOI_sOf+r3v)!xff5S9 zVaVBO1-J*6CxFPp!`v_saO;U6JE$Zb5V-7`s0FxR2WmzwleGbBIKbv+(1Qj( zK>@hFm75+=-vV@!nCTh-2t5EdO^lNOD8c}T_rk)#Kx{6+rn6(E^y^w3GgPKy5C4EJlq|bSc4dr;rF;7jpJ0zDI870fKv^xv{CF$%J``tYaCNb8L zNT}3i#yilBw^ZjsPEIRlYopb^Y5=et7%_Gx1#9GqyiOJAbyj+Ho5KAzUCG}EDQ*o+ zYE3}N`i#}C??32hKYfgA{rq`tb@kJY9*tX$gH{jDu-$h$txoS9MJSyd>@U6fA`*qP zkJ6<$T&-f zdv*NW<;$YfF<50$4yeDY0t!oqR@ys*e;bG~TL*T2IRJp2cAqZXM{x)^(miH*H0bZxwYRUpz$Kf@0IZfl81TMRa;_Co+bt0YRYUY&QZi%Y7Lim!`uu8Z!(0Trtu($lTM ztU>D%$>;ANQ4_5p9zRmgFX;gLsKzhbY3d%2_hpps#=K@!_GS9x2r23kCq~gwsK19? zb`+dR1UV&J3*%BDoVjs_f?awPtSKS_1Bq;=LI&w_dI+;*3jvHC|BkZ%C3J$FPFwo* z_W&~bB%Y{?coNlMs{E0@Nwc+5o+nnPl|0^Elhp4CI57q8WGifTC z{qW9jT+}i>_u$ff?=)U2NYUV(hh7TR&{y~I)LYho+i^+z&Z94bC|IMkJ84i9K^g*% zSJd^a4Xuqo=~W8wiO90d(8$w(V@*GuMFP~eCvySVGdz%TbOI78|>hTEU2WDJ68>rDwqy( zvEtnMT-01x?jWugIfmuj6Di#N7I1mQW)3-*Dc1*wv6gI>3};Utq|LmMDVoVE3A3mo zloJ*RbeLVtkVRV6ZSx0pIv5%Al`5K#S=AUq;mu8RUUO{K^~wYSw$jH!^?8KNX%dyq zJHvM-n$Jy3Ufx+D_6g8Ab2kP{33@VA$NwEA*CYCJXjV7!-7C#8nSpr_HIP-0^1LXFA}`vvWBe)S36HaR(6(kwO+MpweDsI zs&1>Iu)IUN-R3xoQN90$n4Op|HjPACNH+g$K3_pw!C|DVxL+qt@GRqf+O8G!*1KXm zr|8Y?$Rb0ZiiMC4@*lnjuv3duuRj(0y7bmKsz!Pds#$sxmr}2spN|qhtbg{Gsiyrq zHO(@|Ovmiy*!0#hrDu~mk93$Gdi2??h^%<^dG$RLr4khsH89#R+RigGYAu&2zixQl zuzzHDq;zB|S1w-}F^weWlk=zZ7h4=`gKednE1O@t>Nl*~mfLJM6TRbX(Kcn)7+ZT> zqfTvM?bWIF+V%>TidJL1adpuY_Fet2=7Hv_7Vi4BPgJvY&0ft99I;NE*p}Y9ciZ?5 z{DZa!k4}}T84^A-R`c8PM+Cg`XH&FPT*xC8Y^y%#-OE~sVXa4*M?cA|G+!Q)=2o#eq7cQfMK)CX$E zuZ}72BIw2965_1lRa1Qvt$D@}*>XW+bD9B*T7R^%v=;KQ2ov-R=nXkZ6@v6#r5X7) z**4WaX*ZkUN$Wyu{d)#{Xlcnh9LoFNo5ho@-GncNU+7lCICEg{?R`U@lDhZeDmbd7 zS)~-S)C?1i6`uT5XO^twczAW^a?sUO+K_JkZmbY&3^kVcNz+d9it&z~q)}+b_jICM zh)AzYnbcZqtXS1!q9KFfe7<54N8Wt_FQl?!2O=gT{jr}0LC^@_jNQO~#kt)ds&S2L zIP3LJX@OnIq#p2Wd|X3m1Ep=&DF0?*D?Tkr-GFtqa(g?HG>FcsF1j|dHQYEj`&ho< zNAdX?|pZG#v751d$I<{HPY<~Y7SApAEdE%aw#Vn29H$Sx$F_OHh`(jOPtM|Q5f4sP2HwnK zKp3M*w@KGy{o}?1)w(3Y`eD|wmwm0Vm)}-DcpQ96EzHXu zUvJI|e*{4pPz;zy1$|$HeYHYX*AHkG53VpM&fI?(RYoDi(uM@A6>~>xU?ljDU^iJ5 z&3`7gDgkD?8Up&-nkWPsg@Pib5lS%Me`Uam|2+@iPho}krhU6S?vCxashG zkanT}?0|>U%duQ={5QIzEP5B@VR&D<0uclpfkL2M6`-ytCnuZ9J7Qit_l$1iae~7%o6xOWh)P=6j)u4{twrLUEAWeF^`y z*M9!`4pyYG3R?BYr3s~o=Q{p*?;kBg(68Y;pupxoG#dr`pi9DN?kv0M`m5*+{$~lL zQQInP5C>Vm49yQbEZW=Oi(9A}DVv(EQaz$bDWtYmD{*VBE?gw;zIn@?UP{n9!y$gL zXyHIwrGStrkS-pn$EGGiE5J(0oOCHs>;EVFbNMDLi;lL~wh49nL>1q8Bh}t?x_Lr8 zW67~xo0-azl9Kwq*)cLQ(u;%CFFqIIVrc`1=V)883u{QSCLGj5IxkJxrsj0`93&#F zJzu``Nzep18x4IDeeE(sBOy1d{p~V&h3tkK4v*v$>;bD8uiP5XE4f`h`{@Y7DLJc| zEd?fe1IDG4XcE9u@+=vaoCBs$0i<1W>lFL-Jr9Q4j^AGQfL4?IaDv95ggXESybpdG zQ&S<)SUY8Y{qN?<@qJlWA_3mlqvgvL9(ir6xxlAs&xC|nQ??4K+Ir#bHE_@UcvFcy z2&i<<&G9wXX4P@M3$*|7=gj0TFQqSl>Ew6j0$UcY*j1MqJbiY&OSD?sn93^fYzmx5 zN6^k8;!|wOUu-$z_`Gy^JVPAl$+l3hq$SMfqq8c=fwcV>ACjYXNu4u=LM7ybN7G&^ zf{SHavH#enoT*^N@mnmyGemW0uP%U#<*aTn(4L761mp=>V0uR_Y&=j1H4G-O-5$`< z(W##@15eCLGikds>Su(A6C%qYLK;Qn0>B&m!jhekj3eya#rW|mfL23NPdXVlDx)P^ z3RcQW9UAA|y2HkGVqT3obcdm4y>3g=dZVccV2p?`}A)2yTd+JjqUb;mHrzYBDaj{qy z3d3kci50o7vW*XEehj2UPr`dIM#4Esk1l<}s?5wiNm5$ew#K+ZjnJ4Zh=AkAx-tnu z8}vdZKN}fQX8%bW7+^OI2y&29E4Zf7+SW7nOg+^jahW#iBGMt|EC+T8Fns z4uKZaybNxG8Gkz~)D1pAQ1UevC1Qn6l-8B|F*fq$)6HW`F=J!O3GTX?GTKq20ir~5 zYCr+yPU+HY!|H5<2#l6=DX74?J1o2?z)cN{q+PWe`Cwhw)?F^*?N`1J|Z@>gxuyKIIfI?($$TeyBtGTB+IFW+=zMG;k7a znXWbQ5K|0h55yR~Ddca7!DZuPKev_JPoM0(V=Dgido)`b;Ylx#k8PZnp4MKSSJv^k z_(%}d%2`*!n#Qt_6)uNIuBEeZR43;uVbMk{52E{+gF)N%u@YdZOA}$Q>?w32)ZB+K ze)<~yVQnF#E!nmC(vpdFU#Owr+x0;AWM3Km_qzp*OBu1@x~oZ-aG%5$EGIXG41*N! zDYR5j9+x7BQ|rF-To-DomH78TlZ`xf=V0B;{EPL}YHQcm9Rz1#SV}hThxFTer~Gt! z70ndSa}#5!l{1$PR(kZS!9|+_Q+7pwb#Iz^`zp;4f%x{_`48OFtPivJ$N)PTs%zcB zraiqSF>UH(zJ3hOrrNXofGfna56;1-X_ZBfG)|+aKBB~AMGLz>jEXoD(BQ8-j+Q)U zTh_CqQ{YnZXmKr<3UPrtgSlYNeLvsZUR)288Ly+>wV|-03DYtu+Bd%ar9y8%#L=T-*GiqP}>Hk1sAFdqmj8sn6E3#+4w2rkbPe zfBE6)+7!|`!83nA1{P@%`)mqHb*My+3b;2sdT!P4Jv_PzCjSf}aru6t!pbJ@#irI;+Gp(l~z`u=fD0FW()MfZGc|UK# z+rgP0cgKRgqB_}?OqExeFT_{t8Ey)HBRux~1?6``_ybelS9L29kuh3;a5qh;adF7t zUuI9PifPQMx05xp)}6lDMTY5jua_!BV1T+)?XOxx!Pvk@EE~KfIL-XS;`q6-}C(bd4A7*-@p61pX;fw0^XPVfAo3mKWsHfKL5Bp0+F=H3{tJYe%^Dbyr8|?Ie$`jIr${N{<~Dd`nY$)X-yPseHDwy5PgVuq!o?E5=N(!w0DL+2$sk)v`1%_J;m?K9$_FCRdi0% zxo-BsoSS|q$^4^}ncDMhpI9p&+FUP|Jx&s2YJ*xfJ_-lvQec#qU8y(C-P4v1isRLu zMM4BY28vcP#H|_~+Xlasop$YzE8tr-0RNu`L8Xfk>LBc3-YJ;PO}mHUzB*4Q$I%}Q z-&mljDBvv{oeKb`fS3{=M3F?R0DOS6^)S|0X$+eep$BKNBqi_5ToJCp!1ra9sMjco z?Kr7Pn%EqebluFa?gC`DIiTm(@;tV>6T1_pHC;mz6cCDBnhB+Gd`MN8Tmu^2Q$xiZl|*qNx{NTnIH1s=f9 zElliF@KEQp!A>|0lw?D6X-{V%Qax~lQd-r$5U4N0KyElQ+1`cf9!8G#%ESq^bO7DZ zEQgVN#iFvjihr9e+^%n7pQc=W%DT8h`l{AFKP=brKkBJ*+ zU>97hz%@*nNvsYOZ5l9h_qMaQw{C;qDQGpoluysPwg7l8(+3R&U156DA3p z*9JH0^G`R+KtW@|weR5=EQc+(op5^`v^lU6D)s-i9MYQ+?Zar_o%nWsY39?^iEUck zgq$4^dCSgsV!$>cfvq1=m^P|UO8U_XCl{y~w zFLyRL^QTAzEGo&#S9Jp=;R_Pu&tvOZN>f1b=n>Plw3HKnO;2j^D$=dL2V4Y0DE&^6 zKuUkd=n;B8Q?1;z(Wrgsqy;dhLM@W~c@E8j8Kzu78F%>}F=Ca~tbC zB61iu?t3_NoZ~AV|0Uvc`>qiR*vfJF%mb0+bJr7606eZ~%NB8zR{*)$#hOH8-5U4; z_XSSC2WC}TYS2cPz>s@EP6*fMJ+Bnn3}I$;@~NeY_N08~t(tAPAdrB_y&B-YrG@*v z$uce6PdN(u&IK@?v>KjouBS&;RhWKp5@!BIiStq-O{NOd?dNO%+&@SqE&TA?d7r2V zuRE|@+~)FAgukCJ%a#wTW=W^NXBCb@1p7bgK2_xKEWMCKEgLLawEX1$2sWN{VY6Uv zM^lfcA}wcw=co!7@H_7t#8XuFn2rzX|#2}X33HP zXx7$)9XTjJ@lYR8v({|ksimB`KAdew7OpqolW(f0 zJo>txgH1ui^36T|Qyq_ft5^K}kTb13IB9cBqb7fwz%7rTIb-QNC<9%#BJVR29yXu3 ziHpT6_iWQCtx9vt-upJXT==iFgtZUo7yf|BgCVaLUmSNf7~S{#tl}w4zB~ui*f#F0 zIQw?w`!A+$+b=u7*KPZZE_F?mF*f*Is-=obr<9DdHMn%cA8T?!;TmJw=?RBFxe^7M zy)eS~DyuD3{Easa&}%6tq;}jRvWE|p;_I~rV;)D5g8aD$?R@pL)xJV`>>(<_53CL< zfu0;%Nxl6=y|;0Y%c%7{*A$y&z#sm5OMD~FDT&G7UnxI?nNyUdHMimFYJc+Wfvp0! zZ;li zKVn#g{2^U8F2fYPMHvPFAmbh3G| zXo(wQ40sxX&dBYWK-aY=#grx`nK(|oEak*nS7aeehC(gt_g>~~-lJUmPJLJ?7~!}B zm%2x;?q7`Zg0YB*5pc{KRphJeH4h6HW}OmB;1;{*IBU=7U64nIr$u0+a%q*k zKluHq_a;5mw8|H1Vr8F_%R4dC(LRi6{JS@p+fY4s=tQcWAM*0&gCD#v!FyK(X4J1W z`+f#0-|bp8-kHha4|Cr%XoQ+uS3KNES_Ym??Je@3(crB~1(}pu`UTkh4Ke*Mrz6-)ykptik#&&q~7m!y??yd@4w&k+}HKo*L^+r{d_*3=f3WeQt;hUaHbu2 z>pfx@Q~`@6;_w0$n8QC_y%($zVuYvfwK|2jI%PqywX?H0Wrw%5pwqE93u^+ynoeih zGH}66fhn9U$WSm=JR26_;XxG8QQGzQ;84x~FBz-04{qoE&*NehPeA}8UQny3SU;;1 zg@YN6j(`PBH%s1SSLcJ?XWva{_e4$|+MLXLrt5lf*PjY&pQXjQv8jOtyC&0ic%Bv3 z6B@xE=02u3tFpDX_gqx7oz+01Uzy`-VWvI_S*u5d!PDG*(<|qd3`JE#rH1*zGEqqT+w-D7oM@!N9~r`rHBNrm+9 zcFNytm4(OZLnuhY^q_C&_5;?zQ5%Z>O!n6E*3Nn1LM$YDxJbUC$eY@*9bdni#f?ao zmaIc%$rG`)=BgjUbv6>VwSJggm9hgvTR64ad3{3)lUHJJBog+x&%wuA70(p=b({ydM-Q>!e{x zLPo9mVV4n(ez3o>hgS7QLdFc&Y?td>5-MVf2`lTL6tBel2^EH-U-9Nv=rUXPe*Q%4 z;&AkJ2p^%81OjTRIq~UAJ$0k&4j&0F2$)hkqBO*9mvS4o^=X{Lfz(~4jiMg2JZbGJw2+#JSn9+KugSSa1=7m#>Za_lO5_u=6S+_svcDNBg?QR*~8OMhUL$#F9(w-$V1m)M(!N_ zc8=1*l@D*iPrs+zus(GX*vj&G;rTy83#C%jgVv2rDvi zM8M|lk1#>xE{=Y4wQ4^;V@&~Db&;y2DX8K<_bXjj~kaLJ14~vP7{2KQB6e zB|f=;cz$T!JLfi4{VJ0DJ35al`?C@%XPxrFM17}%GbI+vqq#nknuNYb2ibgxNT^28 zS*4~&NS_u{~ZvY)SM`GS6fWj{kNh6Bd<>|LouWU4_OaF_U z$W`ss6=q%VDF_<3$@CYSw@8@s#Cs>(^kUTk5cc7QHW%!}>EkxoBY2o)=8#72;-jE~ zK}=G4x_?y0b4YS{$YpN{KJ=7z9H|c~W$@WoZfr3ilmx-7YL6z^qlimNqfqt^v)9<=?e!WoId$Y*v zGj5z`jm^iI!$!>j97Y{_L$&9*7-x-*@H(P6&QS$~ z7Qy`?M!xY|2~B!;+TJu>xH^mP9sBVMPf`+I-Wq z#EfI_Y9NJ+n1_aF3>u*OMYbF)ZrwBQy)VuU+V#U^-;*PG2@eW`PB0m;*&k5g)S{D>yV21c%jxGA7o`9*3Gi?lMT1mU!z_h zgOGESJ^DrElyc$>hbw|gb-*th^6MsVpMk>Pc>G9XFlkq(mO*!jHI9WT8+WEx2Tj7| z4A4M8KG8O<*G?zs@q6zyUcB$|ZJ2yDDY>^5ky!S?fcn$7J|v&j zb+^tio4m3NmH#y(+muKpdJSG`Um&9jQ_HdyU`Z{V&BwXd8d5L^G1TH3VvS2+yl7cV z{mxX1iilj2T<g;awJ zfBR);DYJj>m~zrF`n$B(!*Fl@Oh8$wP<3P0Opmm($|*I=g~dcFpIBa9279elI?99N z-q%%}ZYmAYIV~RJ#YDb1(4hCy>Ds{Eds@EKJmX&=J~Ob&iG(jFdlK2>m0r8ofc6P_ za~Ceo(By_x{3`IgQ@|_TA_}d9n7nfbnxzm;pFu@vBooIfv{~7Il{^%em${jGy;JWK zOdTtLdz~xjOJsKp5Pw*o2e;&R7B5UL_!%@!oxa!`7D?buIBK~*OP>;1z5q!GvxeTc zDini#cPBQmNYU1jlhDn}d$$HYGP~0HpE>P6Q<53XuA2seQH`L4b7xA1>(@SxPk|Dq z+`kWG$!nf;d>UKoHtF4OFgO<}jBVCSTCSH?jvg>{XpCUfl=K`+v99 hzwZBd-`l5uLP6-{QM0nqv=k7qT*;o!)sD2JzX4&KRy_a! diff --git a/src/main/resources/assets/botania/textures/model/unused/armor_cloak.java b/src/main/resources/assets/botania/textures/model/unused/armor_cloak.java deleted file mode 100644 index 8985d03db..000000000 --- a/src/main/resources/assets/botania/textures/model/unused/armor_cloak.java +++ /dev/null @@ -1,50 +0,0 @@ -/*package model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * armor_cloak - wiiv - * Created using Tabula 4.1.1 - */ -/*public class armor_cloak extends ModelBase { - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer helm; - - public armor_cloak() { - this.textureWidth = 64; - this.textureHeight = 64; - this.armLpauldron = new ModelRenderer(this, 0, 15); - this.armLpauldron.mirror = true; - this.armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armLpauldron.addBox(-1.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); - this.setRotateAngle(armLpauldron, 0.08726646259971647F, -0.2617993877991494F, -0.17453292519943295F); - this.armRpauldron = new ModelRenderer(this, 0, 15); - this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addBox(-8.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); - this.setRotateAngle(armRpauldron, 0.08726646259971647F, 0.2617993877991494F, 0.17453292519943295F); - this.helm = new ModelRenderer(this, 0, 0); - this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addBox(-4.5F, -3.0F, -5.5F, 9, 4, 11, 0.0F); - this.setRotateAngle(helm, 0.2617993877991494F, 0.0F, 0.0F); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.armLpauldron.render(f5); - this.armRpauldron.render(f5); - this.helm.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - /*public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} -*/ \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/unused/dreamwoodChest.png b/src/main/resources/assets/botania/textures/model/unused/dreamwoodChest.png deleted file mode 100644 index e8d2308d5bfcf80623495a6e63a602766ec4035b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1393 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z;_6Q8AUa` z8i0aQC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDhKBB+oy>u@9`tl^45^5FJ8NTB zh@(i`XCWmvRShMl4ITLj>K(BxjvEAmGLlm#iik0GHgRMg@p5s|agjfG?3~|*jUv+C zx;$=jrXYK{_i}|FxU@ zH)x;z{ex?#Zz@e)zohPWq2!jpOW#T>-&=IA?p41l*XggsiE~$+02W!bX)HzSRxZ`6Zy>U%^YypEY^AbLQ=ee^j{EId-GDDb`P<_XNLFCUaV zJnAtg@E zbCIfY->$$N5%!bi7MLnZ{P*kK@xt&|aje+&Gm~y!y;*lKwDtGhRp%C@v6QKrXN5k` zDiA9SW$d}I?q=tM!>g^BqGQhNSoK-6A-enW+05B2;^7nPg~LS;C_FWqdR*eTURKPL z4-wtdNfw5RSY+|m&vkh272)HvTd7I zZb@_5B%2-_eKRDgY|hz&n^(fjre5pu*!DOlOMAB0>Aua9db4kxT6Src;K{N#QuUWW z^3!C~jbqHVPW4@Csyykf1y~*wVh97hQ{W2cXm0cb8*i+1vv2dtwK-b4z<}8SG`>6A z?Z}h1%Dom2og~yJ0E-hVa$D6+Mg4fZ$?g%soRoJXCHUC z@QrqzMBw4n_vU=-v>2F6?ayzSaXTunJTvneV;qby^Lxr{|>_*Z;kudd~a%cg45j3A>cS=7q+DGU&X2 zr~5?V(Z7BEj7%!WckH_UMjR;GJWt>Fux0(-`|Is8zjFu5_xsI%cvtz?zw5vV``fh6 uA$)=M1<@B=C9J!cVjHn>KiF%2;FkDuZ$scJyEb5v$KdJe=d#Wzp$Py-j(~~) diff --git a/src/main/resources/assets/botania/textures/model/unused/livingwoodChest.png b/src/main/resources/assets/botania/textures/model/unused/livingwoodChest.png deleted file mode 100644 index 89752e6fc3b9ba3cc4959d59186c1d280d361625..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1483 zcmZuxdo zuDLsJ)Jm-#n$-5rTpD4Trg*2$```P==lPuH^PJCfp7T8CJlThQJU1w7D+2&F?Dul> zlkvV)D9X#?qX_Z`8Ld6(jCBT}hPLi|C`^_kk9qlF0Z29mAmbtcQkj%74nQ0lfJq_% z_5}cFk_wxA9b^S1k{2Ns0F};FK$}dwGi0JR#XXRMi#b6_2t6AP4uwWUQ&2wc{>XSs zloe|CZqIoa8vtNB``w)V6GKFQvaW4%*XSh|g!Vckb4qQEuPLb!Iy^Kxz1L@xXXuq? zTzDFk-}D7a1^iw-GE{J7(JXw$RFV)o2tAT^7YBun+<(JnFT`;qMY!@u2S+gZWutoq zgl|*d-tcZWy_*^F+%8y-(a+zrH$Bj4ajaEzTblChLxsdPcINZrgnEHl6`L;p;gy=L z2yaZ|N7_-Ryp0m47E1~dqWm`#%oIK`MHPBjt}DnYT@JS`RwGB8H~*-*mr7VhQ8ixH za66r~{TiO?N1Laoi>kS;N&b2*R6i#>#}CP{1$br)v#USm)?pQekqq&_Ffxi9W1-j_ZoNBu{n@s z+W|PffE2g|%7F?iaiA(8AY)t_h`0f_1_2WKq?*F6_9JjCVzV{eBftEBBkz?*P(M;L zUEgp(?y%mC!-&Dy-8o~tI)`lx=JnB8szL3(06Ssq1#P)gWZ1(v9Gt?eMyqcpICd1k zN9Yz^u%LSS<4;JJL&q*(fvy{5;F0nH(}t+KQ^b!{^P% z53Z>*UdzAB=6lj!)8h%;$h;hkzrBz%lFCh{CF3dT@56&|Ozm8odB)BrZH7(%ux)+O z9PhFUUVt9PotTyv!e{%Vb=KaT=@-{xK-M>rj}{d4nw^xQ98D><&O2k-SCpFEN;2yS zALVpf!AeTqL{j$#!fWT3n}Wsg_v2Dtbz<*c=~b638En^L>$3X4D(Y7E^;x|EpONGp6=7=rp2a4mLtmBA z2eZww4=O#jEfJs1TFM>w`{{d=nF1>)?>F8i-@2sE~%=0QbW)Lwj-9bKYKjNEz0 z`^Z(VuN@c|+TaHELHJUm_RCv=PZbJ=pZ{`^tQon#bkv>U=e&Te=P^wwdsst_wNuO@ zss)RjDn}KITMC_82(*ww`rnvQ&V|#;!t8KP0c4`q3W=KrDldmU#G?TW|vg~2gcE8f1#3)c)))gwk+yF_N8&w zO-tWR#LgeR8{B0DBOx%6Z8O5KUR~t$lB#dH-HMjBWPQBMM*MAy@_N`MIoES{+Yb>< h&>H`nu55=b!-CI@of7b#D9D~E*zfM+R^>uG|1U39x{Ck+