Skip to content

Commit 22957f0

Browse files
PascalpexPascalpex
committed
Improved command registration
1 parent 1e13967 commit 22957f0

File tree

4 files changed

+37
-58
lines changed

4 files changed

+37
-58
lines changed

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,10 @@
11
--- a/net/minecraft/server/dedicated/DedicatedServer.java
22
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
3-
@@ -19,6 +_,8 @@
4-
import java.util.Locale;
5-
import java.util.Optional;
6-
import javax.annotation.Nullable;
7-
+
8-
+import de.pascalpex.deepslatemc.commands.*; // Deepslate - Registering all commands
9-
import net.minecraft.DefaultUncaughtExceptionHandler;
10-
import net.minecraft.DefaultUncaughtExceptionHandlerWithName;
11-
import net.minecraft.SharedConstants;
12-
@@ -256,6 +_,21 @@
13-
gg.pufferfish.pufferfish.simd.SIMDDetection.initialize();
14-
} catch (Throwable ignored) {}
15-
// Gale end - Pufferfish - SIMD support
16-
+
17-
+ // Deepslate start
18-
+ MinecraftServer.getServer().server.getCommandMap().register("deepslate", "Deepslate", new DeepslateCommand("deepslate"));
19-
+ MinecraftServer.getServer().server.getCommandMap().register("discord", "Deepslate", new DiscordCommand("discord"));
20-
+ MinecraftServer.getServer().server.getCommandMap().register("dc", "Deepslate", new DiscordCommand("dc"));
21-
+ MinecraftServer.getServer().server.getCommandMap().register("cc", "Deepslate", new ClearchatCommand("cc"));
22-
+ MinecraftServer.getServer().server.getCommandMap().register("clearchat", "Deepslate", new ClearchatCommand("clearchat"));
23-
+ MinecraftServer.getServer().server.getCommandMap().register("setbuildworld", "Deepslate", new BuildworldCommand("setbuildworld"));
24-
+ MinecraftServer.getServer().server.getCommandMap().register("buildworld", "Deepslate", new BuildworldCommand("buildworld"));
25-
+ MinecraftServer.getServer().server.getCommandMap().register("maintenance", "Deepslate", new MaintenanceMode("maintenance"));
26-
+ MinecraftServer.getServer().server.getCommandMap().register("help", "Deepslate", new HelpCommand("help"));
27-
+ MinecraftServer.getServer().server.getCommandMap().register("setspawn", "Deepslate", new SpawnCommand("setspawn"));
28-
+ MinecraftServer.getServer().server.getCommandMap().register("spawn", "Deepslate", new SpawnCommand("spawn"));
29-
+ MinecraftServer.getServer().server.getCommandMap().register("lobby", "Deepslate", new SpawnCommand("lobby"));
30-
+ // Deepslate end
31-
32-
this.setPvpAllowed(properties.pvp);
33-
this.setFlightAllowed(properties.allowFlight);
3+
@@ -237,6 +_,7 @@
4+
thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
5+
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
6+
org.galemc.gale.command.GaleCommands.registerCommands(this); // Gale - Gale commands - register commands
7+
+ de.pascalpex.deepslatemc.commands.DeepslateCmdRegisterer.registerCommands(this); // Deepslate - register commands
8+
this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
9+
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
10+
/*// Purpur start - Purpur config files // Purpur - Configurable void damage height and damage

‎deepslateMC-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,10 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
3-
@@ -13,6 +_,7 @@
4-
import com.mojang.brigadier.exceptions.CommandSyntaxException;
5-
import com.mojang.serialization.Dynamic;
6-
import com.mojang.serialization.Lifecycle;
7-
+import de.pascalpex.deepslatemc.commands.*; // Deepslate - Registering all commands
8-
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
9-
import java.awt.image.BufferedImage;
10-
import java.io.ByteArrayOutputStream;
11-
@@ -1139,6 +_,22 @@
12-
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
3+
@@ -1140,6 +_,7 @@
4+
org.galemc.gale.command.GaleCommands.registerCommands(this.console); // Gale - Gale commands - register commands
135
this.spark.registerCommandBeforePlugins(this); // Paper - spark
146
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur - Purpur config files
15-
+
16-
+ // Deepslate start
17-
+ MinecraftServer.getServer().server.getCommandMap().register("deepslate", "Deepslate", new DeepslateCommand("deepslate"));
18-
+ MinecraftServer.getServer().server.getCommandMap().register("discord", "Deepslate", new DiscordCommand("discord"));
19-
+ MinecraftServer.getServer().server.getCommandMap().register("dc", "Deepslate", new DiscordCommand("dc"));
20-
+ MinecraftServer.getServer().server.getCommandMap().register("cc", "Deepslate", new ClearchatCommand("cc"));
21-
+ MinecraftServer.getServer().server.getCommandMap().register("clearchat", "Deepslate", new ClearchatCommand("clearchat"));
22-
+ MinecraftServer.getServer().server.getCommandMap().register("setbuildworld", "Deepslate", new BuildworldCommand("setbuildworld"));
23-
+ MinecraftServer.getServer().server.getCommandMap().register("buildworld", "Deepslate", new BuildworldCommand("buildworld"));
24-
+ MinecraftServer.getServer().server.getCommandMap().register("maintenance", "Deepslate", new MaintenanceMode("maintenance"));
25-
+ MinecraftServer.getServer().server.getCommandMap().register("help", "Deepslate", new HelpCommand("help"));
26-
+ MinecraftServer.getServer().server.getCommandMap().register("setspawn", "Deepslate", new SpawnCommand("setspawn"));
27-
+ MinecraftServer.getServer().server.getCommandMap().register("spawn", "Deepslate", new SpawnCommand("spawn"));
28-
+ MinecraftServer.getServer().server.getCommandMap().register("lobby", "Deepslate", new SpawnCommand("lobby"));
29-
+ // Deepslate end
30-
+
7+
+ de.pascalpex.deepslatemc.commands.DeepslateCmdRegisterer.registerCommands(this.console); // Deepslate - register commands
318
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
329
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
3310
org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleServerReload(); // Leaves - protocol

‎deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/DeepslateCmdRegisterer.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package de.pascalpex.deepslatemc.commands;
2+
3+
import net.minecraft.server.MinecraftServer;
4+
import org.bukkit.command.SimpleCommandMap;
5+
6+
public class DeepslateCmdRegisterer {
7+
8+
public static void registerCommands(final MinecraftServer server) {
9+
SimpleCommandMap commandMap = server.server.getCommandMap();
10+
11+
commandMap.register("deepslate", "Deepslate", new DeepslateCommand("deepslate"));
12+
commandMap.register("discord", "Deepslate", new DiscordCommand("discord"));
13+
commandMap.register("dc", "Deepslate", new DiscordCommand("dc"));
14+
commandMap.register("cc", "Deepslate", new ClearchatCommand("cc"));
15+
commandMap.register("clearchat", "Deepslate", new ClearchatCommand("clearchat"));
16+
commandMap.register("setbuildworld", "Deepslate", new BuildworldCommand("setbuildworld"));
17+
commandMap.register("buildworld", "Deepslate", new BuildworldCommand("buildworld"));
18+
commandMap.register("maintenance", "Deepslate", new MaintenanceMode("maintenance"));
19+
commandMap.register("help", "Deepslate", new HelpCommand("help"));
20+
commandMap.register("setspawn", "Deepslate", new SpawnCommand("setspawn"));
21+
commandMap.register("spawn", "Deepslate", new SpawnCommand("spawn"));
22+
commandMap.register("lobby", "Deepslate", new SpawnCommand("lobby"));
23+
}
24+
25+
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=de.pascalpex.deepslatemc
22
version=1.21.4-R0.1-SNAPSHOT
33
packageVersion = 1_21_R3
44
mcVersion=1.21.4
5-
leafRef=14403885aea8d25caad97a89e2174906a459ceda
5+
leafRef=541e5914ef8ef5d01d3d7f959fffdffb5526961c
66

77
org.gradle.configuration-cache=true
88
org.gradle.caching=true

0 commit comments

Comments
 (0)