Dynamic fluid cell view

src/main/java/gregtech/api/items/metaitem/FluidCellModelDispatcher.java

@@ -0,0 +1,35 @@
+package gregtech.api.items.metaitem;
+
+import gregtech.api.items.metaitem.stats.IItemModelDispatcher;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidUtil;
+
+import com.github.bsideup.jabel.Desugar;
+
+@Desugar
+public record FluidCellModelDispatcher(int pixel) implements IItemModelDispatcher {
+
+    @Override
+    public int getModelIndex(ItemStack itemStack, int maxIndex) {
+        var singleStack = itemStack.copy();
+        if (singleStack.getCount() > 1) singleStack.setCount(1);
+
+        var handler = FluidUtil.getFluidHandler(singleStack);
+        if (handler == null) return pixel;
+
+        var tankProps = handler.getTankProperties();
+        if (tankProps.length != 1) return pixel;
+
+        var tankProp = tankProps[0];
+        var fluidStack = tankProp.getContents();
+        if (fluidStack == null) return pixel;
+
+        boolean isGas = fluidStack.getFluid().isGaseous();
+        int amount = fluidStack.amount;
+        int capacity = tankProp.getCapacity();
+
+        int fluidLevel = ((pixel - 1) * amount) / capacity;
+        return isGas ? 2 * (pixel - 1) - fluidLevel : fluidLevel;
+    }
+}

src/main/java/gregtech/api/items/metaitem/stats/IItemModelDispatcher.java

@@ -12,7 +12,8 @@ public interface IItemModelDispatcher extends IItemComponent {
      * The index range will be checked at
      * {@link MetaItem#getModelIndex(ItemStack)}.
      *
-     * @param itemStack The specific item stack.
+     * @param itemStack The specific item stack, which is granted non-empty at
+     *                  {@link MetaItem.MetaValueItem#getModelAmount()}
      * @param maxIndex  The max model index, from
      *                  {@link MetaItem.MetaValueItem#getModelAmount()} - 1.
      * @return The model index for the specific stack, should be ranged between

src/main/java/gregtech/common/items/MetaItem1.java

@@ -3,12 +3,7 @@
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
 import gregtech.api.capability.impl.CommonFluidFilters;
-import gregtech.api.items.metaitem.ElectricStats;
-import gregtech.api.items.metaitem.FilteredFluidStats;
-import gregtech.api.items.metaitem.FoodStats;
-import gregtech.api.items.metaitem.MetaItem;
-import gregtech.api.items.metaitem.MusicDiscStats;
-import gregtech.api.items.metaitem.StandardMetaItem;
+import gregtech.api.items.metaitem.*;
 import gregtech.api.items.metaitem.stats.IItemComponent;
 import gregtech.api.items.metaitem.stats.IItemContainerItemProvider;
 import gregtech.api.items.metaitem.stats.ItemFluidContainer;
@@ -232,54 +227,68 @@ public void registerSubItems() {
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_UNIVERSAL = addItem(79, "fluid_cell.universal")
+                .setModelAmount((10 - 1) * 2)
                 .addComponents(new FilteredFluidStats(1000, 1800, true, false, false, false, true),
-                        new ItemFluidContainer(true))
+                        new ItemFluidContainer(true),
+                        new FluidCellModelDispatcher(10))
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_LARGE_STEEL = addItem(80, "large_fluid_cell.steel")
+                .setModelAmount((14 - 1) * 2)
                 .addComponents(new FilteredFluidStats(8000,
                         Materials.Steel.getProperty(PropertyKey.FLUID_PIPE).getMaxFluidTemperature(), true, false,
                         false, false, true),
-                        new ItemFluidContainer(true))
+                        new ItemFluidContainer(true),
+                        new FluidCellModelDispatcher(14))
                 .setRecyclingData(new RecyclingData(new MaterialStack(Materials.Steel, M * 4))) // ingot * 4
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_LARGE_ALUMINIUM = addItem(81, "large_fluid_cell.aluminium")
+                .setModelAmount((14 - 1) * 2)
                 .addComponents(new FilteredFluidStats(32000,
                         Materials.Aluminium.getProperty(PropertyKey.FLUID_PIPE).getMaxFluidTemperature(), true, false,
                         false, false, true),
-                        new ItemFluidContainer(true))
+                        new ItemFluidContainer(true),
+                        new FluidCellModelDispatcher(14))
                 .setRecyclingData(new RecyclingData(new MaterialStack(Materials.Aluminium, M * 4))) // ingot * 4
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_LARGE_STAINLESS_STEEL = addItem(82, "large_fluid_cell.stainless_steel")
+                .setModelAmount((14 - 1) * 2)
                 .addComponents(new FilteredFluidStats(64000,
                         Materials.StainlessSteel.getProperty(PropertyKey.FLUID_PIPE).getMaxFluidTemperature(), true,
                         true, true, false, true),
-                        new ItemFluidContainer(true))
+                        new ItemFluidContainer(true),
+                        new FluidCellModelDispatcher(14))
                 .setRecyclingData(new RecyclingData(new MaterialStack(Materials.StainlessSteel, M * 6))) // ingot * 6
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_LARGE_TITANIUM = addItem(83, "large_fluid_cell.titanium")
+                .setModelAmount((14 - 1) * 2)
                 .addComponents(new FilteredFluidStats(128000,
                         Materials.Titanium.getProperty(PropertyKey.FLUID_PIPE).getMaxFluidTemperature(), true, true,
                         false, false, true),
-                        new ItemFluidContainer(true))
+                        new ItemFluidContainer(true),
+                        new FluidCellModelDispatcher(14))
                 .setRecyclingData(new RecyclingData(new MaterialStack(Materials.Titanium, M * 6))) // ingot * 6
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_LARGE_TUNGSTEN_STEEL = addItem(84, "large_fluid_cell.tungstensteel")
+                .setModelAmount((14 - 1) * 2)
                 .addComponents(new FilteredFluidStats(512000,
                         Materials.TungstenSteel.getProperty(PropertyKey.FLUID_PIPE).getMaxFluidTemperature(), true,
                         true, false, false, true),
-                        new ItemFluidContainer(true))
+                        new ItemFluidContainer(true),
+                        new FluidCellModelDispatcher(14))
                 .setMaxStackSize(32)
                 .setRecyclingData(new RecyclingData(new MaterialStack(Materials.TungstenSteel, M * 8))) // ingot * 8
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 
         FLUID_CELL_GLASS_VIAL = addItem(85, "fluid_cell.glass_vial")
