Fix Sonic Generator

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/custommodels/GUISonicGenerator.java

@@ -108,7 +108,7 @@ public Material getMaterial() {
 
     public String getName() {
         String s = toString();
-        return TARDISStringUtils.capitalise(s);
+        return this == BIO_SCANNER_UPGRADE ? "Bio-scanner Upgrade" : TARDISStringUtils.capitalise(s);
     }
 
     public String getLore() {

src/main/java/me/eccentric_nz/TARDIS/custommodels/keys/SonicVariant.java

@@ -78,4 +78,13 @@ public NamespacedKey getKey() {
     public List<Float> getFloats() {
         return floats;
     }
+
+    public static SonicVariant getByFloat(Float f) {
+        for (SonicVariant variant : values()) {
+            if (!variant.getFloats().isEmpty() && f.equals(variant.getFloats().getFirst())) {
+                return variant;
+            }
+        }
+        return ELEVENTH;
+    }
 }

src/main/java/me/eccentric_nz/TARDIS/sonic/TARDISSonicGeneratorMenuListener.java

@@ -202,9 +202,7 @@ public void onGeneratorMenuClick(InventoryClickEvent event) {
                     generate(p, sonic, getCost(view));
                 }
             }
-            case 53 ->
-                // close
-                    close(p);
+            case 53 -> close(p); // close
             default -> {
             }
         }
@@ -217,7 +215,10 @@ private void save(Player p, ItemStack is, boolean close) {
         where.put("uuid", p.getUniqueId().toString());
         where.put("activated", 1);
         ItemMeta im = is.getItemMeta();
-        String split = im.getItemModel().getKey().replace("sonic/", "");
+        CustomModelDataComponent component = im.getCustomModelDataComponent();
+        List<Float> floats = component.getFloats();
+        Float model = floats.getFirst();
+        String split = SonicVariant.getByFloat(model).toString().toLowerCase(Locale.ROOT);
         set.put("model", split);
         if (im.hasLore()) {
             List<Component> lore = im.lore();

todo.md

@@ -2,7 +2,7 @@
 
 | Priority | Feature                                                                                                                                                                                                                    | Link |
 |----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|
-| ![Static Badge](https://img.shields.io/badge/WIP-f90?style=flat-square) | **Update to 1.21.10**<br/>- Update resource pack - add WIDE console template icon<br/>- Use new Mannequin api?<br/>- Add new blocks to appropriate rooms e.g. firefly bush to Mangrove, dry grass to Iistabul?<br/>- Related to above - [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) Room updates | [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) |
+| ![Static Badge](https://img.shields.io/badge/WIP-f90?style=flat-square) | **Update to 1.21.10**<br/>- Update resource pack - fix sonic generator buttons<br/>- Use new Mannequin api?<br/>- Add new blocks to appropriate rooms e.g. firefly bush to Mangrove, dry grass to Iistabul?<br/>- Related to above - [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) Room updates | [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) |
 | ![Static Badge](https://img.shields.io/badge/WIP-f90?style=flat-square) | **Fix bugs**<br/>!                                                                                                                                                                                                         | - |
 | ![Static Badge](https://img.shields.io/badge/1-f00?style=flat-square) | **Time Rotors and 3D Console Improvements**<br/>- Implement custom modelled consoles<br/>- Rotor/Console menu GUI<br/>- Change rotor placement in item frames<br/>- Additional models for cloister and off states          | [#916](https://github.com/eccentricdevotion/TARDIS/issues/916) |
 | ![Static Badge](https://img.shields.io/badge/1-f00?style=flat-square) | **Modelled controls**<br/>- Console lamp done                                                                                                                                                                              | [#836](https://github.com/eccentricdevotion/TARDIS/issues/836) |