Fix non-block items in stonecutters

Camotoy · Camotoy · commit 663e3af7c8f1 · 2024-07-26T17:22:10.000-04:00
Fixes #4845
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/BlockItem.java b/core/src/main/java/org/geysermc/geyser/item/type/BlockItem.java
@@ -28,6 +28,9 @@
 import org.geysermc.geyser.level.block.type.Block;
 
 public class BlockItem extends Item {
+    // If item is instanceof ItemNameBlockItem
+    private final boolean treatLikeBlock;
+
     public BlockItem(Builder builder, Block block, Block... otherBlocks) {
         super(block.javaIdentifier().value(), builder);
 
@@ -36,6 +39,7 @@ public BlockItem(Builder builder, Block block, Block... otherBlocks) {
         for (Block otherBlock : otherBlocks) {
             registerBlock(otherBlock, this);
         }
+        treatLikeBlock = true;
     }
 
     // Use this constructor if the item name is not the same as its primary block
@@ -46,5 +50,14 @@ public BlockItem(String javaIdentifier, Builder builder, Block block, Block... o
         for (Block otherBlock : otherBlocks) {
             registerBlock(otherBlock, this);
         }
+        treatLikeBlock = false;
+    }
+
+    @Override
+    public String translationKey() {
+        if (!treatLikeBlock) {
+            return super.translationKey();
+        }
+        return "block." + this.javaIdentifier.namespace() + "." + this.javaIdentifier.value();
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/Item.java b/core/src/main/java/org/geysermc/geyser/item/type/Item.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.item.type;
 
+import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -59,7 +60,7 @@
 
 public class Item {
     private static final Map<Block, Item> BLOCK_TO_ITEM = new HashMap<>();
-    private final String javaIdentifier;
+    protected final Key javaIdentifier;
     private int javaId = -1;
     private final int stackSize;
     private final int attackDamage;
@@ -68,7 +69,7 @@ public class Item {
     private final boolean glint;
 
     public Item(String javaIdentifier, Builder builder) {
-        this.javaIdentifier = MinecraftKey.key(javaIdentifier).asString().intern();
+        this.javaIdentifier = MinecraftKey.key(javaIdentifier);
         this.stackSize = builder.stackSize;
         this.maxDamage = builder.maxDamage;
         this.attackDamage = builder.attackDamage;
@@ -77,7 +78,7 @@ public Item(String javaIdentifier, Builder builder) {
     }
 
     public String javaIdentifier() {
-        return javaIdentifier;
+        return javaIdentifier.asString();
     }
 
     public int javaId() {
@@ -108,6 +109,10 @@ public boolean isValidRepairItem(Item other) {
         return false;
     }
 
+    public String translationKey() {
+        return "item." + javaIdentifier.namespace() + "." + javaIdentifier.value();
+    }
+
     /* Translation methods to Bedrock and back */
 
     public ItemData.Builder translateToBedrock(int count, DataComponents components, ItemMapping mapping, ItemMappings mappings) {
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
@@ -253,7 +253,8 @@ public void translate(GeyserSession session, ClientboundUpdateRecipesPacket pack
             // We can get the correct order for button pressing
             data.getValue().sort(Comparator.comparing((stoneCuttingRecipeData ->
                     Registries.JAVA_ITEMS.get().get(stoneCuttingRecipeData.getResult().getId())
-                            .javaIdentifier())));
+                        // See RecipeManager#getRecipesFor as of 1.21
+                            .translationKey())));
 
             // Now that it's sorted, let's translate these recipes
             int buttonId = 0;
diff --git a/core/src/main/java/org/geysermc/geyser/util/StatisticsUtils.java b/core/src/main/java/org/geysermc/geyser/util/StatisticsUtils.java
@@ -107,7 +107,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {
 
                                     for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {
                                         if (entry.getKey() instanceof BreakItemStatistic statistic) {
-                                            String item = itemRegistry.get(statistic.getId()).javaIdentifier();
+                                            Item item = itemRegistry.get(statistic.getId());
                                             content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());
                                         }
                                     }
@@ -117,7 +117,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {
 
                                     for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {
                                         if (entry.getKey() instanceof CraftItemStatistic statistic) {
-                                            String item = itemRegistry.get(statistic.getId()).javaIdentifier();
+                                            Item item = itemRegistry.get(statistic.getId());
                                             content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());
                                         }
                                     }
@@ -127,7 +127,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {
 
                                     for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {
                                         if (entry.getKey() instanceof UseItemStatistic statistic) {
-                                            String item = itemRegistry.get(statistic.getId()).javaIdentifier();
+                                            Item item = itemRegistry.get(statistic.getId());
                                             content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());
                                         }
                                     }
@@ -137,7 +137,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {
 
                                     for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {
                                         if (entry.getKey() instanceof PickupItemStatistic statistic) {
-                                            String item = itemRegistry.get(statistic.getId()).javaIdentifier();
+                                            Item item = itemRegistry.get(statistic.getId());
                                             content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());
                                         }
                                     }
@@ -147,7 +147,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {
 
                                     for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {
                                         if (entry.getKey() instanceof DropItemStatistic statistic) {
-                                            String item = itemRegistry.get(statistic.getId()).javaIdentifier();
+                                            Item item = itemRegistry.get(statistic.getId());
                                             content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());
                                         }
                                     }
@@ -208,14 +208,8 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {
      * @param language the language to search in
      * @return the full name of the item
      */
-    private static String getItemTranslateKey(String item, String language) {
-        item = item.replace("minecraft:", "item.minecraft.");
-        String translatedItem = MinecraftLocale.getLocaleString(item, language);
-        if (translatedItem.equals(item)) {
-            // Didn't translate; must be a block
-            translatedItem = MinecraftLocale.getLocaleString(item.replace("item.", "block."), language);
-        }
-        return translatedItem;
+    private static String getItemTranslateKey(Item item, String language) {
+        return MinecraftLocale.getLocaleString(item.translationKey(), language);
     }
 
     private static String translate(String keys, String locale) {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@`
`28`	`28`	`import org.geysermc.geyser.level.block.type.Block;`
`29`	`29`
`30`	`30`	`public class BlockItem extends Item {`
	`31`	`+ // If item is instanceof ItemNameBlockItem`
	`32`	`+ private final boolean treatLikeBlock;`
	`33`	`+`
`31`	`34`	`public BlockItem(Builder builder, Block block, Block... otherBlocks) {`
`32`	`35`	`super(block.javaIdentifier().value(), builder);`
`33`	`36`
`@@ -36,6 +39,7 @@ public BlockItem(Builder builder, Block block, Block... otherBlocks) {`
`36`	`39`	`for (Block otherBlock : otherBlocks) {`
`37`	`40`	`registerBlock(otherBlock, this);`
`38`	`41`	`}`
	`42`	`+ treatLikeBlock = true;`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`// Use this constructor if the item name is not the same as its primary block`
`@@ -46,5 +50,14 @@ public BlockItem(String javaIdentifier, Builder builder, Block block, Block... o`
`46`	`50`	`for (Block otherBlock : otherBlocks) {`
`47`	`51`	`registerBlock(otherBlock, this);`
`48`	`52`	`}`
	`53`	`+ treatLikeBlock = false;`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ @Override`
	`57`	`+ public String translationKey() {`
	`58`	`+ if (!treatLikeBlock) {`
	`59`	`+ return super.translationKey();`
	`60`	`+ }`
	`61`	`+ return "block." + this.javaIdentifier.namespace() + "." + this.javaIdentifier.value();`
`49`	`62`	`}`
`50`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {`
`107`	`107`
`108`	`108`	`for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {`
`109`	`109`	`if (entry.getKey() instanceof BreakItemStatistic statistic) {`
`110`		`- String item = itemRegistry.get(statistic.getId()).javaIdentifier();`
	`110`	`+ Item item = itemRegistry.get(statistic.getId());`
`111`	`111`	`content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -117,7 +117,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {`
`117`	`117`
`118`	`118`	`for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {`
`119`	`119`	`if (entry.getKey() instanceof CraftItemStatistic statistic) {`
`120`		`- String item = itemRegistry.get(statistic.getId()).javaIdentifier();`
	`120`	`+ Item item = itemRegistry.get(statistic.getId());`
`121`	`121`	`content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());`
`122`	`122`	`}`
`123`	`123`	`}`
`@@ -127,7 +127,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {`
`127`	`127`
`128`	`128`	`for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {`
`129`	`129`	`if (entry.getKey() instanceof UseItemStatistic statistic) {`
`130`		`- String item = itemRegistry.get(statistic.getId()).javaIdentifier();`
	`130`	`+ Item item = itemRegistry.get(statistic.getId());`
`131`	`131`	`content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -137,7 +137,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {`
`137`	`137`
`138`	`138`	`for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {`
`139`	`139`	`if (entry.getKey() instanceof PickupItemStatistic statistic) {`
`140`		`- String item = itemRegistry.get(statistic.getId()).javaIdentifier();`
	`140`	`+ Item item = itemRegistry.get(statistic.getId());`
`141`	`141`	`content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());`
`142`	`142`	`}`
`143`	`143`	`}`
`@@ -147,7 +147,7 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {`
`147`	`147`
`148`	`148`	`for (Object2IntMap.Entry<Statistic> entry : session.getStatistics().object2IntEntrySet()) {`
`149`	`149`	`if (entry.getKey() instanceof DropItemStatistic statistic) {`
`150`		`- String item = itemRegistry.get(statistic.getId()).javaIdentifier();`
	`150`	`+ Item item = itemRegistry.get(statistic.getId());`
`151`	`151`	`content.add(getItemTranslateKey(item, language) + ": " + entry.getIntValue());`
`152`	`152`	`}`
`153`	`153`	`}`
`@@ -208,14 +208,8 @@ public static void buildAndSendStatisticsMenu(GeyserSession session) {`
`208`	`208`	`* @param language the language to search in`
`209`	`209`	`* @return the full name of the item`
`210`	`210`	`*/`
`211`		`- private static String getItemTranslateKey(String item, String language) {`
`212`		`- item = item.replace("minecraft:", "item.minecraft.");`
`213`		`- String translatedItem = MinecraftLocale.getLocaleString(item, language);`
`214`		`- if (translatedItem.equals(item)) {`
`215`		`- // Didn't translate; must be a block`
`216`		`- translatedItem = MinecraftLocale.getLocaleString(item.replace("item.", "block."), language);`
`217`		`- }`
`218`		`- return translatedItem;`
	`211`	`+ private static String getItemTranslateKey(Item item, String language) {`
	`212`	`+ return MinecraftLocale.getLocaleString(item.translationKey(), language);`
`219`	`213`	`}`
`220`	`214`
`221`	`215`	`private static String translate(String keys, String locale) {`