Improved null safety

Author: ItsFelix5

gradle.properties

@@ -9,4 +9,4 @@ yacl_version=3.8.1+1.21.11
 modmenu_version=17.0.0-alpha.1
 
 # Mod Properties
-mod_version=1.11.0-1.21.11
+mod_version=1.11.1-1.21.11

src/main/java/cameratweaks/Freecam.java

@@ -13,13 +13,15 @@
 import net.minecraft.world.waypoints.PartialTickSupplier;
 import net.minecraft.world.waypoints.TrackedWaypoint;
 import net.minecraft.world.waypoints.Waypoint;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import static cameratweaks.Util.*;
 
 @SuppressWarnings("DataFlowIssue")
 public class Freecam {
     private static final Util.Pos[] cameras = new Util.Pos[9];
-    public static Util.LerpedPos pos;
+    public static Util.@Nullable LerpedPos pos;
     public static float speed;
 
     public static void enable() {
@@ -107,18 +109,18 @@ private static class FreecamWaypoint extends TrackedWaypoint {
         }
 
         @Override
-        public void update(TrackedWaypoint waypoint) {}
+        public void update(@NonNull TrackedWaypoint waypoint) {}
         @Override
-        public void writeContents(ByteBuf buf) {}
+        public void writeContents(@NonNull ByteBuf buf) {}
 
         @Override
-        public double yawAngleToCamera(Level level, Camera camera, PartialTickSupplier partialTickSupplier) {
+        public double yawAngleToCamera(@NonNull Level level, Camera camera, @NonNull PartialTickSupplier partialTickSupplier) {
             Vec3 vec3 = camera.position().subtract(client.getCameraEntity().position()).rotateClockwise90();
             return Mth.degreesDifference(camera.yaw(), (float) Mth.atan2(vec3.z(), vec3.x()) * Mth.RAD_TO_DEG);
         }
 
         @Override
-        public PitchDirection pitchDirectionToCamera(Level level, Projector projector, PartialTickSupplier partialTickSupplier) {
+        public @NonNull PitchDirection pitchDirectionToCamera(@NonNull Level level, Projector projector, @NonNull PartialTickSupplier partialTickSupplier) {
             Vec3 vec3 = projector.projectPointToScreen(client.getCameraEntity().getEyePosition());
             boolean bl = vec3.z > 1.0;
             double d = bl ? -vec3.y : vec3.y;

src/main/java/cameratweaks/Freelook.java

@@ -4,7 +4,6 @@
 
 import static cameratweaks.Util.client;
 
-// spaghetti
 public class Freelook {
     public static State state = State.INACTIVE;
     public static float yaw, pitch;

src/main/java/cameratweaks/ThirdPerson.java

@@ -11,14 +11,15 @@
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import net.minecraft.client.CameraType;
 import net.minecraft.network.chat.Component;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 
 import static cameratweaks.Util.client;
 
 public class ThirdPerson implements Cloneable {
     public static float distanceOffset = 0F;
-    public static ThirdPerson current;
+    public static @Nullable ThirdPerson current;
     public static ArrayList<ThirdPerson> pending;
 
     @SerialEntry(required = false)

src/main/java/cameratweaks/mixin/CameraMixin.java

@@ -60,6 +60,7 @@ private void changeRotation(Camera instance, float yaw, float pitch) {
 
     @Inject(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;getMaxZoom(F)F"), cancellable = true)
     private void modifyThirdperson(Level level, Entity entity, boolean bl, boolean bl2, float tickProgress, CallbackInfo ci) {
+        if(ThirdPerson.current == null) return;
         ci.cancel();
         float f = 4.0F;
         if (entity instanceof LivingEntity livingEntity)
@@ -79,7 +80,7 @@ private void modifyThirdperson(Level level, Entity entity, boolean bl, boolean b
     @WrapOperation(method = "getNearPlane", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/OptionInstance;get()Ljava/lang/Object;"))
     private Object getFov(OptionInstance<?> instance, Operation<Object> original) {
         if (ThirdPerson.current != null && ThirdPerson.current.changedFov) return ThirdPerson.current.fov;
-        if (Keybinds.freecam.enabled()) return Freecam.pos.fov;
+        if (Keybinds.freecam.enabled() && Freecam.pos != null) return Freecam.pos.fov;
         return original.call(instance);
     }
 }