mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 14:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mixin't

Browse Source 
- Fixed crash on startup when Optifine is installed
This commit is contained in:
simibubi 2023-09-22 15:13:43 +02:00
parent ebff770bb0
commit 6ef310a5c2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/simibubi/create/foundation/item/LayeredArmorItem.java
View File

@ -3,11 +3,15 @@ package com.simibubi.create.foundation.item;
import java.util.Map; import java.util.Map;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.foundation.mixin.accessor.HumanoidArmorLayerAccessor; import com.simibubi.create.foundation.mixin.accessor.HumanoidArmorLayerAccessor;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.Model;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer; import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
@ -39,14 +43,21 @@ public interface LayeredArmorItem extends CustomRenderedArmorItem {
accessor.create$callSetPartVisibility(innerModel, slot); accessor.create$callSetPartVisibility(innerModel, slot);
String locationStr2 = getArmorTextureLocation(entity, slot, stack, 2); String locationStr2 = getArmorTextureLocation(entity, slot, stack, 2);
ResourceLocation location2 = locationCache.computeIfAbsent(locationStr2, ResourceLocation::new); ResourceLocation location2 = locationCache.computeIfAbsent(locationStr2, ResourceLocation::new);
accessor.create$callRenderModel(poseStack, bufferSource, light, item, innerModel, glint, 1.0F, 1.0F, 1.0F, location2); renderModel(poseStack, bufferSource, light, item, innerModel, glint, 1.0F, 1.0F, 1.0F, location2);
HumanoidModel<?> outerModel = accessor.create$getOuterModel(); HumanoidModel<?> outerModel = accessor.create$getOuterModel();
layer.getParentModel().copyPropertiesTo((HumanoidModel) outerModel); layer.getParentModel().copyPropertiesTo((HumanoidModel) outerModel);
accessor.create$callSetPartVisibility(outerModel, slot); accessor.create$callSetPartVisibility(outerModel, slot);
String locationStr1 = getArmorTextureLocation(entity, slot, stack, 1); String locationStr1 = getArmorTextureLocation(entity, slot, stack, 1);
ResourceLocation location1 = locationCache.computeIfAbsent(locationStr1, ResourceLocation::new); ResourceLocation location1 = locationCache.computeIfAbsent(locationStr1, ResourceLocation::new);
accessor.create$callRenderModel(poseStack, bufferSource, light, item, outerModel, glint, 1.0F, 1.0F, 1.0F, location1); renderModel(poseStack, bufferSource, light, item, outerModel, glint, 1.0F, 1.0F, 1.0F, location1);
}
// from HumanoidArmorLayer.renderModel
private void renderModel(PoseStack poseStack, MultiBufferSource bufferSource, int light, ArmorItem item,
Model model, boolean glint, float red, float green, float blue, ResourceLocation armorResource) {
VertexConsumer vertexconsumer = bufferSource.getBuffer(RenderType.armorCutoutNoCull(armorResource));
model.renderToBuffer(poseStack, vertexconsumer, light, OverlayTexture.NO_OVERLAY, red, green, blue, 1.0F);
} }
String getArmorTextureLocation(LivingEntity entity, EquipmentSlot slot, ItemStack stack, int layer); String getArmorTextureLocation(LivingEntity entity, EquipmentSlot slot, ItemStack stack, int layer);

9
src/main/java/com/simibubi/create/foundation/mixin/accessor/HumanoidArmorLayerAccessor.java
View File

@ -6,15 +6,10 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.gen.Invoker;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.Model;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer; import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.ArmorItem;
@Mixin(HumanoidArmorLayer.class) @Mixin(HumanoidArmorLayer.class)
public interface HumanoidArmorLayerAccessor { public interface HumanoidArmorLayerAccessor {
@ -31,7 +26,5 @@ public interface HumanoidArmorLayerAccessor {
@Invoker("setPartVisibility") @Invoker("setPartVisibility")
void create$callSetPartVisibility(HumanoidModel<?> model, EquipmentSlot slot); void create$callSetPartVisibility(HumanoidModel<?> model, EquipmentSlot slot);
@Invoker("renderModel")
void create$callRenderModel(PoseStack poseStack, MultiBufferSource bufferSource, int light, ArmorItem item, Model model, boolean glint, float red, float green, float blue, ResourceLocation armorResource);
} }