1.21.1 neoforge bug fix

gradle.properties

@@ -17,8 +17,8 @@ parchment_mappings_version=2024.07.28
 mod_id=alexscaves
 mod_name=Alex's Caves
 mod_license=GNU LESSER GENERAL PUBLIC LICENSE
-mod_version=1.0.0
-mod_authors=Alex_The_Create
+mod_version=2.0.2
+mod_authors=Alexthe668, Noonyeyz
 mod_description=Explore new rare cave biomes hidden under the surface of the Overworld...
 
 # JEI (optional, for recipe viewing)

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

@@ -33,6 +33,7 @@
 import com.github.alexmodguy.alexscaves.server.misc.*;
 import com.github.alexmodguy.alexscaves.server.potion.ACEffectRegistry;
 import com.github.alexmodguy.alexscaves.server.recipe.ACRecipeRegistry;
+import com.github.alexmodguy.alexscaves.server.message.UpdateMagneticDataMessage;
 import com.mojang.logging.LogUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
@@ -167,6 +168,8 @@ private void registerPayloads(RegisterPayloadHandlersEvent event) {
         registrar.playToClient(SundropRainbowMessage.TYPE, SundropRainbowMessage.CODEC, SundropRainbowMessage::handle);
         registrar.playToClient(SpelunkeryTableCompleteTutorialMessage.TYPE,
                 SpelunkeryTableCompleteTutorialMessage.CODEC, SpelunkeryTableCompleteTutorialMessage::handle);
+        registrar.playToClient(UpdateMagneticDataMessage.TYPE, UpdateMagneticDataMessage.CODEC,
+                UpdateMagneticDataMessage::handle);
         // Client-to-server messages
         registrar.playToServer(MultipartEntityMessage.TYPE, MultipartEntityMessage.CODEC,
                 MultipartEntityMessage::handle);

src/main/java/com/github/alexmodguy/alexscaves/client/ClientProxy.java

@@ -25,6 +25,7 @@
 import com.github.alexmodguy.alexscaves.server.block.blockentity.*;
 import com.github.alexmodguy.alexscaves.server.block.fluid.ACFluidRegistry;
 import com.github.alexmodguy.alexscaves.server.entity.ACEntityRegistry;
+import com.github.alexmodguy.alexscaves.server.entity.item.BeholderEyeEntity;
 import com.github.alexmodguy.alexscaves.server.entity.item.QuarrySmasherEntity;
 import com.github.alexmodguy.alexscaves.server.entity.item.SubmarineEntity;
 import com.github.alexmodguy.alexscaves.server.entity.living.*;
@@ -125,6 +126,8 @@ public class ClientProxy extends CommonProxy {
     public static float possessionStrengthAmount = 0;
     public static int renderNukeSkyDarkFor = 0;
     public static float masterVolumeNukeModifier = 0.0F;
+    // Client-side tracking for bubbled effect visuals (entity ID -> remaining ticks)
+    private static final it.unimi.dsi.fastutil.ints.Int2IntMap BUBBLED_EFFECT_TICKS = new it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap();
     public static final Int2ObjectMap<AbstractTickableSoundInstance> ENTITY_SOUND_INSTANCE_MAP = new Int2ObjectOpenHashMap<>();
     public static final Map<BlockEntity, AbstractTickableSoundInstance> BLOCK_ENTITY_SOUND_INSTANCE_MAP = new HashMap<>();
     private final ACItemRenderProperties isterProperties = new ACItemRenderProperties();
@@ -143,6 +146,23 @@ public class ClientProxy extends CommonProxy {
     public static Vec3 acSkyOverrideColor = Vec3.ZERO;
     public static boolean disabledBiomeAmbientLightByOtherMod = false;
 
+    /**
+     * Ticks down all bubbled effect timers. Called from ClientEvents.
+     */
+    public static void tickBubbledEffects() {
+        if (BUBBLED_EFFECT_TICKS.isEmpty()) return;
+        var iterator = BUBBLED_EFFECT_TICKS.int2IntEntrySet().iterator();
+        while (iterator.hasNext()) {
+            var entry = iterator.next();
+            int newValue = entry.getIntValue() - 1;
+            if (newValue <= 0) {
+                iterator.remove();
+            } else {
+                entry.setValue(newValue);
+            }
+        }
+    }
+
     @SuppressWarnings("removal")
     @Override
     public void commonInit(IEventBus modEventBus) {
@@ -535,12 +555,12 @@ private void registerShaders(final RegisterShadersEvent e) {
             e.registerShader(
                     new ShaderInstance(e.getResourceProvider(),
                             ResourceLocation.fromNamespaceAndPath(AlexsCaves.MODID, "rendertype_irradiated"),
-                            DefaultVertexFormat.POSITION_TEX_COLOR),
+                            DefaultVertexFormat.NEW_ENTITY),
                     ACInternalShaders::setRenderTypeIrradiatedShader);
             e.registerShader(
                     new ShaderInstance(e.getResourceProvider(),
                             ResourceLocation.fromNamespaceAndPath(AlexsCaves.MODID, "rendertype_blue_irradiated"),
-                            DefaultVertexFormat.POSITION_TEX_COLOR),
+                            DefaultVertexFormat.NEW_ENTITY),
                     ACInternalShaders::setRenderTypeBlueIrradiatedShader);
             e.registerShader(new ShaderInstance(e.getResourceProvider(),
                     ResourceLocation.fromNamespaceAndPath(AlexsCaves.MODID, "rendertype_bubbled"),
@@ -687,6 +707,54 @@ public void resetRenderViewEntity(Player player) {
         }
     }
 
+    @Override
+    public boolean hasBubbledEffectVisual(int entityId) {
+        return BUBBLED_EFFECT_TICKS.getOrDefault(entityId, 0) > 0;
+    }
+
+    @Override
+    public void setBubbledEffectTicks(int entityId, int ticks) {
+        if (ticks <= 0) {
+            BUBBLED_EFFECT_TICKS.remove(entityId);
+        } else {
+            BUBBLED_EFFECT_TICKS.put(entityId, ticks);
+        }
+    }
+
+    @Override
+    public void handleBeholderSync(int beholderId, boolean active, double x, double y, double z, float yRot, float xRot, UUID usingPlayerUUID) {
+        Player playerSided = getClientSidePlayer();
+        if (playerSided != null && playerSided.level() instanceof ClientLevel clientLevel) {
+            Entity watcher = clientLevel.getEntity(beholderId);
+            // If entity doesn't exist on client and we have spawn data, create it
+            // This is necessary when viewing a Beholder from far away (unloaded chunks)
+            if (watcher == null && active && usingPlayerUUID != null) {
+                BeholderEyeEntity beholderEye = ACEntityRegistry.BEHOLDER_EYE.get().create(clientLevel);
+                if (beholderEye != null) {
+                    beholderEye.setId(beholderId);
+                    beholderEye.setPos(x, y, z);
+                    beholderEye.setEyeYRot(yRot);
+                    beholderEye.setEyeXRot(xRot);
+                    beholderEye.setUsingPlayerUUID(usingPlayerUUID);
+                    beholderEye.hasTakenFullControlOfCamera = true;
+                    clientLevel.addEntity(beholderEye);
+                    watcher = beholderEye;
+                }
+            }
+            if (watcher instanceof BeholderEyeEntity beholderEye) {
+                Entity beholderEyePlayer = beholderEye.getUsingPlayer();
+                beholderEye.hasTakenFullControlOfCamera = true;
+                if (beholderEyePlayer != null && beholderEyePlayer instanceof Player && beholderEyePlayer.equals(playerSided)) {
+                    if (active) {
+                        setRenderViewEntity(playerSided, beholderEye);
+                    } else {
+                        resetRenderViewEntity(playerSided);
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public void playWorldSound(@Nullable Object soundEmitter, byte type) {
         if (soundEmitter instanceof Entity entity && !entity.level().isClientSide) {

src/main/java/com/github/alexmodguy/alexscaves/client/event/ClientEvents.java

@@ -290,8 +290,6 @@ public void postRenderStage(RenderLevelStageEvent event) {
             RenderSystem.runAsFancy(() -> HologramProjectorBlockRenderer.renderEntireBatch(event.getLevelRenderer(),
                     event.getPoseStack(), event.getRenderTick(), event.getCamera(),
                     event.getPartialTick().getGameTimeDeltaPartialTick(false)));
-        }
-        if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) {
             RenderSystem.runAsFancy(() -> CorrodentRenderer.renderEntireBatch(event.getLevelRenderer(),
                     event.getPoseStack(), event.getRenderTick(), event.getCamera(),
                     event.getPartialTick().getGameTimeDeltaPartialTick(false)));
@@ -311,43 +309,11 @@ public void postRenderStage(RenderLevelStageEvent event) {
     public void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) {
         Entity player = Minecraft.getInstance().getCameraEntity();
         float partialTick = Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(false);
-        float tremorAmount = ClientProxy.renderNukeSkyDarkFor > 0 ? 1.5F : 0F;
         if (player instanceof PossessesCamera watcherEntity) {
             Minecraft.getInstance().options.setCameraType(CameraType.FIRST_PERSON);
-            tremorAmount = watcherEntity.isPossessionBreakable()
-                    ? AlexsCaves.PROXY.getPossessionStrengthAmount(partialTick)
-                    : 0F;
-        }
-        if (player != null && AlexsCaves.CLIENT_CONFIG.screenShaking.get()) {
-            double shakeDistanceScale = 64;
-            double distance = Double.MAX_VALUE;
-            if (tremorAmount == 0) {
-                AABB aabb = player.getBoundingBox().inflate(shakeDistanceScale);
-                for (Mob screenShaker : Minecraft.getInstance().level.getEntitiesOfClass(Mob.class, aabb,
-                        (mob -> mob instanceof ShakesScreen))) {
-                    ShakesScreen shakesScreen = (ShakesScreen) screenShaker;
-                    if (shakesScreen.canFeelShake(player) && screenShaker.distanceTo(player) < distance) {
-                        distance = screenShaker.distanceTo(player);
-                        tremorAmount = Math.min((1F - (float) Math.min(1, distance / shakesScreen.getShakeDistance()))
-                                * Math.max(shakesScreen.getScreenShakeAmount(partialTick), 0F), 2.0F);
-                    }
-                }
-            }
-            if (tremorAmount > 0) {
-                if (ClientProxy.lastTremorTick != player.tickCount) {
-                    RandomSource rng = player.level().random;
-                    ClientProxy.randomTremorOffsets[0] = rng.nextFloat();
-                    ClientProxy.randomTremorOffsets[1] = rng.nextFloat();
-                    ClientProxy.randomTremorOffsets[2] = rng.nextFloat();
-                    ClientProxy.lastTremorTick = player.tickCount;
-                }
-                float intensity = (float)(tremorAmount * Minecraft.getInstance().options.screenEffectScale().get());
-                ((CameraAccessor) event.getCamera()).invokeMove(
-                        ClientProxy.randomTremorOffsets[0] * 0.2F * intensity,
-                        ClientProxy.randomTremorOffsets[1] * 0.2F * intensity,
-                        ClientProxy.randomTremorOffsets[2] * 0.5F * intensity);
-            }
         }
+        // Screen shake logic has been moved to CameraMixin because ComputeCameraAngles
+        // event fires BEFORE setPosition() in Camera.setup(), causing move() effects to be overwritten
         if (player != null && player.isPassenger() && player.getVehicle() instanceof SubmarineEntity
                 && event.getCamera().isDetached()) {
             CameraAccessor cameraAccessor = (CameraAccessor) event.getCamera();
@@ -701,7 +667,7 @@ public void onPoseHand(EventPosePlayerHand event) {
     public void onPostRenderGuiOverlay(RenderGuiLayerEvent.Post event) {
         Player player = AlexsCaves.PROXY.getClientSidePlayer();
         int hudY = 0;
-        if (event.getName().equals(VanillaGuiLayers.CROSSHAIR) && player.getVehicle() instanceof RidingMeterMount mount
+        if (event.getName().equals(VanillaGuiLayers.HOTBAR) && player.getVehicle() instanceof RidingMeterMount mount
                 && mount.hasRidingMeter()) {
             int screenWidth = Minecraft.getInstance().getWindow().getGuiScaledWidth();
             int screenHeight = Minecraft.getInstance().getWindow().getGuiScaledHeight();
@@ -755,7 +721,7 @@ public void onPostRenderGuiOverlay(RenderGuiLayerEvent.Post event) {
                     (int) Math.floor(dinoHeight * invProgress), 128, 512);
             event.getGuiGraphics().pose().popPose();
         }
-        if (event.getName().equals(VanillaGuiLayers.CROSSHAIR) && DarknessArmorItem.hasMeter(player)) {
+        if (event.getName().equals(VanillaGuiLayers.HOTBAR) && DarknessArmorItem.hasMeter(player)) {
             ItemStack stack = player.getItemBySlot(EquipmentSlot.CHEST);
             int screenWidth = Minecraft.getInstance().getWindow().getGuiScaledWidth();
             int screenHeight = Minecraft.getInstance().getWindow().getGuiScaledHeight();
@@ -1123,6 +1089,8 @@ private Vec3 calculateBiomeWaterFogColor(Entity player) {
     public void onClientTick(ClientTickEvent.Post event) {
         Entity cameraEntity = Minecraft.getInstance().cameraEntity;
         float partialTicks = AlexsCaves.PROXY.getPartialTicks();
+        // Tick down bubbled effect visual timers
+        ClientProxy.tickBubbledEffects();
         if (ClientProxy.shaderLoadAttemptCooldown > 0) {
             ClientProxy.shaderLoadAttemptCooldown--;
         }

src/main/java/com/github/alexmodguy/alexscaves/client/gui/book/CaveBookScreen.java

@@ -12,8 +12,8 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.neoforged.neoforge.client.NeoForgeRenderTypes;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import net.neoforged.neoforge.common.NeoForge;
 
 public class CaveBookScreen extends Screen {
 
@@ -36,10 +35,10 @@ public class CaveBookScreen extends Screen {
     public static final float MOUSE_LEAN_THRESHOLD = 0.75F;
     public static final int PAGE_SIZE_IN_LINES = 15;
 
-    public static final int TEXT_COLOR = 0X5A4830;
+    public static final int TEXT_COLOR = 0X826A41;
     public static final int TEXT_LINK_COLOR = 0X111111;
     public static final int TEXT_LINK_HOVER_COLOR = 0X0094FF;
-    public static final int TEXT_LINK_LOCKED_COLOR = 0XA09078;
+    public static final int TEXT_LINK_LOCKED_COLOR = 0XD3C9AB;
     private final CaveBookProgress caveBookProgress;
     public boolean unlockTooltip;
     private boolean incrementingPage;
@@ -243,7 +242,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float fakePa
         poseStack.pushPose();
         BOOK_MODEL.setupAnim(null, openBookAmount, pageAngle, pageUp, -20 * (openBookAmount) - 10 * pageFlipBump, 0);
         BOOK_MODEL.mouseOver(mouseLeanX, mouseLeanY, ageInTicks, flip, canGoLeft(), canGoRight());
-        BOOK_MODEL.renderToBuffer(poseStack, bufferSource.getBuffer(RenderType.entityTranslucent(BOOK_TEXTURE)), 240, OverlayTexture.NO_OVERLAY, -1);
+        BOOK_MODEL.renderToBuffer(poseStack, bufferSource.getBuffer(NeoForgeRenderTypes.getUnlitTranslucent(BOOK_TEXTURE)), 240, OverlayTexture.NO_OVERLAY, -1);
         renderBookContents(poseStack, mouseX, mouseY, partialTick);
         guiGraphics.flush();
         poseStack.popPose();

src/main/java/com/github/alexmodguy/alexscaves/client/gui/book/widget/CraftingRecipeWidget.java

@@ -67,9 +67,9 @@ public void render(PoseStack poseStack, MultiBufferSource.BufferSource bufferSou
             float texWidth = 55 / 2F;
             float texHeight = 37 / 2F;
             vertexconsumer.addVertex(matrix4f, -texWidth, -texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(0, 0).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
-            vertexconsumer.addVertex(matrix4f, texWidth, -texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, 0).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F).setUv(0, scaledV1);
-            vertexconsumer.addVertex(matrix4f, texWidth, texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F).setUv(0, 0);
-            vertexconsumer.addVertex(matrix4f, -texWidth, texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(0, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F).setUv(scaledU1, 0);
+            vertexconsumer.addVertex(matrix4f, texWidth, -texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, 0).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
+            vertexconsumer.addVertex(matrix4f, texWidth, texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
+            vertexconsumer.addVertex(matrix4f, -texWidth, texHeight, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(0, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
             poseStack.popPose();
 
 

src/main/java/com/github/alexmodguy/alexscaves/client/gui/book/widget/EntityBoxWidget.java

@@ -120,8 +120,8 @@ private void renderQuad(PoseStack poseStack, VertexConsumer vertexconsumer, floa
         float scaledV1 = v1 / (float)BORDER_TEXTURE_SIZE;
 
         vertexconsumer.addVertex(matrix4f, x0, y0, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, scaledV0).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
-        vertexconsumer.addVertex(matrix4f, x1, y0, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU0, scaledV0).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F).setUv(scaledU0, scaledV1);
-        vertexconsumer.addVertex(matrix4f, x1, y1, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU0, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F).setUv(scaledU0, scaledV0);
-        vertexconsumer.addVertex(matrix4f, x0, y1, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F).setUv(scaledU1, scaledV0);
+        vertexconsumer.addVertex(matrix4f, x1, y0, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU0, scaledV0).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
+        vertexconsumer.addVertex(matrix4f, x1, y1, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU0, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
+        vertexconsumer.addVertex(matrix4f, x0, y1, 0.0F).setColor(1.0F, 1.0F, 1.0F, 1.0F).setUv(scaledU1, scaledV1).setOverlay(NO_OVERLAY).setLight(240).setNormal(0.0F, 1.0F, 0.0F);
     }
 }

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

@@ -365,7 +365,9 @@ public void setupAnim(SauropodBaseEntity entity, float limbSwing, float limbSwin
         float danceAmount = entity.getDanceProgress(partialTicks);
         float buryEggsAmount = entity.getBuryEggsProgress(partialTicks);
         positionNeckAndTail(entity, netHeadYaw, headPitch, partialTicks);
-        articulateLegs(entity.legSolver, raiseArmsAmount, partialTicks);
+        if (!straighten) {
+            articulateLegs(entity.legSolver, raiseArmsAmount, partialTicks);
+        }
         if (buryEggsAmount > 0.0F) {
             limbSwing = ageInTicks;
             limbSwingAmount = buryEggsAmount * 0.5F;

src/main/java/com/github/alexmodguy/alexscaves/client/particle/RainbowParticle.java

@@ -29,7 +29,7 @@
 
 public class RainbowParticle extends Particle {
     public static final ParticleGroup PARTICLE_GROUP = new ParticleGroup(100);
-    private static final RenderType RAINBOW_RENDER_TYPE = ACRenderTypes.getTeslaBulb(ResourceLocation.fromNamespaceAndPath(AlexsCaves.MODID, "textures/particle/rainbow.png"));
+    private static final RenderType RAINBOW_RENDER_TYPE = ACRenderTypes.getRainbow(ResourceLocation.fromNamespaceAndPath(AlexsCaves.MODID, "textures/particle/rainbow.png"));
     public int rainbowVecCount = 64;
     public int fadeSpeed = 15;
     public int fillSpeed = 40;