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 faa34796..d5f6b20d 100644 Binary files a/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_1.png and b/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_1.png differ diff --git a/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png b/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png index 5924226e..8f50fd31 100644 Binary files a/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png and b/src/main/resources/assets/betterend/textures/model/armor/crystalite_layer_2.png differ