Added more info on the pressure stack

build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '1.16.5-0.1.67-B' + getVersionNumber()
+version = '1.16.5-0.1.68-B' + getVersionNumber()
 group = 'com.ticticboooom.mods.mm' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'MasterfulMachinery'
 java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.

src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/model/PressureStack.java

@@ -6,10 +6,14 @@ import lombok.Setter;
 public class PressureStack {
     @Getter
     @Setter
-    private float amount;
+    private float required;
 
-    public PressureStack(float amount){
+    @Getter
+    @Setter
+    private float consumed;
 
-        this.amount = amount;
+    public PressureStack(float required, float consumed){
+        this.required = required;
+        this.consumed = consumed;
     }
 }

src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/pressure/PNCPressureIngredientHelper.java

@@ -20,7 +20,7 @@ public class PNCPressureIngredientHelper implements IIngredientHelper<PressureSt
 
     @Override
     public String getUniqueId(PressureStack ingredient) {
-        return ingredient.getAmount() + "";
+        return ingredient.getRequired() + "-" + ingredient.getConsumed();
     }
 
     @Override
@@ -35,7 +35,7 @@ public class PNCPressureIngredientHelper implements IIngredientHelper<PressureSt
 
     @Override
     public PressureStack copyIngredient(PressureStack ingredient) {
-        return new PressureStack(ingredient.getAmount());
+        return new PressureStack(ingredient.getRequired(), ingredient.getConsumed());
     }
 
     @Override

src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/pressure/PNCPressureIngredientRenderer.java

@@ -32,7 +32,8 @@ public class PNCPressureIngredientRenderer implements IIngredientRenderer<Pressu
     public List<ITextComponent> getTooltip(PressureStack ingredient, ITooltipFlag tooltipFlag) {
         return Lists.newArrayList(
             new StringTextComponent("PNC Pressure"),
-                new StringTextComponent(ingredient.getAmount() + " Units")
+            new StringTextComponent("Required: " + ingredient.getRequired() + " Units"),
+            new StringTextComponent("Consumed: " + ingredient.getConsumed() + " Units")
         );
     }
 }

src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java

@@ -88,14 +88,14 @@ public class PneumaticPortState extends PortState {
 
     @Override
     public <T> List<T> getIngredient(boolean input) {
-        return (List<T>) Lists.newArrayList(new PressureStack(pressure));
+        return (List<T>) Lists.newArrayList(new PressureStack(this.minPressure, this.pressure));
     }
 
     @Override
     public void setupRecipe(IRecipeLayout layout, Integer typeIndex, int x, int y, boolean input) {
         IGuiIngredientGroup<PressureStack> group = layout.getIngredientsGroup(MMJeiPlugin.PRESSURE_TYPE);
         group.init(typeIndex, input, x+ 1, y +1);
-        group.set(typeIndex, new PressureStack(pressure));
+        group.set(typeIndex, new PressureStack(this.minPressure, this.pressure));
     }
 
     @Override

src/main/java/com/ticticboooom/mods/mm/ports/storage/PneumaticPortStorage.java

@@ -87,8 +87,8 @@ public class PneumaticPortStorage extends PortStorage {
         float pct = inv.getPressure() / inv.getCriticalPressure();
         GuiHelper.renderVerticallyFilledBar(stack, screen, barX, barY, 193, 18, barWidth, barHeight, pct);
 
-        AbstractGui.drawCenteredString(stack, Minecraft.getInstance().fontRenderer, NumberFormat.getInstance().format(inv.getPressure()) + "P", left + 50, top + 80, 0xfefefe);
+        AbstractGui.drawCenteredString(stack, Minecraft.getInstance().fontRenderer, NumberFormat.getInstance().format(inv.getPressure()) + " bar", left + 50, top + 80, 0xfefefe);
-        AbstractGui.drawCenteredString(stack, Minecraft.getInstance().fontRenderer, inv.getAir() + " Air", left + 50, top + 60, 0xfefefe);
+        AbstractGui.drawCenteredString(stack, Minecraft.getInstance().fontRenderer, inv.getAir() + " mL", left + 50, top + 60, 0xfefefe);
 
     }
 

src/test/resources/data/mm/recipes/progress_reset_test.json

@@ -10,7 +10,8 @@
             "consumeInstantly": true,
             "perTick": true,
             "data": {
-                "air": 14000
+                "minAir": 14000,
+                "air": 200
             }
         }
     ],

version.properties

@@ -1,2 +1,2 @@
-#Fri Nov 11 16:38:22 UTC 2022
+#Sat Nov 12 15:39:00 UTC 2022
-VERSION_CODE=1092
+VERSION_CODE=1104