From f1edc659fa3b6656456e114650461aeecf7f8ab5 Mon Sep 17 00:00:00 2001 From: Louis Hong Date: Tue, 29 Oct 2024 03:27:36 -0700 Subject: [PATCH] mould/preform score: unboxed Integer into int using -1 representing unset state (instead of null). --- .../toofifty/easygiantsfoundry/EasyGiantsFoundryState.java | 4 ++-- .../java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java index 2d5c071..45c6bf6 100644 --- a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java +++ b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java @@ -40,11 +40,11 @@ public class EasyGiantsFoundryState @Setter @Getter - private Integer mouldScore; + private int mouldScore = -1; // starts -1 because mould score is unknown @Setter @Getter - private Integer lastKnownCrucibleScore; + private int lastKnownCrucibleScore = -1; // will be set when "Pour"ed private final List stages = new ArrayList<>(); private double heatRangeRatio = 0; diff --git a/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java b/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java index 9b3706b..d93101d 100644 --- a/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java +++ b/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java @@ -292,7 +292,7 @@ public class FoundryOverlay3D extends Overlay return; } - if (state.getMouldScore() == null) + if (state.getMouldScore() < 0) { return; } @@ -310,7 +310,7 @@ public class FoundryOverlay3D extends Overlay return; } - if (state.getMouldScore() == null || state.getLastKnownCrucibleScore() == null) + if (state.getMouldScore() < 0 || state.getLastKnownCrucibleScore() < 0) { return; }