Fix a bunch of things that silently stopped working in the 1.21 port

src/main/java/com/github/alexmodguy/alexscaves/AlexsCaves.java

@@ -138,7 +138,7 @@ public AlexsCaves(IEventBus modEventBus, ModContainer modContainer) {
         ACLootTableRegistry.LOOT_FUNCTION_DEF_REG.register(modEventBus);
         ACCreativeTabRegistry.DEF_REG.register(modEventBus);
         ACDataComponentRegistry.init(modEventBus);
-        ACPotPatternRegistry.init(); // Pot patterns are now data-driven in 1.21
+        ACPotPatternRegistry.DEF_REG.register(modEventBus);
         this.modEventBus = modEventBus; // Store for later use
         PROXY.commonInit(modEventBus);
         ACBiomeRegistry.init();
@@ -192,36 +192,11 @@ private void commonSetup(final FMLCommonSetupEvent event) {
             ACEffectRegistry.setup();
             ACBlockRegistry.setup();
             ACItemRegistry.setup();
-            // ACPotPatternRegistry.expandVanillaDefinitions(); // Pot patterns are now data-driven in 1.21
             ACBlockEntityRegistry.expandVanillaDefinitions();
-            // Debug: verify POI registration
-            verifyPoiRegistration();
         });
         readModIncompatibilities();
     }
 
