Fixed items with custom names not working with 'gui.item-name' langua…

…ge entry.
BenWoodworth · Apr 23, 2016 · d617c09 · d617c09
1 parent 201ed6a
commit d617c09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/co/kepler/fastcraftplus/config/LanguageConfig.java b/src/main/java/co/kepler/fastcraftplus/config/LanguageConfig.java
@@ -180,7 +180,8 @@ public String gui_title() {
     }
 
     public String gui_itemName(ItemStack item) {
-        return getNullable("gui.item-name", "name", BukkitUtil.getItemName(item));
+        String name = getNullable("gui.item-name", "name", BukkitUtil.getItemName(item));
+        return name != null ? name : item.getItemMeta().getDisplayName();
     }
 
     public List<String> gui_hashcode(FastRecipe recipe) {

diff --git a/src/main/java/co/kepler/fastcraftplus/craftgui/GUIButtonRecipe.java b/src/main/java/co/kepler/fastcraftplus/craftgui/GUIButtonRecipe.java
@@ -51,9 +51,7 @@ public ItemStack getItem() {
         Map<Ingredient, Integer> ingredients = recipe.getIngredients();
 
         // Set the display name of the item
-        if (!meta.hasDisplayName()) {
-            meta.setDisplayName(lang.gui_itemName(item));
-        }
+        meta.setDisplayName(lang.gui_itemName(item));
 
         // Add ingredients and amounts to the lore
         lore.addFirst(lang.gui_ingredients_label());