From 04de4d0873fa86eed19aab83679c8120ab0d639c Mon Sep 17 00:00:00 2001 From: Aleksey Date: Mon, 30 Nov 2020 22:47:34 +0300 Subject: [PATCH] WIP: custom armor model --- .../item/model/CrystaliteArmorProvider.java | 17 +---------------- .../item/model/CrystaliteBootsModel.java | 3 ++- .../item/model/CrystaliteChestplateModel.java | 3 ++- .../item/model/CrystaliteHelmetModel.java | 3 ++- .../item/model/CrystaliteLeggingsModel.java | 3 ++- .../model/armor/crystalite_layer_1.png | Bin 1308 -> 1743 bytes .../model/armor/crystalite_layer_2.png | Bin 631 -> 489 bytes 7 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java b/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java index 57218aa9..5ff51bab 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java @@ -43,24 +43,9 @@ public class CrystaliteArmorProvider implements ModelProvider, TextureProvider { public @NotNull BipedEntityModel getArmorModel(LivingEntity entity, ItemStack stack, EquipmentSlot slot, BipedEntityModel defaultModel) { if (!isStackValid(stack)) return defaultModel; - if (entity instanceof AbstractClientPlayerEntity && - ((AbstractClientPlayerEntity) entity).getModel().equals("slim") && - slot == EquipmentSlot.CHEST) { - - return CHEST_MODEL_SLIM; - } switch(slot) { case HEAD: { - return new CrystaliteHelmetModel(1.0F); - } - case CHEST: { - return new CrystaliteChestplateModel(1.0F, false); - } - case LEGS: { - return new CrystaliteChestplateModel(1.0F, true); - } - case FEET: { - return new CrystaliteBootsModel(1.0F); + return HELMET_MODEL; } default: { return defaultModel; diff --git a/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java b/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java index e6d31f8d..a8efad9f 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java @@ -5,6 +5,7 @@ import java.util.Collections; import com.google.common.collect.Lists; import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.entity.LivingEntity; @@ -14,7 +15,7 @@ public class CrystaliteBootsModel extends BipedEntityModel { public ModelPart rightBoot; public CrystaliteBootsModel(float scale) { - super(scale); + super(RenderLayer::getEntityTranslucent, scale, 0.0F, 64, 32); this.leftBoot = new ModelPart(this, 0, 16); this.leftBoot.addCuboid(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.25F); this.leftBoot.setPivot(1.9F, 12.0F, 0.0F); diff --git a/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java b/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java index b02ccf2a..f94600e4 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java @@ -5,6 +5,7 @@ import java.util.Collections; import com.google.common.collect.Lists; import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.entity.LivingEntity; @@ -14,7 +15,7 @@ public class CrystaliteChestplateModel extends BipedEntityModel { public ModelPart rightShoulder; public CrystaliteChestplateModel(float scale, boolean thinArms) { - super(scale); + super(RenderLayer::getEntityTranslucent, scale, 0.0F, 64, 32); this.torso = new ModelPart(this, 16, 16); this.torso.addCuboid(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, scale); this.torso.setPivot(0.0F, 0.0F, 0.0F); diff --git a/src/main/java/ru/betterend/item/model/CrystaliteHelmetModel.java b/src/main/java/ru/betterend/item/model/CrystaliteHelmetModel.java index 44ce0fbe..0dab4cf0 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteHelmetModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteHelmetModel.java @@ -8,6 +8,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.entity.LivingEntity; @@ -15,7 +16,7 @@ import net.minecraft.entity.LivingEntity; public class CrystaliteHelmetModel extends BipedEntityModel { public CrystaliteHelmetModel(float scale) { - super(scale); + super(RenderLayer::getEntityTranslucent, scale, 0.0F, 64, 32); this.helmet = new ModelPart(this, 0, 0); this.helmet.addCuboid(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, scale + 0.5F); this.helmet.setPivot(0.0F, 0.0F, 0.0F); diff --git a/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java b/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java index 625986e9..cd771aec 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java @@ -5,13 +5,14 @@ import java.util.Collections; import com.google.common.collect.Lists; import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.entity.LivingEntity; public class CrystaliteLeggingsModel extends BipedEntityModel { public CrystaliteLeggingsModel(float scale) { - super(scale); + super(RenderLayer::getEntityTranslucent, scale, 0.0F, 64, 32); this.rightLeg = new ModelPart(this, 0, 16); this.rightLeg.addCuboid(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, scale); this.rightLeg.setPivot(-1.9F, 12.0F, 0.0F); diff --git a/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_1.png b/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_1.png index faa34796b619021fb0bc01aa167e7bec9290e6e0..d5f6b20d4a9a6e9115694e193e684fa5eb593e72 100644 GIT binary patch delta 1728 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

0Wbdd1nC2iBYy#~Nkl!heRil@A!c zJzt9=kFI{G111JZQAl!zCTYn}+zc-&85lUOePS^E$jyK*kHH`EDF6hJV${;5gkeEP zCc|U4?+gd67k@D@Fo14u8>UW$RE=d75V5Wfh6Zk4h#0KA0C^Y`Xp*7~BuS~KTMD26z&lScaQF~I1FV+V zybVGl#U`ohX$dF~T}K<#G60mHVM&^pJ_RB5v`hgE3=9Ba1;@PiN7?8A0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi zzyJUazyWI3i3tDz0t`t+K~!i%?Uy@9D?t>7|K0Tg@dXO;D%#yf@Qq-ng;)r;5KHas z#mWb_QUt+L2!a-3z<`a7C<-E|+)}*wK*R(kD3N$oF0R2S=zq!?W|z$xh#OtZ%6t%J z{&Nmt_sp3yvk(Xb0)apv5C{YUfj}S_JU`YJZX+6v4S^Yrn==Yc)7bAbkolOv#OgBE zx3_V(f5Q5H$W|XX&su49e+gQ=Vylg}_|9>D93}P=w#&f<0X1`Uty#m-4 z$WmlHMz0WyL|KVz&GopiEHkv#Z`N*4fJEm$O)4rY*u{rRJRPk=cL=LZCz&r*ywk_5 zkpTVjqd&}hwYRAbg|*ejwV9Gawq)o&JMoSufRAZI3H1AX>}Z@E`ps