Merge pull request #226 from DoKM/master

Pre31 update

2 files changed, 449 insertions, 443 deletions

diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.png b/src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.png
deleted file mode 100644
index d941fa6e..00000000
--- a/src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.png
+++ /dev/null
diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/presets.json b/src/main/resources/assets/notenoughupdates/invbuttons/presets.json
index 7692fc07..4184e6d4 100644
--- a/src/main/resources/assets/notenoughupdates/invbuttons/presets.json
+++ b/src/main/resources/assets/notenoughupdates/invbuttons/presets.json
@@ -2278,452 +2278,458 @@
          "anchorRight":false,
          "anchorBottom":false,
          "backgroundIndex":0,
-         "command":"warp dungeon_hub",
-         "icon":"skull:9b56895b9659896ad647f58599238af532d46db9c1b0389b8bbeb70999dab33d"
-      },
-      {
-         "x":108,
-         "y":63,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"reparty",
-         "icon":"COMMAND"
-      },
-      {
-         "x":129,
-         "y":63,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"/p FragRunBot azael_mew azael_mewh",
-         "icon":"GIANT_FRAGMENT_DIAMOND"
-      },
-      {
-         "x":150,
-         "y":63,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"pets",
-         "icon":"extra:pet_gold"
-      },
-      {
-         "x":87,
-         "y":5,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":108,
-         "y":5,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":129,
-         "y":5,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":150,
-         "y":5,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":87,
-         "y":25,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":105,
-         "y":25,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":87,
-         "y":43,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":105,
-         "y":43,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":143,
-         "y":35,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":60,
-         "y":8,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":2,
-         "command":"/wardrobe",
-         "icon":"extra:baubles_gold"
-      },
-      {
-         "x":60,
-         "y":60,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":26,
-         "y":8,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":26,
-         "y":60,
-         "playerInvOnly":true,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":22,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":42,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":62,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":-84,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":-64,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":true,
-         "backgroundIndex":0,
          "command":"",
          "icon":""
       },
       {
-         "x":2,
-         "y":-44,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":2,
-         "y":-24,
-         "playerInvOnly":false,
-         "anchorRight":true,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":4,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":25,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":46,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":67,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":88,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":109,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":130,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":151,
-         "y":-19,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":-19,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"joindungeon catacombs 1",
-         "icon":"GOLD_BONZO_HEAD"
-      },
-      {
-         "x":-19,
-         "y":22,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"joindungeon catacombs 2",
-         "icon":"GOLD_SCARF_HEAD"
-      },
-      {
-         "x":-19,
-         "y":42,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"joindungeon catacombs 3",
-         "icon":"GOLD_PROFESSOR_HEAD"
-      },
-      {
-         "x":-19,
-         "y":62,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":false,
-         "backgroundIndex":0,
-         "command":"joindungeon catacombs 4",
-         "icon":"GOLD_THORN_HEAD"
-      },
-      {
-         "x":-19,
-         "y":-84,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":"joindungeon catacombs 5",
-         "icon":"GOLD_LIVID_HEAD"
-      },
-      {
-         "x":-19,
-         "y":-64,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":"/joindungeon catacombs 6",
-         "icon":"GOLD_SADAN_HEAD"
-      },
-      {
-         "x":-19,
-         "y":-44,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":"joindungeons catacombs 7",
-         "icon":"GOLD_NECRON_HEAD"
-      },
-      {
-         "x":-19,
-         "y":-24,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":4,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":25,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":46,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":67,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":88,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":109,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":130,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
-      },
-      {
-         "x":151,
-         "y":2,
-         "playerInvOnly":false,
-         "anchorRight":false,
-         "anchorBottom":true,
-         "backgroundIndex":0,
-         "command":""
+        "x": 108,
+        "y": 63,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "warp dungeon_hub",
+        "icon": "skull:9b56895b9659896ad647f58599238af532d46db9c1b0389b8bbeb70999dab33d"
+      },
+      {
+        "x": 129,
+        "y": 63,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "reparty",
+        "icon": "COMMAND"
+      },
+      {
+        "x": 150,
+        "y": 63,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "pets",
+        "icon": "extra:pet_gold"
+      },
+      {
+        "x": 87,
+        "y": 5,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 108,
+        "y": 5,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 129,
+        "y": 5,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 150,
+        "y": 5,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 87,
+        "y": 25,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 105,
+        "y": 25,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 87,
+        "y": 43,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 105,
+        "y": 43,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 143,
+        "y": 35,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 60,
+        "y": 8,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 2,
+        "command": "/wardrobe",
+        "icon": "extra:baubles_gold"
+      },
+      {
+        "x": 60,
+        "y": 60,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 26,
+        "y": 8,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 26,
+        "y": 60,
+        "playerInvOnly": true,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": 22,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": 42,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": 62,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": -84,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": -64,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": "",
+        "icon": ""
+      },
+      {
+        "x": 2,
+        "y": -44,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 2,
+        "y": -24,
+        "playerInvOnly": false,
+        "anchorRight": true,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 4,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon master_catacombs 1",
+        "icon": "DIAMOND_BONZO_HEAD"
+      },
+      {
+        "x": 25,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon master_catacombs 2",
+        "icon": "DIAMOND_SCARF_HEAD"
+      },
+      {
+        "x": 46,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon master_catacombs 3",
+        "icon": "DIAMOND_PROFESSOR_HEAD"
+      },
+      {
+        "x": 67,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon master_catacombs 4",
+        "icon": "DIAMOND_THORN_HEAD"
+      },
+      {
+        "x": 88,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon master_catacombs 5",
+        "icon": "DIAMOND_LIVID_HEAD"
+      },
+      {
+        "x": 109,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon master_catacombs 6",
+        "icon": "DIAMOND_SADAN_HEAD"
+      },
+      {
+        "x": 130,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 151,
+        "y": -19,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": -19,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon catacombs 1",
+        "icon": "GOLD_BONZO_HEAD"
+      },
+      {
+        "x": -19,
+        "y": 22,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon catacombs 2",
+        "icon": "GOLD_SCARF_HEAD"
+      },
+      {
+        "x": -19,
+        "y": 42,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon catacombs 3",
+        "icon": "GOLD_PROFESSOR_HEAD"
+      },
+      {
+        "x": -19,
+        "y": 62,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": false,
+        "backgroundIndex": 0,
+        "command": "joindungeon catacombs 4",
+        "icon": "GOLD_THORN_HEAD"
+      },
+      {
+        "x": -19,
+        "y": -84,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": "joindungeon catacombs 5",
+        "icon": "GOLD_LIVID_HEAD"
+      },
+      {
+        "x": -19,
+        "y": -64,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": "/joindungeon catacombs 6",
+        "icon": "GOLD_SADAN_HEAD"
+      },
+      {
+        "x": -19,
+        "y": -44,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": "joindungeon catacombs 7",
+        "icon": "GOLD_NECRON_HEAD"
+      },
+      {
+        "x": -19,
+        "y": -24,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 4,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 25,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 46,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 67,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 88,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 109,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 130,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
+      },
+      {
+        "x": 151,
+        "y": 2,
+        "playerInvOnly": false,
+        "anchorRight": false,
+        "anchorBottom": true,
+        "backgroundIndex": 0,
+        "command": ""
       }
    ]
-}
\ No newline at end of file
+}