Removing join command and dungeon preset (#800)

3 files changed, 0 insertions, 477 deletions

diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.kt
index 3ee5fdad..1cd9ccdf 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.kt
@@ -35,7 +35,6 @@ class HelpCommand {
         "§6/neusouls {on/off/clear/unclear} §r§7- Shows waypoints to fairy souls.",
         "§6/neubuttons §r§7- Opens a GUI which allows you to customize inventory buttons.",
         "§6/neuec §r§7- Opens the enchant colour GUI.",
-        "§6/join {floor} §r§7- Short Command to join a Dungeon. §lNeed a Party of 5 People§r§7 {4/f7/m5}.",
         "§6/neucosmetics §r§7- Opens the cosmetic GUI.",
         "§6/neurename §r§7- Opens the NEU Item Customizer.",
         "§6/cata §b?{name} §2ⴵ §r§7- Opens the profile viewer's Catacombs page.",
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/DungeonCommands.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/DungeonCommands.kt
index 3b721df5..ac658e14 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/DungeonCommands.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/misc/DungeonCommands.kt
@@ -50,19 +50,6 @@ class DungeonCommands {
                 reply("Deez nuts lmao")
             }
         }.withHelp("Warps to the dungeon nuts")
-        event.command("join") {
-            thenArgument("floor", string()) { floor ->
-                suggestsList((1..7).flatMap { listOf("f$it", "m$it") })
-                thenExecute {
-                    val floor = this[floor]
-                    val prefix = if (floor.startsWith("m")) "master_catacombs" else "catacombs"
-                    val level = floor.lastOrNull()?.digitToIntOrNull()
-                    val cmd = "/joindungeon $prefix ${floor.lastOrNull()}"
-                    reply("Running command: $cmd")
-                    Minecraft.getMinecraft().thePlayer.sendChatMessage(cmd)
-                }
-            }.withHelp("Join a dungeon floor with a party of 5")
-        }
         event.command("neumap") {
             thenLiteral("reset") {
                 thenExecute {
diff --git a/src/main/resources/assets/notenoughupdates/invbuttons/presets.json b/src/main/resources/assets/notenoughupdates/invbuttons/presets.json
index ef7267f1..d3e406e3 100644
--- a/src/main/resources/assets/notenoughupdates/invbuttons/presets.json
+++ b/src/main/resources/assets/notenoughupdates/invbuttons/presets.json
@@ -2273,468 +2273,5 @@
       "backgroundIndex": 0,
       "command": ""
     }
-  ],
-  "Dungeons": [
-    {
-      "x": 87,
-      "y": 63,
-      "playerInvOnly": true,
-      "anchorRight": false,
-      "anchorBottom": false,
-      "backgroundIndex": 0,
-      "command": "",
-      "icon": ""
-    },
-    {
-      "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": "joindungeon master_catacombs 7",
-      "icon": "DIAMOND_NECRON_HEAD"
-    },
-    {
-      "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": ""
-    }
   ]
 }