Add CARGO_FILL to Readouts and Stats

TeamOpenIndustry · Dec 11, 2023 · e18d48a · e18d48a
1 parent 94c1f19
commit e18d48a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/cam72cam/immersiverailroading/gui/overlay/Readouts.java b/src/main/java/cam72cam/immersiverailroading/gui/overlay/Readouts.java
@@ -31,6 +31,7 @@ public enum Readouts {
     FRONT_LOCOMOTIVE_ANGLE,
     REAR_LOCOMOTIVE_ANGLE,
     CYLINDER_DRAIN,
+    CARGO_FILL
     ;
 
     public float getValue(EntityRollingStock stock) {
@@ -98,6 +99,8 @@ public float getValue(EntityRollingStock stock, float lever) {
                 return rear instanceof LocomotiveModel ? yawToPercent(((LocomotiveModel<?, ?>)rear).getRearLocomotiveYaw((EntityMoveableRollingStock) stock), 90) : 0.5f;
             case CYLINDER_DRAIN:
                 return stock instanceof LocomotiveSteam && ((LocomotiveSteam) stock).cylinderDrainsEnabled() ? 1 : 0;
+            case CARGO_FILL:
+                return stock instanceof Freight ? ((Freight) stock).getPercentCargoFull() / 100f : 0;
         }
         return 0;
     }

diff --git a/src/main/java/cam72cam/immersiverailroading/gui/overlay/Stat.java b/src/main/java/cam72cam/immersiverailroading/gui/overlay/Stat.java
@@ -23,6 +23,9 @@ public enum Stat {
     BRAKE_PRESSURE,
     MAX_BRAKE_PRESSURE,
     UNITS_BRAKE_PRESSURE,
+    CARGO_FILL,
+    MAX_CARGO_FILL,
+    UNITS_CARGO_FILL,
     ;
 
     public String getValue(EntityRollingStock stock) {
@@ -107,6 +110,15 @@ public String getValue(EntityRollingStock stock) {
                 return "100";
             case UNITS_BRAKE_PRESSURE:
                 return "%";
+            case CARGO_FILL:
+                if (stock instanceof Freight) {
+                    return String.format("%s", ((Freight) stock).getPercentCargoFull());
+                }
+                return "";
+            case MAX_CARGO_FILL:
+                return "100";
+            case UNITS_CARGO_FILL:
+                return "%";
         }
         return "";
     }