-    private void verifyPoiRegistration() {
-        try {
-            var attractingMagnets = com.github.alexmodguy.alexscaves.server.block.poi.ACPOIRegistry.ATTRACTING_MAGNETS.get();
-            var repellingMagnets = com.github.alexmodguy.alexscaves.server.block.poi.ACPOIRegistry.REPELLING_MAGNETS.get();
-            LOGGER.info("POI Verification - Attracting Magnets: {} states registered", attractingMagnets.matchingStates().size());
-            LOGGER.info("POI Verification - Repelling Magnets: {} states registered", repellingMagnets.matchingStates().size());
-
-            // Verify that PoiTypes.hasPoi returns true for our blocks
-            var scarletNode = com.github.alexmodguy.alexscaves.server.block.ACBlockRegistry.SCARLET_NEODYMIUM_NODE.get().defaultBlockState();
-            var azureNode = com.github.alexmodguy.alexscaves.server.block.ACBlockRegistry.AZURE_NEODYMIUM_NODE.get().defaultBlockState();
-            boolean scarletHasPoi = net.minecraft.world.entity.ai.village.poi.PoiTypes.hasPoi(scarletNode);
-            boolean azureHasPoi = net.minecraft.world.entity.ai.village.poi.PoiTypes.hasPoi(azureNode);
-            LOGGER.info("POI Verification - Scarlet Node hasPoi: {}, Azure Node hasPoi: {}", scarletHasPoi, azureHasPoi);
-
-            if (!scarletHasPoi || !azureHasPoi) {
-                LOGGER.error("POI registration failed! Neodymium blocks are not registered as POI types!");
-            }
-        } catch (Exception e) {
-            LOGGER.error("Failed to verify POI registration", e);
-        }
-    }
-
     private void registerTicketControllers(RegisterTicketControllersEvent event) {
         event.register(TICKET_CONTROLLER);
         event.register(com.github.alexmodguy.alexscaves.server.entity.item.NuclearExplosionEntity.TICKET_CONTROLLER);

src/main/java/com/github/alexmodguy/alexscaves/client/gui/SpelunkeryTableScreen.java

@@ -101,8 +101,6 @@ protected void init() {
     }
 
     public void render(GuiGraphics guiGraphics, int x, int y, float partialTick) {
-        this.renderBackground(guiGraphics, x, y, partialTick);
-        this.renderBg(guiGraphics, partialTick, x, y);
         super.render(guiGraphics, x, y, partialTick);
         this.renderMagnify(guiGraphics, partialTick);
         this.renderTooltip(guiGraphics, x, y);

src/main/java/com/github/alexmodguy/alexscaves/client/model/AtlatitanModel.java

@@ -1,6 +1,5 @@
 package com.github.alexmodguy.alexscaves.client.model;
 
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexmodguy.alexscaves.server.entity.living.AtlatitanEntity;
 import com.github.alexthe666.citadel.client.model.AdvancedModelBox;
 import com.google.common.collect.ImmutableList;
@@ -107,16 +106,13 @@ public AtlatitanModel() {
         this.updateDefaultPose();
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
-        int color = ColorUtil.packColor(red, green, blue, alpha);
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 2F;
             head.setScale(f, f, f);
             head.setShouldScaleChildren(true);
             head.setRotationPoint(0.8F, 3.0F, -75.0F);
             matrixStackIn.pushPose();
-            matrixStackIn.scale(0.15F, 0.15F, 0.15F);
-            matrixStackIn.translate(0.0D, 8.55F, 0D);
             parts().forEach((p_228292_8_) -> {
                 p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });

src/main/java/com/github/alexmodguy/alexscaves/client/model/CandicornModel.java

@@ -1,6 +1,5 @@
 package com.github.alexmodguy.alexscaves.client.model;
 
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexmodguy.alexscaves.server.entity.living.CandicornEntity;
 import com.github.alexmodguy.alexscaves.server.misc.ACMath;
 import com.github.alexthe666.citadel.animation.IAnimatedEntity;
@@ -323,8 +322,7 @@ private void poseBucking() {
         animator.rotate(right_backLeg, (float) Math.toRadians(35), 0, 0);
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
-        int color = ColorUtil.packColor(red, green, blue, alpha);
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         this.horn.showModel = !this.young;
         if (this.young) {
             float f = 1.35F;

src/main/java/com/github/alexmodguy/alexscaves/client/model/GrottoceratopsModel.java

@@ -300,8 +300,7 @@ public void animate(IAnimatedEntity entity) {
         animator.resetKeyframe(5);
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
-        int color = ColorUtil.packColor(red, green, blue, alpha);
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);

src/main/java/com/github/alexmodguy/alexscaves/client/model/RaycatModel.java

@@ -3,7 +3,6 @@
 // Paste this class into your mod and generate all required imports
 
 
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexmodguy.alexscaves.server.entity.living.RaycatEntity;
 import com.github.alexthe666.citadel.client.model.AdvancedEntityModel;
 import com.github.alexthe666.citadel.client.model.AdvancedModelBox;
@@ -133,7 +132,7 @@ public void setupAnim(RaycatEntity entity, float limbSwing, float limbSwingAmoun
         this.faceTarget(netHeadYaw, headPitch, 1, head);
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);
@@ -142,14 +141,14 @@ public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int
             matrixStackIn.scale(0.5F, 0.5F, 0.5F);
             matrixStackIn.translate(0.0D, 1.5D, 0D);
             parts().forEach((p_228292_8_) -> {
-                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
             head.setScale(1, 1, 1);
         } else {
             matrixStackIn.pushPose();
             parts().forEach((p_228290_8_) -> {
-                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/model/RelicheirusModel.java

@@ -1,6 +1,5 @@
 package com.github.alexmodguy.alexscaves.client.model;
 
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexmodguy.alexscaves.server.entity.living.RelicheirusEntity;
 import com.github.alexmodguy.alexscaves.server.misc.ACMath;
 import com.github.alexthe666.citadel.animation.Animation;
@@ -261,23 +260,21 @@ public RelicheirusModel() {
         animator = ModelAnimator.create();
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);
             head.setShouldScaleChildren(true);
             matrixStackIn.pushPose();
-            matrixStackIn.scale(0.25F, 0.25F, 0.25F);
-            matrixStackIn.translate(0.0D, 4.5F, 0D);
             parts().forEach((p_228292_8_) -> {
-                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
             head.setScale(1, 1, 1);
         } else {
             matrixStackIn.pushPose();
             parts().forEach((p_228290_8_) -> {
-                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/model/SubterranodonModel.java

@@ -3,7 +3,6 @@
 // Paste this class into your mod and generate all required imports
 
 
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexmodguy.alexscaves.server.entity.item.DinosaurSpiritEntity;
 import com.github.alexmodguy.alexscaves.server.entity.living.SubterranodonEntity;
 import com.github.alexmodguy.alexscaves.server.misc.ACMath;
@@ -277,7 +276,7 @@ public Vec3 getLegPosition(boolean right, Vec3 offsetIn) {
         return vec3;
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);
@@ -286,14 +285,14 @@ public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int
             matrixStackIn.scale(0.35F, 0.35F, 0.35F);
             matrixStackIn.translate(0.0D, 2.75D, 0.125D);
             parts().forEach((p_228292_8_) -> {
-                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
             head.setScale(1, 1, 1);
         } else {
             matrixStackIn.pushPose();
             parts().forEach((p_228290_8_) -> {
-                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/model/TremorsaurusModel.java

@@ -178,23 +178,21 @@ public TremorsaurusModel() {
         animator = ModelAnimator.create();
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);
             head.setShouldScaleChildren(true);
             matrixStackIn.pushPose();
-            matrixStackIn.scale(0.25F, 0.25F, 0.25F);
-            matrixStackIn.translate(0.0D, 4.5F, 0D);
             parts().forEach((p_228292_8_) -> {
-                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
             head.setScale(1, 1, 1);
         } else {
             matrixStackIn.pushPose();
             parts().forEach((p_228290_8_) -> {
-                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/model/TremorzillaModel.java

@@ -1,7 +1,6 @@
 package com.github.alexmodguy.alexscaves.client.model;
 
 import com.github.alexmodguy.alexscaves.client.model.misc.HideableModelBoxWithChildren;
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexmodguy.alexscaves.server.entity.living.TremorzillaEntity;
 import com.github.alexmodguy.alexscaves.server.entity.util.TremorzillaLegSolver;
 import com.github.alexmodguy.alexscaves.server.misc.ACMath;
@@ -264,23 +263,21 @@ public TremorzillaModel() {
         animator = ModelAnimator.create();
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);
             head.setShouldScaleChildren(true);
             matrixStackIn.pushPose();
-            matrixStackIn.scale(0.15F, 0.15F, 0.15F);
-            matrixStackIn.translate(0.0D, 8.55F, 0D);
             parts().forEach((p_228292_8_) -> {
-                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
             head.setScale(1, 1, 1);
         } else {
             matrixStackIn.pushPose();
             parts().forEach((p_228290_8_) -> {
-                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alpha));
+                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, color);
             });
             matrixStackIn.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/model/VallumraptorModel.java

@@ -179,7 +179,8 @@ public void setAlpha(float alpha) {
         this.alpha = alpha;
     }
 
-    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alphaIn) {
+    public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, int color) {
+        int tintedColor = ColorUtil.packColor(ColorUtil.unpackRed(color), ColorUtil.unpackGreen(color), ColorUtil.unpackBlue(color), ColorUtil.unpackAlpha(color) * this.alpha);
         if (this.young) {
             float f = 1.5F;
             head.setScale(f, f, f);
@@ -188,14 +189,14 @@ public void renderToBuffer(PoseStack matrixStackIn, VertexConsumer bufferIn, int
             matrixStackIn.scale(0.5F, 0.5F, 0.5F);
             matrixStackIn.translate(0.0D, 1.5D, 0D);
             parts().forEach((p_228292_8_) -> {
-                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alphaIn * this.alpha));
+                p_228292_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, tintedColor);
             });
             matrixStackIn.popPose();
             head.setScale(1, 1, 1);
         } else {
             matrixStackIn.pushPose();
             parts().forEach((p_228290_8_) -> {
-                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, ColorUtil.packColor(red, green, blue, alphaIn * this.alpha));
+                p_228290_8_.render(matrixStackIn, bufferIn, packedLightIn, packedOverlayIn, tintedColor);
             });
             matrixStackIn.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/model/misc/HideableModelBoxWithChildren.java

@@ -1,6 +1,5 @@
 package com.github.alexmodguy.alexscaves.client.model.misc;
 
-import com.github.alexmodguy.alexscaves.client.render.ColorUtil;
 import com.github.alexthe666.citadel.client.model.AdvancedEntityModel;
 import com.github.alexthe666.citadel.client.model.AdvancedModelBox;
 import com.github.alexthe666.citadel.client.model.basic.BasicModelPart;
@@ -24,9 +23,9 @@ public HideableModelBoxWithChildren(AdvancedEntityModel model, int textureOffset
     }
 
 
-    public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLightIn, int overlay, float r, float g, float b, float a) {
+    public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLightIn, int overlay, int color) {
         if (this.showModel) {
-            super.render(poseStack, vertexConsumer, packedLightIn, overlay, ColorUtil.packColor(r, g, b, a));
+            super.render(poseStack, vertexConsumer, packedLightIn, overlay, color);
         } else if (!this.cubeList.isEmpty() || !this.childModels.isEmpty()) {
             poseStack.pushPose();
             this.translateAndRotate(poseStack);
@@ -36,7 +35,7 @@ public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int packe
             }
             while (var9.hasNext()) {
                 BasicModelPart lvt_10_1_ = (BasicModelPart) var9.next();
-                lvt_10_1_.render(poseStack, vertexConsumer, packedLightIn, overlay, ColorUtil.packColor(r, g, b, a));
+                lvt_10_1_.render(poseStack, vertexConsumer, packedLightIn, overlay, color);
             }
             poseStack.popPose();
         }

src/main/java/com/github/alexmodguy/alexscaves/client/render/blockentity/AbyssalAltarBlockRenderer.java

@@ -14,6 +14,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.phys.AABB;
 
 public class AbyssalAltarBlockRenderer<T extends AbyssalAltarBlockEntity> implements BlockEntityRenderer<T> {
 
@@ -92,4 +93,8 @@ protected int getModelCount(ItemStack stack) {
     public int getViewDistance() {
         return 128;
     }
+
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
 }

src/main/java/com/github/alexmodguy/alexscaves/client/render/blockentity/AmbersolBlockRenderer.java

@@ -13,6 +13,7 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
@@ -129,4 +130,8 @@ private static void shineRightCornerVertex(VertexConsumer p_114224_, Matrix4f p_
     public int getViewDistance() {
         return 256;
     }
+
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
 }

src/main/java/com/github/alexmodguy/alexscaves/client/render/blockentity/ConversionCrucibleBlockRenderer.java

@@ -29,6 +29,7 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
 import net.neoforged.neoforge.client.model.data.ModelData;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
@@ -179,4 +180,8 @@ private static void shineRightCornerVertex(VertexConsumer vertexConsumer, Matrix
     public int getViewDistance() {
         return 128;
     }
+
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
 }