diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-03-17 00:30:53 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-03-17 00:30:53 +0800 |
| commit | 809cc85848e157a02d32720562ea77ab7a462596 (patch) | |
| tree | 39808c081396ef076f23d4c540cc68fbc7ce2bba | |
| parent | 8af94d0768f57b59b56f019c9d40d95b77382187 (diff) | |
| download | RoughlyEnoughItems-809cc85848e157a02d32720562ea77ab7a462596.tar.gz RoughlyEnoughItems-809cc85848e157a02d32720562ea77ab7a462596.tar.bz2 RoughlyEnoughItems-809cc85848e157a02d32720562ea77ab7a462596.zip | |
Change fluid unit to mB if on forge
Signed-off-by: shedaniel <daniel@shedaniel.me>
| -rw-r--r-- | api/src/main/java/me/shedaniel/rei/api/ingredient/EntryStack.java | 4 | ||||
| -rwxr-xr-x | src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/ingredient/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/ingredient/EntryStack.java index 57a51896e..dd2cbf0f4 100644 --- a/api/src/main/java/me/shedaniel/rei/api/ingredient/EntryStack.java +++ b/api/src/main/java/me/shedaniel/rei/api/ingredient/EntryStack.java @@ -27,6 +27,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.mojang.serialization.Dynamic; import com.mojang.serialization.JsonOps; +import me.shedaniel.architectury.platform.Platform; import me.shedaniel.architectury.utils.Fraction; import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.entry.ComparisonContext; @@ -195,8 +196,9 @@ public interface EntryStack<T> extends TextRepresentable, Renderer { } public static class Fluid { + private static final String FLUID_AMOUNT = Platform.isForge() ? "tooltip.rei.fluid_amount.forge" : "tooltip.rei.fluid_amount"; // Return null to disable - public static final Settings<Function<EntryStack<?>, String>> AMOUNT_TOOLTIP = new Settings<>(stack -> I18n.get("tooltip.rei.fluid_amount", stack.simplifyAmount().getAmount())); + public static final Settings<Function<EntryStack<?>, String>> AMOUNT_TOOLTIP = new Settings<>(stack -> I18n.get(FLUID_AMOUNT, stack.simplifyAmount().getAmount())); private Fluid() { } diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index dc786d240..1a3864c54 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -103,6 +103,7 @@ "favorite.section.gamemode": "Game Mode", "favorite.section.weather": "Weather", "tooltip.rei.fluid_amount": "§7%d Unit", + "tooltip.rei.fluid_amount.forge": "§7%d mB", "tooltip.rei.drag_to_add_favorites": "§7Drag this up to add this to your favorites!", "msg.rei.copied_recipe_id": "Copied Recipe Identifier", "msg.rei.recipe_id_details": "Recipe ID: %s", |