Give fluids names

Author: LordIdra

src/main/java/io/github/pylonmc/pylon/base/items/fluid/gui/FluidSelector.java

@@ -2,7 +2,10 @@
 
 
 import io.github.pylonmc.pylon.core.fluid.PylonFluid;
+import io.github.pylonmc.pylon.core.i18n.PylonArgument;
+import io.github.pylonmc.pylon.core.item.builder.ItemStackBuilder;
 import io.github.pylonmc.pylon.core.registry.PylonRegistry;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -60,9 +63,14 @@ public CurrentItem(@NotNull Supplier<PylonFluid> getFluid) {
         @Override
         public @NotNull ItemProvider getItemProvider() {
             PylonFluid fluid = getFluid.get();
-            return new ItemBuilder(fluid == null ? Material.BARRIER : fluid.getMaterial())
-                    // TODO use fluid name when that's in
-                    .setDisplayName("Current fluid: " + (fluid == null ? "None" : fluid.getKey().toString()));
+            return ItemStackBuilder.of(fluid == null ? Material.BARRIER : fluid.getMaterial())
+                    .name(Component.translatable(
+                            "pylon.pylonbase.message.fluid_selector.current_fluid",
+                            PylonArgument.of(
+                                    "fluid",
+                                    Component.translatable("pylon.pylonbase.fluid." + (fluid == null ? "none" : fluid.getKey().getKey()))
+                            ))
+                    );
         }
 
         @Override
@@ -83,11 +91,12 @@ public FluidItem(PylonFluid itemFluid, @NotNull Consumer<PylonFluid> setFluid, A
 
         @Override
         public ItemProvider getItemProvider() {
-            // TODO use fluid name when that's in
             if (itemFluid == null) {
-                return new ItemBuilder(Material.BARRIER).setDisplayName("Clear");
+                return ItemStackBuilder.of(Material.BARRIER)
+                        .name(Component.translatable("pylon.pylonbase.message.fluid_selector.clear"));
             }
-            return new ItemBuilder(itemFluid.getMaterial()).setDisplayName(itemFluid.getKey().toString());
+            return ItemStackBuilder.of(itemFluid.getMaterial())
+                    .name(Component.translatable("pylon.pylonbase.fluid." + itemFluid.getKey().getKey()));
         }
 
         @Override

src/main/java/io/github/pylonmc/pylon/base/items/fluid/items/FluidFilter.java

@@ -115,9 +115,8 @@ public void onInteract(@NotNull PlayerInteractEvent event) {
 
     @Override
     public @NotNull WailaConfig getWaila(@NotNull Player player) {
-        // TODO add this once fluids have names
         return new WailaConfig(getKey(), Map.of(
-                "fluid", Component.text(fluid == null ? "N/A" : fluid.getKey().toString())
+                "fluid", Component.translatable("pylon.pylonbase.fluid." + (fluid == null ? "none" : fluid.getKey().getKey()))
         ));
     }
 

src/main/java/io/github/pylonmc/pylon/base/items/fluid/items/FluidValve.java

@@ -119,7 +119,7 @@ public void onInteract(@NotNull PlayerInteractEvent event) {
     @Override
     public @NotNull WailaConfig getWaila(@NotNull Player player) {
         return new WailaConfig(getKey(), Map.of(
-                "status", Component.translatable("pylon.pylonbase.message.valve" + (enabled ? "enabled" : "disabled"))
+                "status", Component.translatable("pylon.pylonbase.message.valve." + (enabled ? "enabled" : "disabled"))
         ));
     }
 

src/main/java/io/github/pylonmc/pylon/base/items/fluid/items/PortableFluidTank.java

@@ -100,8 +100,7 @@ public void setAmount(double amount) {
         @Override
         public @NotNull Map<String, ComponentLike> getPlaceholders() {
             return Map.of(
-                    // TODO actual fluid name + translation for 'No fluid'
-                    "fluid", Component.text(getFluid() == null ? "No fluid" : getFluid().getKey().toString()),
+                    "fluid", Component.translatable("pylon.pylonbase.fluid." + (getFluid() == null ? "none" : getFluid().getKey().getKey())),
                     "amount", Component.text(Math.round(getAmount())),
                     "capacity", UnitFormat.MILLIBUCKETS.format(capacity),
                     "min_temperature", UnitFormat.CELSIUS.format(minTemp),
@@ -253,7 +252,6 @@ public void updateFluidDisplayHeight() {
     public @NotNull WailaConfig getWaila(@NotNull Player player) {
         return new WailaConfig(
                 getKey(),
-                // TODO add fluid name once fluids have names
                 Map.of(
                         "amount", Component.text(Math.round(fluidAmount)),
                         "capacity", Component.text(Math.round(capacity))

src/main/resources/lang/en.yml

@@ -447,6 +447,11 @@ item:
       <arrow> <attr>Pump rate:</attr> %water_per_second%
     waila: "Water Pump"
 
+fluid:
+  none: "None"
+  water: "Water"
+  lava: "Lava"
+
 research:
   baking: "<gold>baking"
   better_health: "<green>better health"
@@ -473,6 +478,9 @@ research:
   showing_off: "<rainbow>showing off"
 
 message:
+  fluid_selector:
+    current_fluid: "<white>Current fluid: %fluid%"
+    clear: "<white>Clear"
   hammer_cant_use: "<red>You cannot use this hammer on this block"
   sprinkler_too_close: "<red>You cannot place sprinklers within %radius% blocks of each other"
   gained_research_points: "<green>+%points% research points"
@@ -495,4 +503,4 @@ message:
     not_of_same_type: "<red>Pipes are of different types"
   valve:
     enabled: "enabled"
-    disbled: "disabled"
+    disabled: "disabled"