MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure CrystaliteArmorProvider compiles

Browse source
This commit is contained in:
Frank Bauer 2021-06-24 19:40:38 +02:00
parent 539a574cca
commit 2d130fac96
6 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java
View file

@ -19,15 +19,16 @@ import ru.betterend.registry.EndItems;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class CrystaliteArmorProvider /*implements ModelProvider, TextureProvider*/ { public class CrystaliteArmorProvider /*implements ModelProvider, TextureProvider*/ {
//TODO: find new registry
private final static ResourceLocation FIRST_LAYER = new ResourceLocation("textures/models/armor/crystalite_layer_1.png"); private final static ResourceLocation FIRST_LAYER = new ResourceLocation("textures/models/armor/crystalite_layer_1.png");
private final static ResourceLocation SECOND_LAYER = new ResourceLocation("textures/models/armor/crystalite_layer_2.png"); private final static ResourceLocation SECOND_LAYER = new ResourceLocation("textures/models/armor/crystalite_layer_2.png");
private final static CrystaliteHelmetModel HELMET_MODEL = new CrystaliteHelmetModel(1.0F); private final static CrystaliteHelmetModel HELMET_MODEL = CrystaliteHelmetModel.createModel(null);
private final static CrystaliteChestplateModel CHEST_MODEL = CrystaliteChestplateModel.regularModel(null); private final static CrystaliteChestplateModel CHEST_MODEL = CrystaliteChestplateModel.createRegularModel(null);
private final static CrystaliteChestplateModel CHEST_MODEL_SLIM = CrystaliteChestplateModel.thinModel(null); private final static CrystaliteChestplateModel CHEST_MODEL_SLIM = CrystaliteChestplateModel.createThinModel(null);
private final static CrystaliteLeggingsModel LEGGINGS_MODEL = new CrystaliteLeggingsModel(1.0F); private final static CrystaliteLeggingsModel LEGGINGS_MODEL = CrystaliteLeggingsModel.createModel(null);
private final static CrystaliteBootsModel BOOTS_MODEL = new CrystaliteBootsModel(1.0F); private final static CrystaliteBootsModel BOOTS_MODEL = CrystaliteBootsModel.createModel(null);
@Override //@Override
public @NotNull ResourceLocation getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot, public @NotNull ResourceLocation getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot,
boolean secondLayer, @Nullable String suffix, ResourceLocation defaultTexture) { boolean secondLayer, @Nullable String suffix, ResourceLocation defaultTexture) {
if (!isStackValid(stack)) return defaultTexture; if (!isStackValid(stack)) return defaultTexture;
@ -35,7 +36,7 @@ public class CrystaliteArmorProvider /*implements ModelProvider, TextureProvider
return FIRST_LAYER; return FIRST_LAYER;
} }
@Override //@Override
public @NotNull HumanoidModel<LivingEntity> getArmorModel(LivingEntity entity, ItemStack stack, public @NotNull HumanoidModel<LivingEntity> getArmorModel(LivingEntity entity, ItemStack stack,
EquipmentSlot slot, HumanoidModel<LivingEntity> defaultModel) { EquipmentSlot slot, HumanoidModel<LivingEntity> defaultModel) {
if (!isStackValid(stack)) return defaultModel; if (!isStackValid(stack)) return defaultModel;

6
src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java
View file

@ -5,11 +5,13 @@ import java.util.Collections;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.EntityModelSet;
import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*; import net.minecraft.client.model.geom.builders.*;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import ru.betterend.registry.EndEntitiesRenders;
public class CrystaliteBootsModel extends HumanoidModel<LivingEntity> { public class CrystaliteBootsModel extends HumanoidModel<LivingEntity> {
@ -35,6 +37,10 @@ public class CrystaliteBootsModel extends HumanoidModel<LivingEntity> {
return LayerDefinition.create(modelData, 64, 48); return LayerDefinition.create(modelData, 64, 48);
} }
public static CrystaliteBootsModel createModel(EntityModelSet entityModelSet){
return new CrystaliteBootsModel(entityModelSet==null?getTexturedModelData().bakeRoot():entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_BOOTS));
}
public CrystaliteBootsModel(ModelPart modelPart) { public CrystaliteBootsModel(ModelPart modelPart) {
super(modelPart, RenderType::entityTranslucent); super(modelPart, RenderType::entityTranslucent);

10
src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java
View file

@ -69,14 +69,12 @@ public class CrystaliteChestplateModel extends HumanoidModel<LivingEntity> {
final ModelPart localBody; final ModelPart localBody;
public static CrystaliteChestplateModel regularModel(EntityModelSet entityModelSet){ public static CrystaliteChestplateModel createRegularModel(EntityModelSet entityModelSet){
if (entityModelSet==null) throw new RuntimeException("Need to get a ModelSet"); return new CrystaliteChestplateModel(entityModelSet==null?getRegularTexturedModelData().bakeRoot():entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_CHESTPLATE), false);
return new CrystaliteChestplateModel(entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_CHESTPLATE), false);
} }
public static CrystaliteChestplateModel thinModel(EntityModelSet entityModelSet){ public static CrystaliteChestplateModel createThinModel(EntityModelSet entityModelSet){
if (entityModelSet==null) throw new RuntimeException("Need to get a ModelSet"); return new CrystaliteChestplateModel(entityModelSet==null?getThinTexturedModelData().bakeRoot():entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_CHESTPLATE_THIN), true);
return new CrystaliteChestplateModel(entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_CHESTPLATE_THIN), true);
} }
protected CrystaliteChestplateModel(ModelPart modelPart, boolean thinArms) { protected CrystaliteChestplateModel(ModelPart modelPart, boolean thinArms) {

8
src/main/java/ru/betterend/item/model/CrystaliteHelmetModel.java
View file

@ -7,12 +7,14 @@ import com.google.common.collect.Lists;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.EntityModelSet;
import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartNames; import net.minecraft.client.model.geom.PartNames;
import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*; import net.minecraft.client.model.geom.builders.*;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import ru.betterend.registry.EndEntitiesRenders;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class CrystaliteHelmetModel extends HumanoidModel<LivingEntity> { public class CrystaliteHelmetModel extends HumanoidModel<LivingEntity> {
@ -29,6 +31,12 @@ public class CrystaliteHelmetModel extends HumanoidModel<LivingEntity> {
return LayerDefinition.create(modelData, 64, 48); return LayerDefinition.create(modelData, 64, 48);
} }
public static CrystaliteHelmetModel createModel(EntityModelSet entityModelSet){
return new CrystaliteHelmetModel(entityModelSet==null?getTexturedModelData().bakeRoot():entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_HELMET));
}
public CrystaliteHelmetModel(ModelPart modelPart) { public CrystaliteHelmetModel(ModelPart modelPart) {
super(modelPart, RenderType::entityTranslucent); super(modelPart, RenderType::entityTranslucent);

6
src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java
View file

@ -5,12 +5,14 @@ import java.util.Collections;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.EntityModelSet;
import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartNames; import net.minecraft.client.model.geom.PartNames;
import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.*; import net.minecraft.client.model.geom.builders.*;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import ru.betterend.registry.EndEntitiesRenders;
public class CrystaliteLeggingsModel extends HumanoidModel<LivingEntity> { public class CrystaliteLeggingsModel extends HumanoidModel<LivingEntity> {
public static LayerDefinition getTexturedModelData() { public static LayerDefinition getTexturedModelData() {
@ -40,6 +42,10 @@ public class CrystaliteLeggingsModel extends HumanoidModel<LivingEntity> {
final ModelPart myLeftLeg; final ModelPart myLeftLeg;
final ModelPart myRightLeg; final ModelPart myRightLeg;
public static CrystaliteLeggingsModel createModel(EntityModelSet entityModelSet){
return new CrystaliteLeggingsModel(entityModelSet==null?getTexturedModelData().bakeRoot():entityModelSet.bakeLayer(EndEntitiesRenders.CRYSTALITE_LEGGINGS));
}
public CrystaliteLeggingsModel(ModelPart modelPart) { public CrystaliteLeggingsModel(ModelPart modelPart) {
super(modelPart, RenderType::entityTranslucent); super(modelPart, RenderType::entityTranslucent);

16
src/main/java/ru/betterend/registry/EndEntitiesRenders.java
View file

@ -8,14 +8,8 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.entity.model.*; import ru.betterend.entity.model.*;
import ru.betterend.entity.render.RendererEntityCubozoa; import ru.betterend.entity.render.*;
import ru.betterend.entity.render.RendererEntityDragonfly; import ru.betterend.item.model.*;
import ru.betterend.entity.render.RendererEntityEndFish;
import ru.betterend.entity.render.RendererEntityEndSlime;
import ru.betterend.entity.render.RendererEntityShadowWalker;
import ru.betterend.entity.render.SilkMothEntityRenderer;
import ru.betterend.item.model.ArmoredElytraModel;
import ru.betterend.item.model.CrystaliteChestplateModel;
public class EndEntitiesRenders { public class EndEntitiesRenders {
@ -30,6 +24,9 @@ public class EndEntitiesRenders {
public static final ModelLayerLocation ARMORED_ELYTRA = registerMain("armored_elytra"); public static final ModelLayerLocation ARMORED_ELYTRA = registerMain("armored_elytra");
public static final ModelLayerLocation CRYSTALITE_CHESTPLATE = registerMain("crystalite_chestplate"); public static final ModelLayerLocation CRYSTALITE_CHESTPLATE = registerMain("crystalite_chestplate");
public static final ModelLayerLocation CRYSTALITE_CHESTPLATE_THIN = registerMain("crystalite_chestplate_thin"); public static final ModelLayerLocation CRYSTALITE_CHESTPLATE_THIN = registerMain("crystalite_chestplate_thin");
public static final ModelLayerLocation CRYSTALITE_HELMET = registerMain("crystalite_helmet");
public static final ModelLayerLocation CRYSTALITE_LEGGINGS = registerMain("crystalite_leggings");
public static final ModelLayerLocation CRYSTALITE_BOOTS = registerMain("crystalite_boots");
public static void register() { public static void register() {
register(EndEntities.DRAGONFLY, RendererEntityDragonfly.class); register(EndEntities.DRAGONFLY, RendererEntityDragonfly.class);
@ -49,6 +46,9 @@ public class EndEntitiesRenders {
EntityModelLayerRegistry.registerModelLayer(ARMORED_ELYTRA, ArmoredElytraModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(ARMORED_ELYTRA, ArmoredElytraModel::getTexturedModelData);
EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_CHESTPLATE, CrystaliteChestplateModel::getRegularTexturedModelData); EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_CHESTPLATE, CrystaliteChestplateModel::getRegularTexturedModelData);
EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_CHESTPLATE_THIN, CrystaliteChestplateModel::getThinTexturedModelData); EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_CHESTPLATE_THIN, CrystaliteChestplateModel::getThinTexturedModelData);
EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_HELMET, CrystaliteHelmetModel::getTexturedModelData);
EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_LEGGINGS, CrystaliteLeggingsModel::getTexturedModelData);
EntityModelLayerRegistry.registerModelLayer(CRYSTALITE_BOOTS, CrystaliteBootsModel::getTexturedModelData);
} }
private static void register(EntityType<?> type, Class<? extends MobRenderer<?, ?>> renderer) { private static void register(EntityType<?> type, Class<? extends MobRenderer<?, ?>> renderer) {