From f5df403a91e1a5a213fc569baf8a6645b90da092 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 14 Jan 2025 13:23:45 -0300 Subject: [PATCH] fluid capacity stat --- assets/bundles/bundle.properties | 7 ++++++- src/omaloon/world/meta/OlStats.java | 4 ++++ src/omaloon/world/meta/PressureConfig.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 51026329..60685a05 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -331,6 +331,9 @@ stat.omaloon-add-fluid = Add Fluid air = Air stat.omaloon-remove-fluid = Remove Fluid +stat.omaloon-fluid-capacity = Fluid Capacity +stat.omaloon-fluid-capacity.format = @x@x@ Blocks + stat.omaloon-density = Density stat.omaloon-pump-strength = Pump Strength @@ -346,7 +349,9 @@ stat.omaloon-optimal-pressure = Optimal Pressure stat.omaloon-optimal-pressure.format = \uC357 @ Pascals (@%) ## ui units -unit.omaloon-density-unit = Pascals/Fluid Capacity +unit.omaloon-blocks-cubed = Blocks\u00B3 + +unit.omaloon-density-unit = Pascals/Blocks\u00B3 unit.omaloon-viscosity-unit = Pascal Seconds unit.omaloon-pressure-unit = Pascals diff --git a/src/omaloon/world/meta/OlStats.java b/src/omaloon/world/meta/OlStats.java index 76b4c2f3..6b173779 100644 --- a/src/omaloon/world/meta/OlStats.java +++ b/src/omaloon/world/meta/OlStats.java @@ -21,6 +21,8 @@ public class OlStats { addFluid = new Stat("omaloon-add-fluid", StatCat.crafting), removeFluid = new Stat("omaloon-remove-fluid", StatCat.crafting), + fluidCapacity = new Stat("omaloon-fluid-capacity", StatCat.liquids), + density = new Stat("omaloon-density"), pressureFlow = new Stat("omaloon-pressureflow", pressure), @@ -35,6 +37,8 @@ public class OlStats { optimalPressure = new Stat("omaloon-optimal-pressure", pressure); public static final StatUnit + blocksCubed = new StatUnit("omaloon-blocks-cubed"), + densityUnit = new StatUnit("omaloon-density-unit", "\uC357"), viscosityUnit = new StatUnit("omaloon-viscosity-unit", "\uC357"), diff --git a/src/omaloon/world/meta/PressureConfig.java b/src/omaloon/world/meta/PressureConfig.java index a350fd28..e95753d4 100644 --- a/src/omaloon/world/meta/PressureConfig.java +++ b/src/omaloon/world/meta/PressureConfig.java @@ -78,7 +78,7 @@ public class PressureConfig { }; public void addStats(Stats stats) { - stats.add(Stat.liquidCapacity, fluidCapacity, StatUnit.liquidUnits); + stats.add(OlStats.fluidCapacity, Core.bundle.get("stat.omaloon-fluid-capacity.format"), fluidCapacity/8f, fluidCapacity/8f, fluidCapacity/8f); stats.add(OlStats.maxPressure, maxPressure, OlStats.pressureUnit); stats.add(OlStats.minPressure, minPressure, OlStats.pressureUnit);