diff --git a/build.gradle b/build.gradle index a392e91..fd81413 100644 --- a/build.gradle +++ b/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. diff --git a/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/model/PressureStack.java b/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/model/PressureStack.java index b0c391e..2f85a08 100644 --- a/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/model/PressureStack.java +++ b/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; } } diff --git a/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/pressure/PNCPressureIngredientHelper.java b/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/pressure/PNCPressureIngredientHelper.java index 0541a73..bae3f1e 100644 --- a/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/pressure/PNCPressureIngredientHelper.java +++ b/src/main/java/com/ticticboooom/mods/mm/client/jei/ingredients/pressure/PNCPressureIngredientHelper.java @@ -20,7 +20,7 @@ public class PNCPressureIngredientHelper implements IIngredientHelper 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") ); } } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java index 6d17271..24dea8b 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java @@ -88,14 +88,14 @@ public class PneumaticPortState extends PortState { @Override public List getIngredient(boolean input) { - return (List) Lists.newArrayList(new PressureStack(pressure)); + return (List) Lists.newArrayList(new PressureStack(this.minPressure, this.pressure)); } @Override public void setupRecipe(IRecipeLayout layout, Integer typeIndex, int x, int y, boolean input) { IGuiIngredientGroup 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 diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/storage/PneumaticPortStorage.java b/src/main/java/com/ticticboooom/mods/mm/ports/storage/PneumaticPortStorage.java index c4186bf..0c95e91 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/storage/PneumaticPortStorage.java +++ b/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, inv.getAir() + " Air", left + 50, top + 60, 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() + " mL", left + 50, top + 60, 0xfefefe); } diff --git a/src/test/resources/data/mm/recipes/progress_reset_test.json b/src/test/resources/data/mm/recipes/progress_reset_test.json index 533dc0c..744da52 100644 --- a/src/test/resources/data/mm/recipes/progress_reset_test.json +++ b/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 } } ], diff --git a/version.properties b/version.properties index eaaf3da..b2acc14 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -#Fri Nov 11 16:38:22 UTC 2022 -VERSION_CODE=1092 +#Sat Nov 12 15:39:00 UTC 2022 +VERSION_CODE=1104