test

Felitendo · Apr 1, 2024 · ba31d2a · ba31d2a
1 parent 9f58564
commit ba31d2a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 31 deletions.
diff --git a/core/src/main/java/de/felitendo/felotools/core/commands/PvP.java b/core/src/main/java/de/felitendo/felotools/core/commands/PvP.java
@@ -24,7 +24,10 @@ public PvP(FeloToolsAddon addon) {
   public boolean execute(String prefix, String[] arguments) {
     if (prefix.equalsIgnoreCase("ftpvp")) {
       {
-        sendMessage();
+        if (arguments.length == 0) {
+          sendMessage();
+        }
+
       }
       return true;
     }

diff --git a/core/src/main/java/de/felitendo/felotools/core/commands/subcommands/PvP_new.java b/core/src/main/java/de/felitendo/felotools/core/commands/subcommands/PvP_new.java
@@ -14,27 +14,30 @@ public class PvP_new extends SubCommand {
 
   @Override
   public boolean execute(String prefix, String[] arguments) {
-    sendMessage();
-    labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldBlockBuild().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldBow().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldCreativeLayout().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldDamageColor().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldFishingRod().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldFood().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldHeadRotation().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldHeart().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldHitbox().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldItemPosture().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldRange().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldSlowdown().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldSneaking().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldSurvivalLayout().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
-    labyAPI().config().multiplayer().classicPvP().oldSword().set(false);
-    labyAPI().config().multiplayer().classicPvP().potionFix().set(false);
-    labyAPI().config().multiplayer().classicPvP().shouldRemoveRecipeBook().set(false);
-    return false;
+    if (arguments.length == 2) {
+      labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldBlockBuild().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldBow().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldCreativeLayout().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldDamageColor().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldFishingRod().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldFood().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldHeadRotation().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldHeart().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldHitbox().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldItemPosture().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldRange().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldSlowdown().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldSneaking().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldSurvivalLayout().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldBackwards().set(false);
+      labyAPI().config().multiplayer().classicPvP().oldSword().set(false);
+      labyAPI().config().multiplayer().classicPvP().potionFix().set(false);
+      labyAPI().config().multiplayer().classicPvP().shouldRemoveRecipeBook().set(false);
+      sendMessage();
+      return false;
+    }
+    return true;
   }
 
   public void sendMessage() {

diff --git a/core/src/main/resources/assets/felotools/i18n/de_de.json b/core/src/main/resources/assets/felotools/i18n/de_de.json
@@ -3,24 +3,24 @@
     "settings": {
       "name": "FeloTools",
       "enabled": {
-        "name": "Aktiviert"
+        "name": "Activated"
       },
       "openNameTags": {
-        "name": "Shortcuts bearbeiten"
+        "name": "Edit Shortcuts"
       }
     },
     "gui": {
       "manage": {
-        "add": "Neuen Shortcut hinzufügen",
+        "add": "Add a new Shortcut",
         "name": "Shortcut",
         "custom": {
           "name": "Server IP"
         },
         "enabled": {
-          "name": "Aktiviert"
+          "name": "Disabled"
         },
         "remove": {
-          "title": "Möchtest du diesen Eintrag wirklich löschen?"
+          "title": "Do you really want to delete this Title?"
         }
       },
       "navigation": {
@@ -32,18 +32,24 @@
         "syntax": "§cSyntax: %s"
       },
       "help": {
-        "msg1": "§a--------- §6Hilfe §a---------",
-        "msg2": "§6/fthelp §7» §aSendet diese Hilfe-Nachricht.",
+        "msg1": "§a--------- §6Help §a---------",
+        "msg2": "§6/fthelp §7» §aSends this Help Message.",
         "msg3": "§a-----------------------"
       },
+      "pvp": {
+        "msg1": "§a--------- §6Help §a---------",
+        "msg2": "§6/ftpvp old §7» §aSets PvP Mode to 'old'. §e(1.8.9)",
+        "msg3": "§6/ftpvp new §7» §aSets PvP Mode to 'new'. §e(1.20.4)",
+        "msg4": "§a-----------------------"
+      },
       "pvp_new": {
         "msg1": "§a--------- §6PvP Modus §a---------",
-        "msg2": "§6PvP Modus wurde auf 'new' gesetzt! §e(1.20.4)",
+        "msg2": "§6PvP Mode was set to 'new'! §e(1.20.4)",
         "msg3": "§a-----------------------"
       },
       "pvp_old": {
         "msg1": "§a--------- §6PvP Modus §a---------",
-        "msg2": "§6PvP Modus wurde auf 'old' gesetzt! §e(1.8.9)",
+        "msg2": "§6PvP Mode was set to 'old'! §e(1.8.9)",
         "msg3": "§a-----------------------"
       }
     }