Fix a bunch of things that broke in the 1.21 port

build.gradle

@@ -66,8 +66,8 @@ neoForge {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    // Citadel dependency - use local Citadel jar from sibling project
-    implementation files('../Citadel/build/libs/citadel-1.21.1-2.7.0.jar')
+    // Citadel dependency - resolved from Curse Maven
+    implementation "curse.maven:citadel-331936:${citadel_file_id}"
 
     // JEI for 1.21.1 (optional, for recipe viewing)
     compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"

gradle.properties

@@ -23,3 +23,6 @@ mod_description=New, original, engaging, and aesthetic mobs for Minecraft.
 
 # JEI (for 1.21.1)
 jei_version=19.21.0.247
+
+# Citadel (CurseForge project 331936) - 1.21.1 build
+citadel_file_id=7476597

src/main/java/com/github/alexthe666/alexsmobs/ClientProxy.java

@@ -415,7 +415,7 @@ public void onEntityStatus(Entity entity, byte updateKind) {
     }
 
     public void updateBiomeVisuals(int x, int z) {
-        Minecraft.getInstance().levelRenderer.setBlocksDirty(x - 32, 0, x - 32, z + 32, 255, z + 32);
+        Minecraft.getInstance().levelRenderer.setBlocksDirty(x - 32, 0, z - 32, x + 32, 255, z + 32);
     }
 
     public static void setupParticles(RegisterParticleProvidersEvent registry) {

src/main/java/com/github/alexthe666/alexsmobs/block/BlockEndPirateFlag.java

@@ -6,6 +6,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -23,7 +24,6 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 import javax.annotation.Nullable;
-import java.util.Random;
 
 public class BlockEndPirateFlag extends BaseEntityBlock {
     public static final MapCodec<BlockEndPirateFlag> CODEC = simpleCodec(p -> new BlockEndPirateFlag());
@@ -84,7 +84,7 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level p_152180_, B
         return createTickerHelper(p_152182_, AMTileEntityRegistry.END_PIRATE_FLAG.get(), TileEntityEndPirateFlag::commonTick);
     }
 
-    public void animateTick(BlockState p_53094_, Level p_53095_, BlockPos p_53096_, Random p_53097_) {
+    public void animateTick(BlockState p_53094_, Level p_53095_, BlockPos p_53096_, RandomSource p_53097_) {
         if (p_53097_.nextInt(5) == 0) {
             final double d0 = (double)p_53096_.getX() + 0.55D - (double)(p_53097_.nextFloat() * 0.1F);
             final double d1 = (double)p_53096_.getY() + 0.55D - (double)(p_53097_.nextFloat() * 0.1F);

src/main/java/com/github/alexthe666/alexsmobs/block/BlockEnderResidue.java

@@ -8,6 +8,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
@@ -86,7 +87,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
         p_53586_.add(AGE, SLOW_DECAY);
     }
 
-    public ItemStack getCloneItemStack(BlockGetter p_53570_, BlockPos p_53571_, BlockState p_53572_) {
+    public ItemStack getCloneItemStack(LevelReader p_53570_, BlockPos p_53571_, BlockState p_53572_) {
         return ItemStack.EMPTY;
     }
 }

src/main/java/com/github/alexthe666/alexsmobs/block/BlockHummingbirdFeeder.java

@@ -134,7 +134,7 @@ public FluidState getFluidState(BlockState state) {
         return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
     }
 
-    public boolean isPathfindable(BlockState state, BlockGetter worldIn, BlockPos pos, PathComputationType type) {
+    public boolean isPathfindable(BlockState state, PathComputationType type) {
         return false;
     }
 

src/main/java/com/github/alexthe666/alexsmobs/client/event/ClientEvents.java

@@ -122,7 +122,7 @@ public void onGetStarBrightness(EventGetStarBrightness event) {
         if (Minecraft.getInstance().player.hasEffect(AMEffectRegistry.POWER_DOWN)) {
             if (Minecraft.getInstance().player.getEffect(AMEffectRegistry.POWER_DOWN) != null) {
                 MobEffectInstance instance = Minecraft.getInstance().player.getEffect(AMEffectRegistry.POWER_DOWN);
-                EffectPowerDown powerDown = (EffectPowerDown) instance.getEffect();
+                EffectPowerDown powerDown = (EffectPowerDown) instance.getEffect().value();
                 int duration = instance.getDuration();
                 float partialTicks = Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(false);
                 float f = (Math.min(powerDown.getActiveTime(), duration) + partialTicks) * 0.1F;

src/main/java/com/github/alexthe666/alexsmobs/client/render/AMItemstackRenderer.java

@@ -156,6 +156,7 @@ public static void drawEntityOnScreen(PoseStack matrixstack, int posX, int posY,
         matrixstack.mulPose(Axis.XP.rotationDegrees((float) (-xRot)));
         matrixstack.mulPose(Axis.YP.rotationDegrees((float) yRot));
         matrixstack.mulPose(Axis.ZP.rotationDegrees((float) zRot));
+        Lighting.setupForEntityInInventory();
         EntityRenderDispatcher entityrenderdispatcher = Minecraft.getInstance().getEntityRenderDispatcher();
         quaternion1.conjugate();
         entityrenderdispatcher.overrideCameraOrientation(quaternion1);

src/main/java/com/github/alexthe666/alexsmobs/client/render/tile/RenderCapsid.java

@@ -13,6 +13,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;
 import org.joml.Quaternionf;
 
 import java.util.Random;
@@ -38,6 +39,11 @@ protected int getModelCount(ItemStack stack) {
         return i;
     }
 
+    @Override
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
+
     @Override
     public void render(T entity, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn, int combinedLightIn, int combinedOverlayIn) {
         ItemStack stack = entity.getItem(0);

src/main/java/com/github/alexthe666/alexsmobs/client/render/tile/RenderEndPirateAnchor.java

@@ -10,6 +10,7 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.phys.AABB;
 
 public class RenderEndPirateAnchor<T extends TileEntityEndPirateAnchor> implements BlockEntityRenderer<T> {
 
@@ -22,6 +23,11 @@ public class RenderEndPirateAnchor<T extends TileEntityEndPirateAnchor> implemen
     public RenderEndPirateAnchor(Context rendererDispatcherIn) {
     }
 
+    @Override
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
+
     @Override
     public void render(T tileEntityIn, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn,
             int combinedLightIn, int combinedOverlayIn) {

src/main/java/com/github/alexthe666/alexsmobs/client/render/tile/RenderEndPirateAnchorWinch.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.phys.AABB;
 
 public class RenderEndPirateAnchorWinch<T extends TileEntityEndPirateAnchorWinch> implements BlockEntityRenderer<T> {
 
@@ -24,6 +25,11 @@ public class RenderEndPirateAnchorWinch<T extends TileEntityEndPirateAnchorWinch
     public RenderEndPirateAnchorWinch(Context rendererDispatcherIn) {
     }
 
+    @Override
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
+
     @Override
     public void render(T tileEntityIn, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn,
             int combinedLightIn, int combinedOverlayIn) {

src/main/java/com/github/alexthe666/alexsmobs/client/render/tile/RenderEndPirateDoor.java

@@ -12,6 +12,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.properties.DoorHingeSide;
+import net.minecraft.world.phys.AABB;
 
 public class RenderEndPirateDoor<T extends TileEntityEndPirateDoor> implements BlockEntityRenderer<T> {
 
@@ -22,6 +23,11 @@ public class RenderEndPirateDoor<T extends TileEntityEndPirateDoor> implements B
     public RenderEndPirateDoor(Context rendererDispatcherIn) {
     }
 
+    @Override
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
+
     @Override
     public void render(T tileEntityIn, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn,
             int combinedLightIn, int combinedOverlayIn) {

src/main/java/com/github/alexthe666/alexsmobs/client/render/tile/RenderEndPirateFlag.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.phys.AABB;
 
 public class RenderEndPirateFlag<T extends TileEntityEndPirateFlag> implements BlockEntityRenderer<T> {
 
@@ -21,6 +22,11 @@ public class RenderEndPirateFlag<T extends TileEntityEndPirateFlag> implements B
     public RenderEndPirateFlag(Context rendererDispatcherIn) {
     }
 
+    @Override
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
+
     @Override
     public void render(T tileEntityIn, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn,
             int combinedLightIn, int combinedOverlayIn) {

src/main/java/com/github/alexthe666/alexsmobs/client/render/tile/RenderEndPirateShipWheel.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider.Context;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.phys.AABB;
 
 public class RenderEndPirateShipWheel<T extends TileEntityEndPirateShipWheel> implements BlockEntityRenderer<T> {
 
@@ -23,6 +24,11 @@ public class RenderEndPirateShipWheel<T extends TileEntityEndPirateShipWheel> im
     public RenderEndPirateShipWheel(Context rendererDispatcherIn) {
     }
 
+    @Override
+    public AABB getRenderBoundingBox(T blockEntity) {
+        return blockEntity.getRenderBoundingBox();
+    }
+
     @Override
     public void render(T tileEntityIn, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn,
             int combinedLightIn, int combinedOverlayIn) {