R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.16 into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-08-19 19:19:24 -04:00
commit 89700c1e2e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java
View File

@ -23,10 +23,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public abstract class ItemRendererMixin { public abstract class ItemRendererMixin {
private ItemTransforms.TransformType transformType; private ItemTransforms.TransformType transformType;
private final SimpleItemModelView modelView = new SimpleItemModelView(); private final SimpleItemModelView modelView = new SimpleItemModelView();
private boolean mfix$isTopLevelSimpleModel;
@Inject(method = "render", at = @At("HEAD")) @Inject(method = "render", at = @At("HEAD"))
private void markRenderingType(ItemStack itemStack, ItemTransforms.TransformType transformType, boolean leftHand, PoseStack matrixStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay, BakedModel model, CallbackInfo ci) { private void markRenderingType(ItemStack itemStack, ItemTransforms.TransformType transformType, boolean leftHand, PoseStack matrixStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay, BakedModel model, CallbackInfo ci) {
this.transformType = transformType; this.transformType = transformType;
// used as renderModelLists may be called by custom model renderers
this.mfix$isTopLevelSimpleModel = model != null && model.getClass() == SimpleBakedModel.class;
} }
/** /**
@ -39,7 +42,7 @@ public abstract class ItemRendererMixin {
*/ */
@ModifyVariable(method = "renderModelLists", at = @At("HEAD"), index = 1, argsOnly = true) @ModifyVariable(method = "renderModelLists", at = @At("HEAD"), index = 1, argsOnly = true)
private BakedModel useSimpleWrappedItemModel(BakedModel model, BakedModel arg, ItemStack stack, int combinedLight, int combinedOverlay, PoseStack matrixStack, VertexConsumer buffer) { private BakedModel useSimpleWrappedItemModel(BakedModel model, BakedModel arg, ItemStack stack, int combinedLight, int combinedOverlay, PoseStack matrixStack, VertexConsumer buffer) {
if(!RenderState.IS_RENDERING_LEVEL && !stack.isEmpty() && model.getClass() == SimpleBakedModel.class && transformType == ItemTransforms.TransformType.GUI) { if(!RenderState.IS_RENDERING_LEVEL && !stack.isEmpty() && mfix$isTopLevelSimpleModel && model.getClass() == SimpleBakedModel.class && transformType == ItemTransforms.TransformType.GUI) {
FastItemRenderType type; FastItemRenderType type;
ItemTransform transform = model.getTransforms().gui; ItemTransform transform = model.getTransforms().gui;
if(transform == ItemTransform.NO_TRANSFORM) if(transform == ItemTransform.NO_TRANSFORM)