nullability improvement

Author: RealAntEngineer

src/main/java/com/rae/formicapi/content/thermal_utilities/SpecificRealGasState.java

@@ -7,7 +7,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -16,11 +15,11 @@ public class SpecificRealGasState {
 
     public static final SpecificRealGasState DEFAULT_STATE = new SpecificRealGasState(101_300f, 112_665f, null, null, null);
     public static final StreamCodec<ByteBuf, SpecificRealGasState> STREAM_CODEC = new StreamCodec<>() {
-        public @NotNull SpecificRealGasState decode(@NotNull ByteBuf buffer) {
+        public SpecificRealGasState decode(ByteBuf buffer) {
             return new SpecificRealGasState(Objects.requireNonNull(FriendlyByteBuf.readNbt(buffer)));
         }
 
-        public void encode(@NotNull ByteBuf buffer, SpecificRealGasState state) {
+        public void encode(ByteBuf buffer, SpecificRealGasState state) {
             FriendlyByteBuf.writeNbt(buffer, state.serialize());
         }
     };
@@ -33,19 +32,19 @@ public void encode(@NotNull ByteBuf buffer, SpecificRealGasState state) {
                             Codec.FLOAT.optionalFieldOf("vapor_quality", null).forGetter(p -> p.vaporQuality)
                     )
                     .apply(i, SpecificRealGasState::new));
-    Float pressure;
-    Float specificEnthalpy;
-    Float temperature;
-    Float specificEntropy;
-    Float vaporQuality;
+    final               Float                       pressure;
+    final               Float                       specificEnthalpy;
+    @Nullable Float temperature;
+    @Nullable Float specificEntropy;
+    @Nullable Float vaporQuality;
 
     public SpecificRealGasState(CompoundTag tag) {
         this(tag.getFloat("pressure"), tag.getFloat("specific_enthalpy"), tag.contains("temperature") ? tag.getFloat("temperature") : null,
                 tag.contains("specific_entropy") ? tag.getFloat("specific_entropy") : null,
                 tag.contains("vapor_quality") ? tag.getFloat("vapor_quality") : null);
     }
 
-    public SpecificRealGasState(@NotNull Float pressure, @NotNull Float specificEnthalpy, @Nullable Float temperature,
+    public SpecificRealGasState(Float pressure, Float specificEnthalpy, @Nullable Float temperature,
                                 @Nullable Float specificEntropy, @Nullable Float vaporQuality) {
         this.temperature = temperature == null ? null : Math.max(0, temperature);
         this.pressure = Math.max(0, pressure);
@@ -58,7 +57,7 @@ public SpecificRealGasState(@NotNull Float pressure, @NotNull Float specificEnth
     }
 
     @Override
-    public @NotNull String toString() {
+    public String toString() {
         return "SpecificRealGasState{" +
                 "temperature=" + temperature +
                 ", pressure=" + pressure +
@@ -70,29 +69,29 @@ public SpecificRealGasState(@NotNull Float pressure, @NotNull Float specificEnth
 
     public CompoundTag serialize() {
         CompoundTag tag = new CompoundTag();
+        tag.putFloat("pressure", pressure);
+        tag.putFloat("specific_enthalpy", specificEnthalpy);
         if (temperature != null) tag.putFloat("temperature", temperature);
-        if (pressure != null) tag.putFloat("pressure", pressure);
-        if (specificEnthalpy != null) tag.putFloat("specific_enthalpy", specificEnthalpy);
         if (specificEntropy != null) tag.putFloat("specific_entropy", specificEntropy);
         if (vaporQuality != null) tag.putFloat("vapor_quality", vaporQuality);
         return tag;
     }
 
-    public @NotNull Float temperature() {
+    public Float temperature() {
         if (temperature == null) {
             temperature = FullTableBased.getT(pressure, specificEnthalpy);
         }
         return temperature;
     }
 
-    public @NotNull Float specificEntropy() {
+    public Float specificEntropy() {
         if (specificEntropy == null) {
             specificEntropy = FullTableBased.getS(pressure, specificEnthalpy);
         }
         return specificEntropy;
     }
 
-    public @NotNull Float vaporQuality() {
+    public Float vaporQuality() {
         if (vaporQuality == null) {
             vaporQuality = FullTableBased.getX(pressure, specificEnthalpy);
         }