Fixes

Author: 1foxy2

common/src/main/java/ca/fxco/moreculling/mixin/BakedQuad_cacheMixin.java

@@ -14,7 +14,7 @@ public class BakedQuad_cacheMixin implements QuadOpacity {
 
     @Shadow
     @Final
-    protected TextureAtlasSprite sprite;
+    private TextureAtlasSprite sprite;
 
     @Unique
     private Boolean moreculling$hasTranslucency;

common/src/main/java/ca/fxco/moreculling/mixin/MapItemSavedData_cacheMixin.java

@@ -4,17 +4,23 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.nio.ByteBuffer;
+import java.util.List;
+
 @Mixin(MapItemSavedData.class)
 public class MapItemSavedData_cacheMixin implements MapOpacity {
 
+    @Shadow public byte[] colors;
     @Unique
     private boolean moreculling$hasTransparency = false;
 
@@ -35,19 +41,20 @@ public class MapItemSavedData_cacheMixin implements MapOpacity {
     }
 
     @Inject(
-            method = "load",
+            method = "<init>(Lnet/minecraft/resources/ResourceKey;IIBLjava/nio/ByteBuffer;ZZZLjava/util/List;Ljava/util/List;)V",
             at = @At(
                     value = "FIELD",
                     target = "Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;colors:[B",
                     opcode = 181, // Opcodes.PUTFIELD
                     shift = At.Shift.AFTER
             )
     )
-    private static void moreculling$onLoad(CompoundTag tag, HolderLookup.Provider provider,
-                                           CallbackInfoReturnable<MapItemSavedData> cir, @Local MapItemSavedData map) {
-        for (byte b : map.colors) {
+    private void moreculling$onLoad(ResourceKey p_401030_, int p_401084_, int p_401048_, byte p_401197_,
+                                    ByteBuffer p_401348_, boolean p_401353_, boolean p_401003_, boolean p_401306_,
+                                    List p_401007_, List p_401318_, CallbackInfo ci) {
+        for (byte b : colors) {
             if (b == 0) {
-                ((MapItemSavedData_cacheMixin)(Object)map).moreculling$hasTransparency = true;
+                moreculling$hasTransparency = true;
                 return;
             }
         }

common/src/main/java/ca/fxco/moreculling/mixin/blockentity/BeaconRenderer_frustumMixin.java

@@ -9,31 +9,32 @@
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BeaconRenderer;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.entity.BeaconBeamOwner;
 import net.minecraft.world.level.block.entity.BeaconBlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.AABB;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(BeaconRenderer.class)
-public class BeaconRenderer_frustumMixin {
+public class BeaconRenderer_frustumMixin<T extends BlockEntity & BeaconBeamOwner> {
 
     @WrapWithCondition(
-            method = "render(Lnet/minecraft/world/level/block/entity/BeaconBlockEntity;" +
-                    "FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;II)V",
+            method = "render",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/renderer/blockentity/BeaconRenderer;" +
                             "renderBeaconBeam(Lcom/mojang/blaze3d/vertex/PoseStack;" +
-                            "Lnet/minecraft/client/renderer/MultiBufferSource;FJIII)V"
+                            "Lnet/minecraft/client/renderer/MultiBufferSource;FFJIII)V"
             )
     )
-    private boolean moreculling$onRenderBeam(PoseStack poseStack, MultiBufferSource multiBufferSource,
-                                             float tickDelta, long worldTime, int yOffset, int maxY, int color,
-                                             BeaconBlockEntity beaconBlockEntity) {
+    private boolean moreculling$onRenderBeam(PoseStack p_112185_, MultiBufferSource p_112186_,
+                                             float i, float tickDelta, long worldTime, int yOffset,
+                                             int maxY, int color, T blockEntity) {
         if (!MoreCulling.CONFIG.beaconBeamCulling) {
             return true;
         }
-        BlockPos pos = beaconBlockEntity.getBlockPos();
+        BlockPos pos = blockEntity.getBlockPos();
         LevelRenderer renderer = Minecraft.getInstance().levelRenderer;
         return renderer == null || ((LevelRendererAccessor) renderer).getFrustum().isVisible(new AABB(
                 pos.getX() - 1, pos.getY() + yOffset - 1, pos.getZ() - 1,

common/src/main/java/ca/fxco/moreculling/mixin/blockentity/TheEndGatewayRenderer_beamMixin.java

@@ -20,7 +20,8 @@ public class TheEndGatewayRenderer_beamMixin {
 
     @WrapWithCondition(
             method = "render(Lnet/minecraft/world/level/block/entity/TheEndGatewayBlockEntity;" +
-                    "FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;II)V",
+                    "FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;" +
+                    "IILnet/minecraft/world/phys/Vec3;)V",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/renderer/blockentity/BeaconRenderer;renderBeaconBeam(" +

common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_cullShapeMixin.java

@@ -21,11 +21,6 @@
 @Mixin(BlockModel.class)
 public abstract class BlockModel_cullShapeMixin implements ExtendedUnbakedModel {
 
-    @Final
-    @Shadow
-    @Nullable
-    private UnbakedModel parent;
-
     @Unique
     @Nullable
     private List<CullShapeElement> moreculling$cullShapeElements = null;
@@ -41,8 +36,8 @@ public abstract class BlockModel_cullShapeMixin implements ExtendedUnbakedModel
     @Override
     public @Nullable List<CullShapeElement> moreculling$getCullShapeElements(ResourceLocation id) {
         if (this.moreculling$cullShapeElements == null) {
-            return this.parent instanceof BlockModel ?
-                    ((ExtendedUnbakedModel) this.parent).moreculling$getCullShapeElements(id) : null;
+            return null;//this.parent instanceof BlockModel ?
+                    //((ExtendedUnbakedModel) this.parent).moreculling$getCullShapeElements(id) : null;
         }
         return moreculling$cullShapeElements;
     }

common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/ModelManager_cullShapeMixin.java

@@ -17,7 +17,7 @@
 public class ModelManager_cullShapeMixin {
 
     @ModifyArg(
-            method = {"method_65750", "lambda$loadBlockModels$10"},
+            method = {"method_65750", "lambda$loadBlockModels$9"},
             at = @At(
                     value = "INVOKE",
                     target = "com/mojang/datafixers/util/Pair.of(Ljava/lang/Object;" +

common/src/main/resources/META-INF/accesstransformer.cfg

@@ -1,6 +1,5 @@
 public net.minecraft.world.level.block.Block OCCLUSION_CACHE
 public net.minecraft.client.model.geom.ModelPart$Polygon
-public net.minecraft.client.renderer.block.model.BlockModel parentLocation
 public net.minecraft.client.model.geom.ModelPart$Vertex
 public net.minecraft.world.level.block.Block$ShapePairKey <init>(Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;)V
 public net.minecraft.world.level.block.Block$ShapePairKey

common/src/main/resources/moreculling.accesswidener

@@ -1,7 +1,6 @@
 accessWidener	v1	 named
 accessible field net/minecraft/world/level/block/Block OCCLUSION_CACHE Ljava/lang/ThreadLocal;
 accessible method net/minecraft/world/level/block/state/BlockBehaviour getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/phys/shapes/VoxelShape;
-accessible field net/minecraft/client/renderer/block/model/BlockModel parentLocation Lnet/minecraft/resources/ResourceLocation;
 accessible class net/minecraft/client/renderer/CloudRenderer$RelativeCameraPos
 accessible class net/minecraft/world/level/block/Block$ShapePairKey
 accessible method net/minecraft/world/level/block/Block$ShapePairKey <init> (Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;)V