Merge pull request #14 from Titaniumtown/patch-1

nms repack & remove some commands
YatopiaMC · Apr 21, 2021 · 30ebd61 · 30ebd61
2 parents 049c836 + 7600449
commit 30ebd61
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 109 deletions.
diff --git a/config.json b/config.json
diff --git a/src/main/java/org/yatopiamc/bot/YatopiaBot.java b/src/main/java/org/yatopiamc/bot/YatopiaBot.java
@@ -133,14 +133,10 @@ public void start() throws LoginException, InterruptedException, IOException {
         new CommandJDKSpecific(),
         new CommandDownloadSpecific(),
         new CommandYatopiaSpecific(),
-        new CommandVanilla(),
-        new CommandUpstream(),
         new CommandMappingSpecific(this),
         new CommandPing(),
         new CommandShutdown("252049584598024192"),
-        new CommandShitspiller(),
         new CommandVroomVroom(),
-        new CommandTias(),
         new CommandGiveRole());
 
     executor.scheduleAtFixedRate(

diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandDownloadSpecific.java b/src/main/java/org/yatopiamc/bot/commands/CommandDownloadSpecific.java
@@ -12,7 +12,7 @@
 
 @CommandAliases("download|1.15.2|1.16.1|1.16.2|1.16.3|1.16.4|1.16.5")
 @CommandDescription("Download specific commands.")
-@CommandUsage("download|?1.15.2|?1.16.1|?1.16.2|?1.16.3|?1.16.4|?1.16.5")
+@CommandUsage("?download|?1.15.2|?1.16.1|?1.16.2|?1.16.3|?1.16.4|?1.16.5")
 public class CommandDownloadSpecific extends Command {
 
   @Override
@@ -22,12 +22,8 @@ public boolean execute(@NotNull CommandExecutionContext context, @NotNull Comman
     switch (alias) {
       case "download":
         channel
-            .sendMessage(
-                EmbedUtil.withAuthor(context.getAuthor())
-                    .setDescription(
-                        "Run `?1.15.2` or `?1.16.1` or `?1.16.2` or `?1.16.3` or `?1.16.4` or `?1.16.5`")
-                    .build())
-            .queue();
+          .sendMessage("<https://ci.codemc.io/job/YatopiaMC/job/Yatopia/job/ver%252F1.16.5/>")
+          .queue();
         break;
       case "1.15.2":
         channel

diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandShitspiller.java b/src/main/java/org/yatopiamc/bot/commands/CommandShitspiller.java
diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandTias.java b/src/main/java/org/yatopiamc/bot/commands/CommandTias.java
diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandUpstream.java b/src/main/java/org/yatopiamc/bot/commands/CommandUpstream.java
diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandVanilla.java b/src/main/java/org/yatopiamc/bot/commands/CommandVanilla.java
diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandVroomVroom.java b/src/main/java/org/yatopiamc/bot/commands/CommandVroomVroom.java
@@ -18,7 +18,7 @@ public boolean execute(@NotNull CommandExecutionContext context, @NotNull Comman
     context
         .getChannel()
         .sendMessage(
-            "<:faster1:753671545670336558> <:faster2:753671545796427826> <:faster3:753671545615810671> achieved with <:yatopia:745656023871782993> made by <:tr7zw:753678069688172694> , <:duplex:801473415588216843> , and <:ishland:799701573970034719>")
+            "<:faster1:753671545670336558> <:faster2:753671545796427826> <:faster3:753671545615810671> achieved with <:yatopia:745656023871782993> made by <:tr7zw:753678069688172694> , <:duplex:801473415588216843> , <:ishland:799701573970034719> , and <:jerry:834123977478635520>")
         .queue();
     return true;
   }

diff --git a/src/main/java/org/yatopiamc/bot/mappings/spigot/SpigotMappingParser.java b/src/main/java/org/yatopiamc/bot/mappings/spigot/SpigotMappingParser.java
@@ -37,7 +37,7 @@ private static List<Mapping> parseClass(File classMappings, String mcVer, Mappin
                 MappingType.CLASS,
                 values[0],
                 null,
-                "net/minecraft/server/" + values[1],
+                mcVer == "1.16.5" ? values[1] : "net/minecraft/server/" + values[1],
                 mcVer,
                 null,
                 null));
@@ -62,8 +62,9 @@ private static List<Mapping> parseMember(
         }
         String description = values.length == 4 ? values[2] : null;
         Mapping parent = null;
+        String mappingsPathPrefix = mcVer == "1.16.5" ? "" : "net/minecraft/server/";
         for (Mapping mapping : classMappings) {
-          if (mapping.getName().equalsIgnoreCase("net/minecraft/server/" + owner)) {
+          if (mapping.getName().equalsIgnoreCase(mappingsPathPrefix + owner)) {
             parent = mapping;
             break;
           }

diff --git a/src/main/java/org/yatopiamc/bot/mappings/spigot/SpigotMappingVersion.java b/src/main/java/org/yatopiamc/bot/mappings/spigot/SpigotMappingVersion.java
@@ -21,8 +21,8 @@ public enum SpigotMappingVersion {
   ),
   v1_16_5(
       "1.16.5",
-      "https://hub.spigotmc.org/stash/projects/SPIGOT/repos/builddata/raw/mappings/bukkit-1.16.5-cl.csrg?at=656df5e622bba97efb4e858e8cd3ec428a0b2d71",
-      "https://hub.spigotmc.org/stash/projects/SPIGOT/repos/builddata/raw/mappings/bukkit-1.16.5-members.csrg?at=656df5e622bba97efb4e858e8cd3ec428a0b2d71"
+      "https://hub.spigotmc.org/stash/projects/SPIGOT/repos/builddata/raw/mappings/bukkit-1.16.5-cl.csrg?at=80d35549ec67b87a0cdf0d897abbe826ba34ac27",
+      "https://hub.spigotmc.org/stash/projects/SPIGOT/repos/builddata/raw/mappings/bukkit-1.16.5-members.csrg?at=80d35549ec67b87a0cdf0d897abbe826ba34ac27"
   );
   private final String mcVersion, classMappings, memberMappings;