From 3c2e3b674458430094ccafd942612771df890c26 Mon Sep 17 00:00:00 2001
From: syeyoung <cyong06@naver.com>
Date: Sat, 6 Feb 2021 15:06:32 +0900
Subject: reparty

---
 .../kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java    | 6 +++++-
 src/main/java/kr/syeyoung/dungeonsguide/e.java                      | 4 ----
 .../java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main/java/kr')

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
index 2a12c3a1..77a337a7 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
@@ -32,7 +32,6 @@ public class CommandDungeonsGuide extends CommandBase {
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
         if (args.length == 0) {
-            // open config
             openConfig = true;
         } else if (args[0].equalsIgnoreCase("saverooms")) {
             DungeonRoomInfoRegistry.saveAll(e.getDungeonsGuide().getConfigDir());
@@ -84,6 +83,10 @@ public class CommandDungeonsGuide extends CommandBase {
         } else if (args[0].equalsIgnoreCase("brand")) {
             String serverBrand = Minecraft.getMinecraft().thePlayer.getClientBrand();
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e"+serverBrand));
+        } else if (args[0].equalsIgnoreCase("reparty")) {
+            e.getDungeonsGuide().getCommandReparty().requestReparty();
+        } else if (args[0].equalsIgnoreCase("gui")) {
+            openConfig = true;
         } else {
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg §7-§fOpens configuration gui"));
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg gui §7-§fOpens configuration gui"));
@@ -92,6 +95,7 @@ public class CommandDungeonsGuide extends CommandBase {
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg loadrooms §7-§f Reloads dungeon roomdata."));
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg reloadah §7-§f Reloads price data from server."));
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg brand §7-§f View server brand."));
+            sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg reparty §7-§f Reparty."));
         }
     }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/e.java b/src/main/java/kr/syeyoung/dungeonsguide/e.java
index 3666b4da..70d7310f 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/e.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/e.java
@@ -62,10 +62,6 @@ public class e implements c {
         MinecraftForge.EVENT_BUS.register(commandDungeonsGuide);
 
         commandReparty = new CommandReparty();
-        if(!ClientCommandHandler.instance.getCommands().containsKey("rp")) {
-            ((Set<ICommand>) ObfuscationReflectionHelper.getPrivateValue(ClientCommandHandler.class, ClientCommandHandler.instance, "CommandSet")).add(commandReparty);
-            ((Map<String, ICommand>)ObfuscationReflectionHelper.getPrivateValue(ClientCommandHandler.class, ClientCommandHandler.instance, "CommandMap")).put("rp", commandReparty);
-        }
         if (FeatureRegistry.ETC_REMOVE_REPARTY.isEnabled())
             ClientCommandHandler.instance.registerCommand(commandReparty);
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
index 3db76f1d..8220bb19 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
@@ -60,7 +60,7 @@ public class FeatureRegistry {
     public static final FeatureTooltipDungeonStat ETC_DUNGEONSTAT = register(new FeatureTooltipDungeonStat());
     public static final FeatureTooltipPrice ETC_PRICE = register(new FeatureTooltipPrice());
     public static final FeatureCooldownCounter ETC_COOLDOWN =  register(new FeatureCooldownCounter());
-    public static final SimpleFeature ETC_REMOVE_REPARTY =  register(new SimpleFeature("ETC", "Remove Reparty Command From DG", "/rp will still work, Auto reparty will still work\nRequires Restart to get applied", "qol.noreparty"));
+    public static final SimpleFeature ETC_REMOVE_REPARTY =  register(new SimpleFeature("ETC", "Remove Reparty Command From DG", "/dg reparty will still work, Auto reparty will still work\nRequires Restart to get applied", "qol.noreparty"));
 
     public static final SimpleFeature FIX_SPIRIT_BOOTS = register(new SimpleFeature("fixes", "Spirit Boots Fixer", "Fix Spirit boots messing up with inventory", "fixes.spirit", true));
     public static final FeatureDisableMessage FIX_MESSAGES = register(new FeatureDisableMessage());
-- 
cgit