Fixed some states not calling moreculling$resetTranslucencyCache on n…

…eoforge.
FxMorin · Oct 5, 2024 · d0515b4 · d0515b4
1 parent 0733bb7
commit d0515b4
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 18 deletions.
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_cacheMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_cacheMixin.java
@@ -7,9 +7,6 @@
 import ca.fxco.moreculling.utils.VertexUtils;
 import com.mojang.blaze3d.platform.NativeImage;
 import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.ItemOverrides;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.SimpleBakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
@@ -19,11 +16,10 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Mixin(SimpleBakedModel.class)
 public abstract class SimpleBakedModel_cacheMixin implements BakedOpacity {
@@ -84,15 +80,4 @@ public abstract class SimpleBakedModel_cacheMixin implements BakedOpacity {
     public boolean moreculling$canSetCullingShape() {
         return true;
     }
-
-    @Inject(
-            method = "<init>",
-            at = @At("RETURN")
-    )
-    private void moreculling$onInit(List<BakedQuad> quads, Map<Direction, List<BakedQuad>> faceQuads, boolean usesAo,
-                                    boolean isSideLit, boolean hasDepth, TextureAtlasSprite sprite,
-                                    ItemTransforms transformation, ItemOverrides itemOverrides,
-                                    CallbackInfo ci) {
-        moreculling$resetTranslucencyCache();
-    }
 }
diff --git a/fabric/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_fabricCacheMixin.java b/fabric/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_fabricCacheMixin.java
@@ -0,0 +1,30 @@
+package ca.fxco.moreculling.mixin.models;
+
+import ca.fxco.moreculling.api.model.BakedOpacity;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.ItemOverrides;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.SimpleBakedModel;
+import net.minecraft.core.Direction;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+import java.util.Map;
+
+@Mixin(SimpleBakedModel.class)
+public abstract class SimpleBakedModel_fabricCacheMixin implements BakedOpacity {
+    @Inject(
+            method = "<init>",
+            at = @At("RETURN")
+    )
+    private void moreculling$onInit(List<BakedQuad> quads, Map<Direction, List<BakedQuad>> faceQuads, boolean usesAo,
+                                    boolean isSideLit, boolean hasDepth, TextureAtlasSprite sprite,
+                                    ItemTransforms transformation, ItemOverrides itemOverrides,
+                                    CallbackInfo ci) {
+        moreculling$resetTranslucencyCache();
+    }
+}
diff --git a/fabric/src/main/resources/moreculling.fabric.mixins.json b/fabric/src/main/resources/moreculling.fabric.mixins.json
@@ -8,6 +8,7 @@
   "client": [
     "models.ForwardingBakedModel_compatMixin",
     "models.MultiPartBakedModel_cacheMixin",
+    "models.SimpleBakedModel_fabricCacheMixin",
     "models.WeightedBakedModel_cacheMixin",
     "renderers.ItemRenderer_fabricFaceCullingMixin"
   ],

diff --git a/...e/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_neoforgeCacheMixin.java b/...e/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_neoforgeCacheMixin.java
@@ -0,0 +1,26 @@
+package ca.fxco.moreculling.mixin.models;
+
+import ca.fxco.moreculling.api.model.BakedOpacity;
+import net.minecraft.client.renderer.block.model.ItemOverrides;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.SimpleBakedModel;
+import net.neoforged.neoforge.client.RenderTypeGroup;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+import java.util.Map;
+
+@Mixin(SimpleBakedModel.class)
+public abstract class SimpleBakedModel_neoforgeCacheMixin implements BakedOpacity {
+    @Inject(
+            method = "<init>(Ljava/util/List;Ljava/util/Map;ZZZLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/block/model/ItemTransforms;Lnet/minecraft/client/renderer/block/model/ItemOverrides;Lnet/neoforged/neoforge/client/RenderTypeGroup;)V",
+            at = @At("RETURN")
+    )
+    private void moreculling$onInit(List unculledFaces, Map culledFaces, boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d, TextureAtlasSprite particleIcon, ItemTransforms transforms, ItemOverrides overrides, RenderTypeGroup renderTypes, CallbackInfo ci) {
+        moreculling$resetTranslucencyCache();
+    }
+}
diff --git a/neoforge/src/main/resources/moreculling.neoforge.mixins.json b/neoforge/src/main/resources/moreculling.neoforge.mixins.json
@@ -7,6 +7,7 @@
   "client": [
     "models.BakedModelWrapper_compatMixin",
     "models.MultiPartBakedModel_cacheMixin",
+    "models.SimpleBakedModel_neoforgeCacheMixin",
     "models.WeightedBakedModel_cacheMixin",
     "renderers.ItemRenderer_neoforgeFaceCullingMixin"
   ],