Release 3.0

 * Added compatibility for 1.13
 * Allow empty text for items to keep lore and name from items.yml

Author: J0B10

README.md

@@ -8,7 +8,7 @@ For all this you only have to be familliar with BetonQuests events/conditions sy
 Everything can be created by simply creating and modifying config files in YAML.
 
 ## Features 
-* Spigot **1.9**, **1.10**, **1.11** and **1.12** support
+* Spigot **1.9**, **1.10**, **1.11**, **1.12** and **1.13** support
 * Completly **costumizable** guis
 * **Display** or **hide** items in guis based on **conditions**
 * Run **events** when items are clicked, menus are opened or closed 

docs/Menu.md

@@ -88,7 +88,8 @@ Each item has the following settings:
 
 *  `text`: *(list of strings)*  
   In the text section you can specify the text that is displayed if you hover over the item.
-  The lore and the display name of the item specified in `items.yml` will be overwritten by this. 
+  The lore and the display name of the item specified in `items.yml` will be overwritten by this.
+  If no text is specified the items default name and lore from `items.yml` will be kept.
   You can use [formatting codes](https://minecraft.gamepedia.com/Formatting_codes) with `&` and [variables](https://github.com/Co0sh/BetonQuest/wiki/Variables-List)
 
    **Example:**

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.ungefroren</groupId>
     <artifactId>RPGMenu</artifactId>
-    <version>2.1</version>
+    <version>3.0</version>
 
     <repositories>
         <repository>
@@ -26,13 +26,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/de/ungefroren/rpgmenu/MenuItem.java

@@ -106,15 +106,18 @@ protected String of() throws Missing {
             this.item = new Item(itemID, amount);
             // load description
             this.descriptions = new HashMap<>();
-            if (section.isConfigurationSection("text")) {
-                for (String lang : section.getConfigurationSection("text").getKeys(false)) {
-                    this.descriptions.put(lang, new ItemDescription(this.pack, getStringList("text." + lang)));
+            try {
+                if (section.isConfigurationSection("text")) {
+                    for (String lang : section.getConfigurationSection("text").getKeys(false)) {
+                        this.descriptions.put(lang, new ItemDescription(this.pack, getStringList("text." + lang)));
+                    }
+                    if (!this.descriptions.containsKey(Config.getLanguage()))
+                        throw new Missing("text." + Config.getLanguage());
+                } else {
+                    this.descriptions.put(Config.getLanguage(),
+                            new ItemDescription(this.pack, getStringList("text")));
                 }
-                if (!this.descriptions.containsKey(Config.getLanguage()))
-                    throw new Missing("text." + Config.getLanguage());
-            } else {
-                this.descriptions.put(Config.getLanguage(),
-                        new ItemDescription(this.pack, getStringList("text")));
+            } catch (Missing missing) {
             }
             //load events
             this.left_click = new ArrayList<>();
@@ -216,15 +219,17 @@ public ItemStack generateItem(Player player) {
             String lang = BetonQuest.getInstance().getPlayerData(playerId).getLanguage();
             ItemStack item = this.item.generate(playerId);
             ItemMeta meta = item.getItemMeta();
-            ItemDescription description = this.descriptions.get(lang);
-            if (description == null) description = this.descriptions.get(Config.getLanguage());
-            try {
-                meta.setDisplayName(description.getDisplayName(playerId));
-                meta.setLore(description.getLore(playerId));
-                item.setItemMeta(meta);
-            } catch (NullPointerException npe) {
-                Log.error("Couldn't add custom text to §7" + id + "§4: No text for language §7" + Config.getLanguage() + "§4 " +
-                        "specified");
+            if (!descriptions.isEmpty()) {
+                ItemDescription description = this.descriptions.get(lang);
+                if (description == null) description = this.descriptions.get(Config.getLanguage());
+                try {
+                    meta.setDisplayName(description.getDisplayName(playerId));
+                    meta.setLore(description.getLore(playerId));
+                    item.setItemMeta(meta);
+                } catch (NullPointerException npe) {
+                    Log.error("Couldn't add custom text to §7" + id + "§4: No text for language §7" + Config.getLanguage() + "§4 " +
+                            "specified");
+                }
             }
             return item;
         } catch (QuestRuntimeException qre) {

src/main/java/de/ungefroren/rpgmenu/RPGMenu.java

@@ -163,7 +163,7 @@ public void onEnable() {
             new ReloadListener();
         } else {
             //load all data on first tick
-            Bukkit.getScheduler().scheduleSyncDelayedTask(this, () -> reloadData());
+            Bukkit.getScheduler().scheduleSyncDelayedTask(this, this::reloadData);
         }
     }
 

src/main/java/de/ungefroren/rpgmenu/config/SimpleYMLSection.java

@@ -193,15 +193,21 @@ protected <T extends Enum<T>> T getEnum(String key, Class<T> enumType) throws Mi
      */
     protected Material getMaterial(String key) throws Missing, Invalid {
         String s = this.getString(key);
+        if (key.trim().matches("\\d+")) {
+            throw new Invalid(key, "Material numbers can no longer be supported! Please use the names instead.");
+        }
+        Material m;
         try {
-            Material m = Material.getMaterial(Integer.parseInt(s));
-            if (m != null) return m;
-            else throw new Invalid(key);
-        } catch (NumberFormatException e) {
-            Material m = Material.getMaterial(s.toUpperCase().replace(" ", "_"));
-            if (m != null) return m;
-            else throw new Invalid(key, "'" + s + "' isn't a material");
+            m  = Material.matchMaterial(s.replace(" ", "_"));
+            if (m == null) {
+                m = Material.matchMaterial(s.replace(" ", "_"), true);
+            }
+        } catch (LinkageError error) {
+            //pre 1.13
+            m = Material.getMaterial(s.toUpperCase().replace(" ", "_"));
         }
+        if (m != null) return m;
+        else throw new Invalid(key, "'" + s + "' isn't a material");
     }
 
     /**

src/main/resources/plugin.yml

@@ -1,6 +1,7 @@
 # RPGMenu plugin.yml - See https://bukkit.gamepedia.com/Plugin_YAML/de for more information
 name: RPGMenu
-version: 2.1
+version: 3.0
+api-version: 1.13
 description: 'A addon for BetonQuest which allows you to simply create your own guis by using events and items from BetonQuest.'
 author: ungefroren
 website: https://github.com/joblo2213/RPGMenu

version.txt

@@ -1 +1 @@
-2.1
+3.0