6.3.0

Author: TroDerp

build.gradle

@@ -18,7 +18,7 @@ compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
 
 group = "me.rosillogames"
-version = "6.2.3"
+version = "6.3.0"
 description = "EggWars Remastered"
 
 repositories {

src/main/java/me/rosillogames/eggwars/arena/Arena.java

@@ -228,7 +228,7 @@ public void loadShop()
             try
             {
                 this.specificShop = EggWars.getTradingManager().loadSpecialCategory(this.arenaFolder, this.itemType);
-                this.specificShop.buildMenu();
+                this.specificShop.buildMenu();//Encapsulated null exception
             }
             catch (Exception ex)
             {

src/main/java/me/rosillogames/eggwars/arena/SetupGUI.java

@@ -104,7 +104,7 @@ public SetupGUI(Arena arenaIn)
                 if (team == null)
                 {
                     todoLore.append(TranslationUtils.getMessage("setup.gui.teams.team.todo.create", player));
-                    clickLore = TranslationUtils.getMessage("setup.gui.teams.team.click.uncreated", player);
+                    clickLore = TranslationUtils.getMessage("setup.gui.teams.team.click.create", player);
                 }
                 else
                 {
@@ -139,7 +139,7 @@ public SetupGUI(Arena arenaIn)
                         todoLore.append(TranslationUtils.getMessage("setup.gui.teams.team.todo.done", player));
                     }
 
-                    clickLore = TranslationUtils.getMessage("setup.gui.teams.team.click.created", player);
+                    clickLore = TranslationUtils.getMessage("setup.gui.teams.team.click.manage", player);
                 }
 
                 TranslatableItem.setLore(stack, TranslationUtils.getMessage("setup.gui.teams.team.item_lore", player, todoLore.toString(), clickLore));

src/main/java/me/rosillogames/eggwars/managers/TradingManager.java

@@ -141,9 +141,15 @@ public void loadTrades()
     public Category loadSpecialCategory(File folder, ItemType type) throws IOException
     {
         BufferedReader buffer = Files.newBufferedReader((new File(folder, SPEC_TRADES_FILE)).toPath());
-        JsonObject shopJson = GsonHelper.getAsJsonObject(GsonHelper.convertToJsonObject(GsonHelper.parse(buffer), "special_category"), "tiers");
-        JsonObject tierJson = GsonHelper.getAsJsonObject(shopJson, type.toString());
-        Category category = this.loadCategory("special", tierJson);
+        JsonObject specCategJson = GsonHelper.convertToJsonObject(GsonHelper.parse(buffer), "special_category");
+        Category category = null;
+
+        if (isConfigCompatible(specCategJson, SPEC_TRADES_FILE))
+        {
+            JsonObject tierJson = GsonHelper.getAsJsonObject(GsonHelper.getAsJsonObject(specCategJson, "category_tiers"), type.toString());
+            category = this.loadCategory("special", tierJson);
+        }
+
         buffer.close();
         return category;//Error loading special shop category for arena \"
     }

src/main/resources/custom/trades_specific.json

@@ -1,24 +1,31 @@
 {
-  "translation_key": "shop.special",
-  "display_item": {
-    "id": "minecraft:nether_star",
-    "Count": 1
-  },
-  "types": {
-    "default": {
-      "menu_size": "normal"
-    },
+  "category_tiers": {
     "hardcore": {
-      "offers": [
-      ]
+      "translation_key": "shop.special",
+      "display_item": {
+        "id": "minecraft:nether_star",
+        "count": 1
+      },
+      "menu_size": "normal",
+      "offers": {}
     },
     "normal": {
-      "offers": [
-      ]
+      "translation_key": "shop.special",
+      "display_item": {
+        "id": "minecraft:nether_star",
+        "count": 1
+      },
+      "menu_size": "normal",
+      "offers": {}
     },
     "overpowered": {
-      "offers": [
-      ]
+      "translation_key": "shop.special",
+      "display_item": {
+        "id": "minecraft:nether_star",
+        "count": 1
+      },
+      "menu_size": "normal",
+      "offers": {}
     } 
   }
 }

src/main/resources/langs/en_us.json

@@ -226,8 +226,8 @@
   "setup.gui.teams.team.todo.cages": "\n&6 - Add cages",
   "setup.gui.teams.team.todo.respawn": "\n&6 - Set respawn",
   "setup.gui.teams.team.todo.egg": "\n&6 - Set egg",
-  "setup.gui.teams.team.click.created": "&3Click to view settings\n&4Shift click to remove this team",
-  "setup.gui.teams.team.click.uncreated": "&6Click to create this team",
+  "setup.gui.teams.team.click.manage": "&3Click to view settings\n&4Shift click to remove this team",
+  "setup.gui.teams.team.click.create": "&6Click to create this team",
   "setup.gui.team.title": "{0}&r's settings",
   "setup.gui.team.villager.item_name": "&e&lVillager Location",
   "setup.gui.team.villager.item_lore": "{0}",

src/main/resources/langs/es_es.json

@@ -226,8 +226,8 @@
   "setup.gui.teams.team.todo.cages": "\n&6 - Añadir cajas",
   "setup.gui.teams.team.todo.respawn": "\n&6 - Establecer punto de reaparición",
   "setup.gui.teams.team.todo.egg": "\n&6 - Establecer huevo",
-  "setup.gui.teams.team.click.created": "&3Haz clic para ver ajustes\n&4Haz clic máyus para eliminar este equipo",
-  "setup.gui.teams.team.click.uncreated": "&6Haz clic para crear este equipo",
+  "setup.gui.teams.team.click.manage": "&3Haz clic para ver ajustes\n&4Haz clic máyus para eliminar este equipo",
+  "setup.gui.teams.team.click.create": "&6Haz clic para crear este equipo",
   "setup.gui.team.title": "&rAjustes del equipo {0}",
   "setup.gui.team.villager.item_name": "&e&lLugar del Aldeano",
   "setup.gui.team.villager.item_lore": "{0}",

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 main: me.rosillogames.eggwars.EggWars
 name: EggWars
-version: "6.2.3"
+version: "6.3.0"
 description: Play the EggWars game!
 api-version: 1.13
 load: POSTWORLD