From 3c2c82b6687d91e9644a578c4eece403015968aa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 31 Mar 2020 20:55:02 -0500 Subject: [PATCH] Fix all head cosmetics. Blue butterfly texture changed so axis of rotation is down the middle of the texture bc that makes the GL easier :V --- .../equipment/bauble/ItemBaubleCosmetic.java | 130 ++++++++++-------- .../botania/textures/items/cosmetic10.png | Bin 401 -> 722 bytes 2 files changed, 70 insertions(+), 60 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 753399070..1ac422e51 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -35,7 +36,7 @@ import java.util.List; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public enum Variant { - BLACK_BOWTIE, BLACK_TIE, RED_GLASSES, PUFFY_SCARF, + BLACK_BOWTIE, BLACK_TIE, RED_GLASSES(true), PUFFY_SCARF, ENGINEER_GOGGLES(true), EYEPATCH(true), WICKED_EYEPATCH(true), RED_RIBBONS(true), PINK_FLOWER_BUD(true), POLKA_DOTTED_BOWS(true), BLUE_BUTTERFLY(true), CAT_EARS(true), WITCH_PIN, DEVIL_TAIL, KAMUI_EYE, GOOGLY_EYES(true), @@ -80,140 +81,149 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { Variant variant = ((ItemBaubleCosmetic) stack.getItem()).variant; if (variant.isHead) { - AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); - AccessoryRenderHelper.translateToFace(ms); - AccessoryRenderHelper.defaultTransforms(ms); + layer.getEntityModel().bipedHead.rotate(ms); switch (variant) { case RED_GLASSES: case ENGINEER_GOGGLES: - ms.scale(1.25F, 1.25F, 1.25F); - ms.translate(0F, -0.085F, 0.045F); + case ANAGLYPH_GLASSES: + ms.translate(0, -0.225, -0.3); + ms.scale(0.7F, -0.7F, -0.7F); renderItem(stack, ms, buffers, light); break; case EYEPATCH: - ms.scale(0.55F, 0.55F, 0.55F); - ms.translate(-0.45F, -0.25F, 0F); + ms.translate(0.125, -0.225, -0.3); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; case WICKED_EYEPATCH: - ms.scale(0.55F, 0.55F, 0.55F); - ms.translate(0.45F, -0.25F, 0F); + ms.translate(-0.125, -0.225, -0.3); + ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; case RED_RIBBONS: - ms.scale(0.9F, 0.9F, 0.9F); - ms.translate(0F, 0.75F, 1F); + ms.translate(0, -0.65, 0.2); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case PINK_FLOWER_BUD: + ms.translate(0.275, -0.6, 0); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); - ms.translate(0.4F, 0.6F, 0.45F); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case POLKA_DOTTED_BOWS: - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); - ms.translate(0.65F, 0.3F, 0.5F); - renderItem(stack, ms, buffers, light); - ms.translate(0F, 0F, -1F); - renderItem(stack, ms, buffers, light); - break; - case BLUE_BUTTERFLY: - ms.translate(-0.75F, 0.1F, 1F); ms.push(); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(45F)); + ms.translate(0.275, -0.4, 0); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); ms.pop(); - ms.translate(0F, 0F, -0.75F); + ms.translate(-0.275, -0.4, 0); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.scale(0.5F, -0.5F, -0.5F); + renderItem(stack, ms, buffers, light); + break; + case BLUE_BUTTERFLY: + ms.push(); + ms.translate(0.275, -0.4, 0); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(45F)); + ms.scale(0.5F, -0.5F, -0.5F); + renderItem(stack, ms, buffers, light); + ms.pop(); + + ms.translate(0.275, -0.4, 0); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-45F)); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case CAT_EARS: - ms.translate(0F, 0.25F, 0.25F); + ms.translate(0F, -0.5F, -0.175F); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case GOOGLY_EYES: - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); - ms.scale(1.5F, 1.5F, 1F); - ms.translate(0F, -0.05F, 0F); + ms.translate(0, -0.225, -0.3); + ms.scale(0.9F, -0.9F, -0.9F); renderItem(stack, ms, buffers, light); break; case CLOCK_EYE: - ms.scale(0.75F, 0.75F, 0.75F); - ms.translate(-0.25F, -0.1F, 0F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.translate(0.1, -0.225, -0.3F); + ms.scale(0.4F, -0.4F, -0.4F); renderItem(stack, ms, buffers, light); break; case UNICORN_HORN: - ms.scale(1.25F, 1.25F, 1.25F); + ms.translate(0, -0.7, -0.3); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); - ms.translate(0F, 0.4F, 0F); + ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; case DEVIL_HORNS: - ms.translate(0F, 0.2F, 0.25F); + ms.translate(0F, -0.4F, -0.175F); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case HYPER_PLUS: - ms.scale(0.35F, 0.35F, 0.35F); - ms.translate(-0.7F, 1F, -0.5F); + ms.translate(-0.15F, -0.45F, -0.3F); + ms.scale(0.2F, -0.2F, -0.2F); renderItem(stack, ms, buffers, light); ms.translate(1.45F, 0F, 0F); renderItem(stack, ms, buffers, light); break; case ANCIENT_MASK: - ms.scale(1.25F, 1.25F, 1.25F); - ms.translate(0F, 0.025F, 0.01F); + ms.translate(0, -0.3, -0.3); + ms.scale(0.7F, -0.7F, -0.7F); renderItem(stack, ms, buffers, light); break; case EERIE_MASK: + ms.translate(0, -0.25, -0.3); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case ALIEN_ANTENNA: - ms.scale(0.9F, 0.9F, 0.9F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); - ms.translate(0F, 0.75F, -1F); - renderItem(stack, ms, buffers, light); - break; - case ANAGLYPH_GLASSES: - ms.scale(1.25F, 1.25F, 1.25F); - ms.translate(0F, -0.025F, 0F); + ms.translate(0, -0.65, 0.2); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case ORANGE_SHADES: - ms.scale(1.25f, 1.25f, 1.25f); - ms.translate(0F, 0.04F, 0F); + ms.translate(0, -0.3, -0.3); + ms.scale(0.7F, -0.7F, -0.7F); int color = 0xFFFFFF | (178 << 24); RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.DEFAULT_UV); break; case GROUCHO_GLASSES: - ms.scale(1.5F, 1.5F, 1.5F); - ms.translate(0F, -0.2125F, 0F); + ms.translate(0, -0.1, -0.3); + ms.scale(0.75F, -0.75F, -0.75F); renderItem(stack, ms, buffers, light); break; case THICK_EYEBROWS: - ms.scale(0.5F, 0.5F, 0.5F); - ms.translate(-0.4F, 0.05F, 0F); + ms.push(); + ms.translate(-0.1, -0.3, -0.3); + ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); + ms.pop(); + + ms.translate(0.1, -0.3, -0.3); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); - ms.translate(-0.775F, 0F, 0F); + ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; case TINY_POTATO_MASK: - ms.scale(1.25F, 1.25F, 1.25F); - ms.translate(0F, 0.025F, 0F); + ms.translate(0, -0.3, -0.3); + ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; case QUESTGIVER_MARK: - ms.scale(0.8F, 0.8F, 0.8F); - ms.translate(0F, 1F, 0.3F); + ms.translate(0, -0.8, -0.2); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case THINKING_HAND: - ms.scale(0.9f, 0.9f, 0.9f); - ms.translate(0.2F, -0.5F, 0F); - ms.scale(-1, 1, 1); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(15F)); + ms.translate(-0.1, 0, -0.3); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-15F)); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; default: diff --git a/src/main/resources/assets/botania/textures/items/cosmetic10.png b/src/main/resources/assets/botania/textures/items/cosmetic10.png index a63bbc301e75f7e205266d2ea78cffdc376b3f3a..4a8307e7b91465f8ae2103f94ec68ed015e11a99 100644 GIT binary patch delta 685 zcmV;e0#f~v1JVVMBYy#HX+uL$X=7sm04R}lk-JMmVHn1L-Z08=s3D@k!JSS{j6gsHNM`e^6`CS`Y+95YfOv$Erhn)9d2ICZ;5TRW?(4b+ zQfXZQOP}zpqH1N~dExL@Sv7f2cv#6LQo<*~K20ttd~52-Ccl}SZSt4NS}eK+TCQd`pzX zqsUvOiYAUMIe+o`M6JlwwA75~X?gNg&D{Uzsb{9An$ulDaJ(AE=Qud`p!8i=vL;rd+ ztJXQ^PY~OdUvvkDM=&A%?u|c={0EB>x+yG<#&km3CI;CHz637kU(0A zG63d(5RI%EYBvi}ZUA|~v6+E^59s`jS^pWPT!04xabX~*&cMLJ1`LN728PVd3=BC2 zko*7y#HB=-(?PBP873siz|il?0CEX&UI2wS2<)$gBiNj^l_;O%Rs;*smH!z4g?CZU TCfAb900000NkvXXu0mjfC#*kp delta 375 zcmV--0f_$61(5@gBYyx1a7bBm000ia000ia0czHX2><{9AY({UO#lFTB>(_`g8%^e z{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ-7fD1xRCwB)ld(zzK@f(&l|#@Vf^w~e z1}rc54q_u%9GoEf074o`;4CafNNZsw2Pv;eqfJ8IAf27U`F{dY8wkh)8bF zfnj&q<=_9Coi!rDyfEj_I!Qu3`0`+gGuYVzU;&p%Lg8%q=a!oQz}EzJJKzUGr(QuI z35C;pcpby&`kxLyK4EYHdzXcaLsJnUkMGIsT14h1pf|Q2g`>W(wyC2ZNHqt>!19VZ zSgKi+a)CJ0w{Y)9u(}TWx6nH&P)ZTvtPt}9q5Y&eMQ{^HWmd!wY#qE(glWr?3N#zS z!415>Sp@eYHXGVdy<_keVPo5|2C1m+tFf|2cVaOBuhL)WM%W+e+(@~Dyz0N=X8?Q4 V;JPipr!)Wn002ovPDHLkV1m?VpOOFo