Fixes #432

Author: Jeryn99

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/console/FactoryConsoleModel.java

@@ -51,13 +51,18 @@ public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, i
     public void renderConsole(GlobalConsoleBlockEntity globalConsoleBlock, Level level, PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) {
         root().getAllParts().forEach(ModelPart::resetPose);
         TardisClientData reactions = TardisClientData.getInstance(level.dimension());
-        if (globalConsoleBlock == null) return;
 
-        Boolean powered = globalConsoleBlock.getBlockState() == null ? true : globalConsoleBlock.getBlockState().getValue(GlobalConsoleBlock.POWERED);
+        // Exit early if globalConsoleBlock is null
+        if (globalConsoleBlock == null) {
+            root().render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha);
+            return;
+        }
 
+        // Safely determine if the console is powered
+        boolean powered = globalConsoleBlock.getBlockState() != null
+                && globalConsoleBlock.getBlockState().getValue(GlobalConsoleBlock.POWERED);
 
         if (powered) {
-
             if (!globalConsoleBlock.powerOn.isStarted()) {
                 globalConsoleBlock.powerOff.stop();
                 globalConsoleBlock.powerOn.start(Minecraft.getInstance().player.tickCount);
@@ -72,30 +77,30 @@ public void renderConsole(GlobalConsoleBlockEntity globalConsoleBlock, Level lev
                 this.animate(reactions.ROTOR_ANIMATION, FLIGHT, Minecraft.getInstance().player.tickCount);
             } else {
                 // Handle idle animation
-                if (TRConfig.CLIENT.PLAY_CONSOLE_IDLE_ANIMATIONS.get() && globalConsoleBlock != null) {
+                if (TRConfig.CLIENT.PLAY_CONSOLE_IDLE_ANIMATIONS.get()) {
                     this.animate(globalConsoleBlock.liveliness, IDLE, Minecraft.getInstance().player.tickCount);
                 }
             }
-
         } else {
-            if (globalConsoleBlock != null) {
-                if (!globalConsoleBlock.powerOff.isStarted()) {
-                    globalConsoleBlock.powerOn.stop();
-                    globalConsoleBlock.powerOff.start(Minecraft.getInstance().player.tickCount);
-                }
-                this.animate(globalConsoleBlock.powerOff, POWER_OFF, Minecraft.getInstance().player.tickCount);
+            if (!globalConsoleBlock.powerOff.isStarted()) {
+                globalConsoleBlock.powerOn.stop();
+                globalConsoleBlock.powerOff.start(Minecraft.getInstance().player.tickCount);
             }
+            this.animate(globalConsoleBlock.powerOff, POWER_OFF, Minecraft.getInstance().player.tickCount);
         }
 
-        float rot = -125 - (30 * ((float) reactions.getThrottleStage() / TardisPilotingManager.MAX_THROTTLE_STAGE));
-        this.throttleLever.xRot = rot;
+        // Update throttle lever and handbrake animations
+        float throttleRotation = -125 - (30 * ((float) reactions.getThrottleStage() / TardisPilotingManager.MAX_THROTTLE_STAGE));
+        this.throttleLever.xRot = throttleRotation;
 
         this.handbrake.xRot = reactions.isHandbrakeEngaged() ? -155f : -125f;
-        root().render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha);
 
+        // Render the model
+        root().render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha);
     }
 
 
+
     @Override
     public ModelPart root() {
         return root;

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/console/VictorianConsoleModel.java

@@ -927,25 +927,29 @@ public void renderConsole(GlobalConsoleBlockEntity globalConsoleBlock, Level lev
         root().getAllParts().forEach(ModelPart::resetPose);
         TardisClientData reactions = TardisClientData.getInstance(level.dimension());
 
-        Boolean powered = globalConsoleBlock.getBlockState() == null ? true : globalConsoleBlock.getBlockState().getValue(GlobalConsoleBlock.POWERED);
+        boolean powered = globalConsoleBlock != null
+                && globalConsoleBlock.getBlockState() != null
+                && globalConsoleBlock.getBlockState().getValue(GlobalConsoleBlock.POWERED);
 
         if (powered) {
-            if (!globalConsoleBlock.powerOn.isStarted()) {
-                globalConsoleBlock.powerOff.stop();
-                globalConsoleBlock.powerOn.start(Minecraft.getInstance().player.tickCount);
-            }
-            this.animate(globalConsoleBlock.powerOn, POWER_ON, Minecraft.getInstance().player.tickCount);
-
-            if (reactions.isCrashing()) {
-                // Handle crashing animation
-                this.animate(reactions.CRASHING_ANIMATION, CRASH, Minecraft.getInstance().player.tickCount);
-            } else if (reactions.isFlying()) {
-                // Handle flying animation
-                this.animate(reactions.ROTOR_ANIMATION, FLIGHT, Minecraft.getInstance().player.tickCount);
-            } else {
-                // Handle idle animation
-                if (TRConfig.CLIENT.PLAY_CONSOLE_IDLE_ANIMATIONS.get() && globalConsoleBlock != null) {
-                    this.animate(globalConsoleBlock.liveliness, IDLE, Minecraft.getInstance().player.tickCount);
+            if (globalConsoleBlock != null) {
+                if (!globalConsoleBlock.powerOn.isStarted()) {
+                    globalConsoleBlock.powerOff.stop();
+                    globalConsoleBlock.powerOn.start(Minecraft.getInstance().player.tickCount);
+                }
+                this.animate(globalConsoleBlock.powerOn, POWER_ON, Minecraft.getInstance().player.tickCount);
+
+                if (reactions.isCrashing()) {
+                    // Handle crashing animation
+                    this.animate(reactions.CRASHING_ANIMATION, CRASH, Minecraft.getInstance().player.tickCount);
+                } else if (reactions.isFlying()) {
+                    // Handle flying animation
+                    this.animate(reactions.ROTOR_ANIMATION, FLIGHT, Minecraft.getInstance().player.tickCount);
+                } else {
+                    // Handle idle animation
+                    if (TRConfig.CLIENT.PLAY_CONSOLE_IDLE_ANIMATIONS.get()) {
+                        this.animate(globalConsoleBlock.liveliness, IDLE, Minecraft.getInstance().player.tickCount);
+                    }
                 }
             }
         } else {
@@ -964,6 +968,7 @@ public void renderConsole(GlobalConsoleBlockEntity globalConsoleBlock, Level lev
         root().render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha);
     }
 
+
     @Override
     public ResourceLocation getDefaultTexture() {
         return VICTORIAN_TEXTURE;