+                .setModelAmount((11 - 1) * 2)
                 .addComponents(new FilteredFluidStats(1000, 1200, false, true, false, false, true),
-                        new ItemFluidContainer())
+                        new ItemFluidContainer(),
+                        new FluidCellModelDispatcher(11))
                 .setRecyclingData(new RecyclingData(new MaterialStack(Materials.Glass, M / 4))) // small dust
                 .setCreativeTabs(GTCreativeTabs.TAB_GREGTECH_TOOLS);
 

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial.json → src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/1.json

@@ -5,10 +5,10 @@
       "model": "forge:forgebucket",
       "textures": {
         "base": "gregtech:items/metaitems/glass_vial/base",
-        "fluid": "gregtech:items/metaitems/glass_vial/overlay",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/1",
         "cover": "gregtech:items/metaitems/glass_vial/base"
       },
       "transform": "forge:default-item"
     }
   }
-}
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/10.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/10",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/11.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/11",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/12.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/12",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/13.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/13",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/14.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/14",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/15.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/15",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/16.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/16",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/17.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/17",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/18.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/18",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/19.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/19",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/2.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/2",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/20.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/20",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/21.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/21",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/3.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/3",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}

src/main/resources/assets/gregtech/blockstates/metaitems/fluid_cell.glass_vial/4.json

@@ -0,0 +1,14 @@
+{
+  "forge_marker": 1,
+  "variants": {
+    "inventory": {
+      "model": "forge:forgebucket",
+      "textures": {
+        "base": "gregtech:items/metaitems/glass_vial/base",
+        "fluid": "gregtech:items/metaitems/glass_vial/overlay/4",
+        "cover": "gregtech:items/metaitems/glass_vial/base"
+      },
+      "transform": "forge:default-item"
+    }
+  }
+}