From 77fb80356b42260a95610aa5971d2b03d8d30e1d Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Sat, 14 Oct 2023 12:10:15 +0200 Subject: more changes --- .../java/de/hype/bbsentials/forge/BBUtils.java | 49 +- .../CommandImplementations/Command2xPowder.java | 29 ++ .../CommandImplementations/CommandBAnnounce.java | 36 ++ .../CommandImplementations/CommandBBServer.java | 41 ++ .../forge/CommandImplementations/CommandBBan.java | 37 ++ .../forge/CommandImplementations/CommandBC.java | 37 ++ .../forge/CommandImplementations/CommandBMute.java | 36 ++ .../CommandBetterTogether.java | 29 ++ .../CommandImplementations/CommandBingoChat.java | 36 ++ .../CommandImplementations/CommandChChest.java | 48 ++ .../CommandImplementations/CommandGoblinRaid.java | 29 ++ .../CommandGoneWithTheWind.java | 29 ++ .../CommandImplementations/CommandRaffle.java | 29 ++ .../CommandSplashAnnounce.java | 50 ++ .../forge/CommandImplementations/CommandsOLD.java | 38 ++ .../java/de/hype/bbsentials/forge/Commands.java | 467 ++++++----------- .../java/de/hype/bbsentials/forge/DebugThread.java | 3 +- .../java/de/hype/bbsentials/forge/ExampleMod.java | 15 +- .../java/de/hype/bbsentials/forge/FabricChat.java | 37 -- .../java/de/hype/bbsentials/forge/ForgeChat.java | 39 ++ .../java/de/hype/bbsentials/forge/MCUtils.java | 27 +- .../java/de/hype/bbsentials/forge/Options.java | 7 +- .../java/de/hype/bbsentials/forge/Temphook.java | 3 +- .../java/de/hype/bbsentials/forge/chat/Chat.java | 579 --------------------- .../java/de/hype/bbsentials/forge/chat/Sender.java | 100 ---- .../hype/bbsentials/forge/client/CommandBBI.java | 7 +- .../forge/client/Commands/Command2xPowder.java | 29 -- .../forge/client/Commands/CommandBAnnounce.java | 36 -- .../forge/client/Commands/CommandBBServer.java | 40 -- .../forge/client/Commands/CommandBBan.java | 36 -- .../forge/client/Commands/CommandBC.java | 36 -- .../forge/client/Commands/CommandBMute.java | 35 -- .../client/Commands/CommandBetterTogether.java | 29 -- .../forge/client/Commands/CommandBingoChat.java | 35 -- .../forge/client/Commands/CommandChChest.java | 48 -- .../forge/client/Commands/CommandGoblinRaid.java | 29 -- .../client/Commands/CommandGoneWithTheWind.java | 29 -- .../forge/client/Commands/CommandRaffle.java | 29 -- .../client/Commands/CommandSplashAnnounce.java | 50 -- .../forge/client/Commands/CommandsOLD.java | 37 -- .../de/hype/bbsentials/forge/client/Config.java | 198 ------- .../forge/communication/BBsentialConnection.java | 340 ------------ 42 files changed, 767 insertions(+), 2106 deletions(-) create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/FabricChat.java create mode 100644 forge/src/main/java/de/hype/bbsentials/forge/ForgeChat.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/chat/Sender.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/client/Config.java delete mode 100644 forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java (limited to 'forge/src/main/java') diff --git a/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java b/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java index a6b2a3e..3acf95e 100644 --- a/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java +++ b/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java @@ -2,34 +2,33 @@ package de.hype.bbsentials.forge; import com.google.common.collect.Lists; import de.hype.bbsentials.common.constants.enviromentShared.Islands; -import de.hype.bbsentials.forge.chat.Chat; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.PlayerListEntry; -import java.util.Iterator; import java.util.List; public class BBUtils implements de.hype.bbsentials.common.mclibraries.BBUtils { public Islands getCurrentIsland() { - try { - String string = MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-b").getDisplayName().getString(); - if (!string.startsWith("Area: ")) { - Chat.sendPrivateMessageToSelfError("Could not get Area data. Are you in Skyblock?"); - } - else { - return Islands.getByDisplayName(string.replace("Area: ", "").trim()); - } - } catch (Exception e) { - } - return null; +// try { +// String string = MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-b").getDisplayName().getString(); +// if (!string.startsWith("Area: ")) { +// Chat.sendPrivateMessageToSelfError("Could not get Area data. Are you in Skyblock?"); +// } +// else { +// return Islands.getByDisplayName(string.replace("Area: ", "").trim()); +// } +// } catch (Exception e) { +// } +// return null; + return Islands.PRIVATE_ISLAND; } public int getPlayerCount() { - return Integer.parseInt(MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!B-a").getDisplayName().getString().trim().replaceAll("[^0-9]", "")); +// return Integer.parseInt(MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!B-a").getDisplayName().getString().trim().replaceAll("[^0-9]", "")); + return 0; } public String getServer() { - return MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-c").getDisplayName().getString().replace("Server:", "").trim(); +// return MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-c").getDisplayName().getString().replace("Server:", "").trim(); + return "mini0b"; } public boolean isOnMegaServer() { @@ -53,14 +52,14 @@ public class BBUtils implements de.hype.bbsentials.common.mclibraries.BBUtils { public List getPlayers() { List list = Lists.newArrayList(); - Iterator var2 = MinecraftClient.getInstance().getNetworkHandler().getPlayerList().iterator(); - while (var2.hasNext()) { - PlayerListEntry playerListEntry = (PlayerListEntry) var2.next(); - String playerName = playerListEntry.getProfile().getName(); - if (!playerName.startsWith("!")) { - list.add(playerName); - } - } +// Iterator var2 = MinecraftClient.getInstance().getNetworkHandler().getPlayerList().iterator(); +// while (var2.hasNext()) { +// PlayerListEntry playerListEntry = (PlayerListEntry) var2.next(); +// String playerName = playerListEntry.getProfile().getName(); +// if (!playerName.startsWith("!")) { +// list.add(playerName); +// } +// } return list; } } diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java new file mode 100644 index 0000000..0914bad --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java @@ -0,0 +1,29 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; + +import static de.hype.bbsentials.common.client.BBsentials.connection; + + +public class Command2xPowder extends CommandBase { + + @Override + public String getCommandName() { + return "2xpowder"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/2xpowder"; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + connection.sendMessage("?dwevent 2xpowder"); + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java new file mode 100644 index 0000000..032c599 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java @@ -0,0 +1,36 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +public class CommandBAnnounce extends CommandBase { + + @Override + public String getCommandName() { + return "bannounce"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/" + getCommandName() + " "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length >= 1) { + String message = String.join(" ", args); + Chat.sendCommand("?announce " + message); + } + else { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender))); + } + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java new file mode 100644 index 0000000..6150b6e --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java @@ -0,0 +1,41 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import de.hype.bbsentials.common.client.BBsentials; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +public class CommandBBServer extends CommandBase { + + @Override + public String getCommandName() { + return "bbserver"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/bbserver "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length < 1) { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bbserver ")); + return; + } + + String message = args[0]; + if (message.equals("bb:reconnect")) { + BBsentials.connectToBBserver(); + } + else { + BBsentials.connection.sendMessage(message); + } + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java new file mode 100644 index 0000000..09efc8b --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java @@ -0,0 +1,37 @@ +package de.hype.bbsentials.forge.CommandImplementations; + + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +public class CommandBBan extends CommandBase { + + @Override + public String getCommandName() { + return "bban"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/" + getCommandName() + " "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length >= 1) { + String message = String.join(" ", args); + Chat.sendCommand("?bban " + message); + } + else { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender))); + } + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java new file mode 100644 index 0000000..08f9bee --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java @@ -0,0 +1,37 @@ +package de.hype.bbsentials.forge.CommandImplementations; + + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +public class CommandBC extends CommandBase { + + @Override + public String getCommandName() { + return "bc"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/bc "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length < 1) { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bc ")); + return; + } + + String message = args[0]; + Chat.sendCommand("?bingochat " + message); + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java new file mode 100644 index 0000000..0dab562 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java @@ -0,0 +1,36 @@ +package de.hype.bbsentials.forge.CommandImplementations; + + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +public class CommandBMute extends CommandBase { + + @Override + public String getCommandName() { + return "bmute"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/" + getCommandName() + " "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length >= 1) { + String message = String.join(" ", args); + Chat.sendCommand("?mute " + message); + } + else { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender))); + } + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java new file mode 100644 index 0000000..fb3d647 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java @@ -0,0 +1,29 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; + +import static de.hype.bbsentials.common.client.BBsentials.connection; + + +public class CommandBetterTogether extends CommandBase { + + @Override + public String getCommandName() { + return "bettertogether"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/bettertogether"; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + connection.sendMessage("?dwevent bettertogether"); + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java new file mode 100644 index 0000000..6967259 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java @@ -0,0 +1,36 @@ +package de.hype.bbsentials.forge.CommandImplementations; + + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +public class CommandBingoChat extends CommandBase { + + @Override + public String getCommandName() { + return "bingochat"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/bingochat "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length < 1) { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bingochat ")); + return; + } + + String message = args[0]; + Chat.sendCommand("?bingochat " + message); + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java new file mode 100644 index 0000000..3914d03 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java @@ -0,0 +1,48 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +import static de.hype.bbsentials.common.client.BBsentials.connection; + + +public class CommandChChest extends CommandBase { + + @Override + public String getCommandName() { + return "chchest"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/chchest "; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length < 5) { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /chchest ")); + return; + } + + String item = args[0]; + try { + int x = parseInt(args[1]); + int y = parseInt(args[2]); + int z = parseInt(args[3]); + String contactWay = args[4]; + + String combinedString = "?chchest " + item + " " + x + " " + y + " " + z + " " + contactWay; + connection.sendMessage(combinedString); + } catch (Exception e) { + Chat.sendPrivateMessageToSelfError("Your coords were invalid."); + } + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java new file mode 100644 index 0000000..2b0ec28 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java @@ -0,0 +1,29 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; + +import static de.hype.bbsentials.common.client.BBsentials.connection; + + +public class CommandGoblinRaid extends CommandBase { + + @Override + public String getCommandName() { + return "goblinraid"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/goblinraid"; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + connection.sendMessage("?dwevent goblinraid"); + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java new file mode 100644 index 0000000..c079ed1 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java @@ -0,0 +1,29 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; + +import static de.hype.bbsentials.common.client.BBsentials.connection; + + +public class CommandGoneWithTheWind extends CommandBase { + + @Override + public String getCommandName() { + return "gonewiththewind"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/gonewiththewind"; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + connection.sendMessage("?dwevent gonewiththewind"); + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java new file mode 100644 index 0000000..4e17c42 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java @@ -0,0 +1,29 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; + +import static de.hype.bbsentials.common.client.BBsentials.connection; + + +public class CommandRaffle extends CommandBase { + + @Override + public String getCommandName() { + return "raffle"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/raffle"; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + connection.sendMessage("?dwevent raffle"); + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java new file mode 100644 index 0000000..52e4167 --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java @@ -0,0 +1,50 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import de.hype.bbsentials.common.chat.Chat; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import net.minecraft.command.NumberInvalidException; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +import java.util.Arrays; + +public class CommandSplashAnnounce extends CommandBase { + + @Override + public String getCommandName() { + return "splashAnnounce"; + } + + @Override + public String getCommandUsage(ICommandSender sender) { + return "/" + getCommandName() + " [extramessage]"; + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (args.length >= 2) { + int hub_Number = 0; + try { + hub_Number = parseInt(args[0], 1, 28); + } catch (NumberInvalidException e) { + Chat.sendPrivateMessageToSelfError("§cInvalid hub number"); + } + String location = args[1]; + String message = ""; + + if (args.length > 2) { + message = String.join(" ", Arrays.copyOfRange(args, 2, args.length)); + } + + Chat.sendCommand("?splash " + hub_Number + " " + location + " " + message); + } + else { + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender))); + } + } + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java new file mode 100644 index 0000000..349013d --- /dev/null +++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java @@ -0,0 +1,38 @@ +package de.hype.bbsentials.forge.CommandImplementations; + +import de.hype.bbsentials.common.client.BBsentials; +import net.minecraftforge.client.ClientCommandHandler; + +import static de.hype.bbsentials.common.client.BBsentials.getConfig; + + +public class CommandsOLD { + public CommandsOLD() { + ClientCommandHandler.instance.registerCommand(new CommandGoblinRaid()); + ClientCommandHandler.instance.registerCommand(new Command2xPowder()); + ClientCommandHandler.instance.registerCommand(new CommandBetterTogether()); + ClientCommandHandler.instance.registerCommand(new CommandRaffle()); + ClientCommandHandler.instance.registerCommand(new CommandGoneWithTheWind()); + ClientCommandHandler.instance.registerCommand(new CommandChChest()); + ClientCommandHandler.instance.registerCommand(new CommandBBServer()); + ClientCommandHandler.instance.registerCommand(new CommandBC()); + ClientCommandHandler.instance.registerCommand(new CommandBingoChat()); + if (getConfig().bbsentialsRoles != null) { + if (getConfig().hasBBRoles("mod")) { + ClientCommandHandler.instance.registerCommand(new CommandBAnnounce()); + ClientCommandHandler.instance.registerCommand(new CommandBMute()); + ClientCommandHandler.instance.registerCommand(new CommandBBan()); + } + if (getConfig().hasBBRoles("splasher")) { + ClientCommandHandler.instance.registerCommand(new CommandSplashAnnounce()); + } + else { + } + } + } + + public void sendCommand(String message) { + BBsentials.connection.sendCommand(message); + } +} + diff --git a/forge/src/main/java/de/hype/bbsentials/forge/Commands.java b/forge/src/main/java/de/hype/bbsentials/forge/Commands.java index a5af004..cf6083b 100644 --- a/forge/src/main/java/de/hype/bbsentials/forge/Commands.java +++ b/forge/src/main/java/de/hype/bbsentials/forge/Commands.java @@ -1,312 +1,189 @@ package de.hype.bbsentials.forge; -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.IntegerArgumentType; -import com.mojang.brigadier.arguments.StringArgumentType; import de.hype.bbsentials.common.client.BBsentials; -import de.hype.bbsentials.common.constants.enviromentShared.ChChestItems; -import de.hype.bbsentials.common.constants.enviromentShared.MiningEvents; import de.hype.bbsentials.common.mclibraries.EnvironmentCore; import de.hype.bbsentials.common.mclibraries.MCCommand; import de.hype.bbsentials.common.packets.AbstractPacket; -import de.hype.bbsentials.forge.chat.Chat; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; -import net.fabricmc.fabric.api.event.Event; -import net.minecraft.command.CommandSource; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import de.hype.bbsentials.common.packets.packets.SplashNotifyPacket; +import de.hype.bbsentials.forge.client.CommandBBI; +import net.minecraftforge.client.ClientCommandHandler; public class Commands implements MCCommand { - Event event = ClientCommandRegistrationCallback.EVENT; - public void registerMain(){ - event.register((dispatcher, registryAccess) -> { - dispatcher.register(ClientCommandManager.literal("creport") - .then(ClientCommandManager.argument("Player_Name", StringArgumentType.string()) - .executes((context) -> { - String playerName = StringArgumentType.getString(context, "Player_Name"); - BBsentials.getConfig().sender.addSendTask("/creport " + playerName, 0); - BBsentials.getConfig().addReported(playerName); - return 1; - }))); - });//creport helper → no double report during same launch - event.register((dispatcher, registryAccess) -> { - miningEvent(dispatcher, "goblinraid", MiningEvents.GOBLIN_RAID); - });/*goblinraid*/ - event.register((dispatcher, registryAccess) -> { - miningEvent(dispatcher, "2xpowder", MiningEvents.DOUBLE_POWDER); - });/*2xpowder*/ - event.register((dispatcher, registryAccess) -> { - miningEvent(dispatcher, "bettertogether", MiningEvents.BETTER_TOGETHER); - });/*b2g*/ - event.register((dispatcher, registryAccess) -> { - miningEvent(dispatcher, "raffle", MiningEvents.RAFFLE); - });/*raffle*/ - event.register((dispatcher, registryAccess) -> { - miningEvent(dispatcher, "gonewiththewind", MiningEvents.GONE_WITH_THE_WIND); - });/*gonewiththewind*/ - event.register((dispatcher, registryAccess) -> { - miningEvent(dispatcher, "mithrilgourmand", MiningEvents.MITHRIL_GOURMAND); - });/*gonewiththewind*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register(ClientCommandManager.literal("chchest") - .then(ClientCommandManager.argument("Item", StringArgumentType.string()) - .suggests((context, builder) -> { - String[] items = new String[]{"PrehistoricEgg", "Pickonimbus2000", "ElectronTransmitter", "FTX3070", "RobotronReflector", "ControlSwitch", "SyntheticHeart", "SuperliteMotor", "BlueGoblinEgg", "YellowGoblinEgg", "FlawlessAmberGemstone", "FlawlessJadeGemstone", "FlawlessSapphireGemstone", "FlawlessRubyGemstone", "FlawlessAmethystGemstone", "JungleHeart", "FlawlessTopazGemstone", "FlawlessJasperGemstone"}; - String input = builder.getRemaining().toLowerCase(); - int lastSemicolonIndex = input.lastIndexOf(";"); - List suggestions = new ArrayList<>(); - if (lastSemicolonIndex >= 0) { - String inputBeforeSemicolon = input.substring(0, lastSemicolonIndex + 1); // Include the semicolon - - for (String item : items) { - suggestions.add(inputBeforeSemicolon + item); - } - } - return CommandSource.suggestMatching(suggestions, builder); - }) - .then(ClientCommandManager.argument("X", IntegerArgumentType.integer()) - .then(ClientCommandManager.argument("Y", IntegerArgumentType.integer()) - .then(ClientCommandManager.argument("Z", IntegerArgumentType.integer()) - .then(ClientCommandManager.argument("ContactWay", StringArgumentType.string()) - .suggests(((context, builder) -> { - return CommandSource.suggestMatching(new String[]{"\"/msg " + BBsentials.getConfig().getUsername() + " bb:party me\"", "\"/p join " + BBsentials.config.getUsername() + "\""}, builder); - })) - .executes((context) -> { - String item = StringArgumentType.getString(context, "Item"); - int x = IntegerArgumentType.getInteger(context, "X"); - int y = IntegerArgumentType.getInteger(context, "Y"); - int z = IntegerArgumentType.getInteger(context, "Z"); - String contactWay = StringArgumentType.getString(context, "ContactWay"); - - sendPacket(new ChChestPacket("", ChChestItems.getItem(item.split(";")), x + " " + y + " " + z, contactWay, "")); - return 1; - } - ) - ) - ) - ) - ) - ) - ); - });/*chchest*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("bc") - .then(ClientCommandManager.argument("Message to Bingo Chat", StringArgumentType.greedyString()) - .executes((context) -> { - String message = StringArgumentType.getString(context, "Message to Bingo Chat"); - sendPacket(new BingoChatMessagePacket("", "", message, 0)); - return 1; - }) - ) - ); - });/*BincoChatShort*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("bingochat") - .then(ClientCommandManager.argument("Message to Bingo Chat", StringArgumentType.greedyString()) - .executes((context) -> { - String message = StringArgumentType.getString(context, "Message to Bingo Chat"); - sendPacket(new BingoChatMessagePacket("", "", message, 0)); - return 1; - }) - ) - ); - });/*BingoChatLong*/ + public static void sendPacket(T packet) { + BBsentials.connection.sendPacket(packet); } - public void registerRoleRequired(boolean hasDev, boolean hasAdmin, boolean hasMod, boolean hasSplasher, boolean hasBeta, boolean hasMiningEvents, boolean hasChChest) { - if (hasMod) { - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("bannounce") - .then(ClientCommandManager.argument("message", StringArgumentType.greedyString()) - .executes((context) -> { - String message = StringArgumentType.getString(context, "message"); - sendPacket(new BroadcastMessagePacket("","",message)); - return 1; - }) - ) - ); - });/*bAnnounce*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register(ClientCommandManager.literal("bmute") - .then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string()) - .then(ClientCommandManager.argument("[Duration(d/h/m/s) | 0 forever]", StringArgumentType.string()) - .then(ClientCommandManager.argument("reason", StringArgumentType.greedyString()) - .executes((context) -> { - String identification = StringArgumentType.getString(context, "userId/mcusername"); - String duration = StringArgumentType.getString(context, "[Duration(d/h/m/s) | 0 forever]"); - String reason = StringArgumentType.getString(context, "reason"); - int userId = -1; - String mcusername = ""; - if (identification.replaceAll("[\\d]", "").trim().isEmpty()) { - userId = Integer.parseInt(identification); - } - else { - mcusername = identification; - } - sendPacket(new PunishUserPacket(PunishUserPacket.PUNISHMENT_TYPE_MUTE, userId, mcusername, duration, reason)); - return 1; - }) - ) - ) - ) - ); - });/*bmute*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register(ClientCommandManager.literal("bban") - .then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string()) - .then(ClientCommandManager.argument("[Duration(d/h/m/s) | 0 forever]", StringArgumentType.string()) - .then(ClientCommandManager.argument("reason", StringArgumentType.greedyString()) - .executes((context) -> { - String identification = StringArgumentType.getString(context, "userId/mcusername"); - String duration = StringArgumentType.getString(context, "[Duration(d/h/m/s) | 0 forever]"); - String reason = StringArgumentType.getString(context, "reason"); - int userId = -1; - String mcusername = ""; - if (identification.replaceAll("[\\d]", "").trim().isEmpty()) { - userId = Integer.parseInt(identification); - } - else { - mcusername = identification; - } - sendPacket(new PunishUserPacket(PunishUserPacket.PUNISHMENT_TYPE_BAN, userId, mcusername, duration, reason)); - return 1; - }) - ) - ) - ) - ); - });/*ban*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register(ClientCommandManager.literal("bgetinfo") - .then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string()) - .executes((context) -> { - String identification = StringArgumentType.getString(context, "userId/mcusername"); - sendPacket(new InternalCommandPacket(InternalCommandPacket.GET_USER_INFO, new String[]{identification})); - return 1; - }) - ) - ); - });/*getInfo*/ - } - if (hasSplasher) { - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("splashAnnounce") - .then(ClientCommandManager.argument("Hub", IntegerArgumentType.integer(1, 28)) - .then(ClientCommandManager.argument("location", StringArgumentType.string()) - .suggests((context, builder) -> { - return CommandSource.suggestMatching(new String[]{"kat", "bea", "guild-house"}, builder); - }) - .then(ClientCommandManager.argument("lasswaste", StringArgumentType.string()) - .suggests((context, builder) -> { - return CommandSource.suggestMatching(new String[]{"true", "false"}, builder); - }) - .then(ClientCommandManager.argument("extramessage", StringArgumentType.greedyString()) - .executes((context) -> { - int hub = IntegerArgumentType.getInteger(context, "Hub"); - String extramessage = StringArgumentType.getString(context, "extramessage"); - String location = StringArgumentType.getString(context, "location"); - boolean lessWaste = Boolean.parseBoolean(StringArgumentType.getString(context, "lasswaste")); - splashAnnounce(hub, location, extramessage, lessWaste); - return 1; - }) - ) - .executes((context) -> { - int hub = IntegerArgumentType.getInteger(context, "Hub"); - String location = StringArgumentType.getString(context, "location"); - boolean lessWaste = Boolean.parseBoolean(StringArgumentType.getString(context, "lasswaste")); - splashAnnounce(hub, location, "", lessWaste); - return 1; - }) - )) - .executes((context) -> { - int hub = IntegerArgumentType.getInteger(context, "Hub"); - String location = "bea"; - splashAnnounce(hub, location, "", true); - return 1; - }) - - ) - ); - });/*SplashAnnounce*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("requestpottimes") - .executes((context) -> { - sendPacket(new InternalCommandPacket(InternalCommandPacket.REQUEST_POT_DURATION, new String[0])); - return 1; - }) - ); - });/*requestpottimes*/ - } - if (hasAdmin) { - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("bshutdown") - .then(ClientCommandManager.argument("Reason", StringArgumentType.greedyString()) - .suggests((context, builder) -> { - return CommandSource.suggestMatching(new String[]{"Emergency Shutdown", "System Shutdown", "Other"}, builder); - }) - .executes((context) -> { - String reason = StringArgumentType.getString(context, "Reason"); - sendPacket(new InternalCommandPacket(InternalCommandPacket.SHUTDOWN_SERVER, new String[]{reason})); - return 1; - }) - ) - ); - });/*BBShutdown*/ - event.register((dispatcher, registryAccess) -> { - dispatcher.register( - ClientCommandManager.literal("bsetmotd") - .then(ClientCommandManager.argument("Message", StringArgumentType.greedyString()) - .suggests((context, builder) -> { - return CommandSource.suggestMatching(new String[]{""}, builder); - }) - .executes((context) -> { - String message = StringArgumentType.getString(context, "Message").trim(); - sendPacket(new InternalCommandPacket(InternalCommandPacket.SET_MOTD, new String[]{message})); - return 1; - }) - ) - ); - });/*BBServerMotd*/ - } + public void registerMain() { + ClientCommandHandler.instance.registerCommand(new CommandBBI()); +// event.register((dispatcher, registryAccess) -> { +// miningEvent(dispatcher, "goblinraid", MiningEvents.GOBLIN_RAID); +// });/*goblinraid*/ +// event.register((dispatcher, registryAccess) -> { +// miningEvent(dispatcher, "2xpowder", MiningEvents.DOUBLE_POWDER); +// });/*2xpowder*/ +// event.register((dispatcher, registryAccess) -> { +// miningEvent(dispatcher, "bettertogether", MiningEvents.BETTER_TOGETHER); +// });/*b2g*/ +// event.register((dispatcher, registryAccess) -> { +// miningEvent(dispatcher, "raffle", MiningEvents.RAFFLE); +// });/*raffle*/ +// event.register((dispatcher, registryAccess) -> { +// miningEvent(dispatcher, "gonewiththewind", MiningEvents.GONE_WITH_THE_WIND); +// });/*gonewiththewind*/ +// event.register((dispatcher, registryAccess) -> { +// miningEvent(dispatcher, "mithrilgourmand", MiningEvents.MITHRIL_GOURMAND); +// });/*gonewiththewind*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("chchest").then(ClientCommandManager.argument("Item", StringArgumentType.string()).suggests((context, builder) -> { +// String[] items = new String[]{"PrehistoricEgg", "Pickonimbus2000", "ElectronTransmitter", "FTX3070", "RobotronReflector", "ControlSwitch", "SyntheticHeart", "SuperliteMotor", "BlueGoblinEgg", "YellowGoblinEgg", "FlawlessAmberGemstone", "FlawlessJadeGemstone", "FlawlessSapphireGemstone", "FlawlessRubyGemstone", "FlawlessAmethystGemstone", "JungleHeart", "FlawlessTopazGemstone", "FlawlessJasperGemstone"}; +// String input = builder.getRemaining().toLowerCase(); +// int lastSemicolonIndex = input.lastIndexOf(";"); +// List suggestions = new ArrayList<>(); +// if (lastSemicolonIndex >= 0) { +// String inputBeforeSemicolon = input.substring(0, lastSemicolonIndex + 1); // Include the semicolon +// +// for (String item : items) { +// suggestions.add(inputBeforeSemicolon + item); +// } +// } +// return CommandSource.suggestMatching(suggestions, builder); +// }).then(ClientCommandManager.argument("X", IntegerArgumentType.integer()).then(ClientCommandManager.argument("Y", IntegerArgumentType.integer()).then(ClientCommandManager.argument("Z", IntegerArgumentType.integer()).then(ClientCommandManager.argument("ContactWay", StringArgumentType.string()).suggests(((context, builder) -> { +// return CommandSource.suggestMatching(new String[]{"\"/msg " + BBsentials.getConfig().getUsername() + " bb:party me\"", "\"/p join " + BBsentials.config.getUsername() + "\""}, builder); +// })).executes((context) -> { +// String item = StringArgumentType.getString(context, "Item"); +// int x = IntegerArgumentType.getInteger(context, "X"); +// int y = IntegerArgumentType.getInteger(context, "Y"); +// int z = IntegerArgumentType.getInteger(context, "Z"); +// String contactWay = StringArgumentType.getString(context, "ContactWay"); +// +// sendPacket(new ChChestPacket("", ChChestItems.getItem(item.split(";")), x + " " + y + " " + z, contactWay, "")); +// return 1; +// }))))))); +// });/*chchest*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bc").then(ClientCommandManager.argument("Message to Bingo Chat", StringArgumentType.greedyString()).executes((context) -> { +// String message = StringArgumentType.getString(context, "Message to Bingo Chat"); +// sendPacket(new BingoChatMessagePacket("", "", message, 0)); +// return 1; +// }))); +// });/*BincoChatShort*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bingochat").then(ClientCommandManager.argument("Message to Bingo Chat", StringArgumentType.greedyString()).executes((context) -> { +// String message = StringArgumentType.getString(context, "Message to Bingo Chat"); +// sendPacket(new BingoChatMessagePacket("", "", message, 0)); +// return 1; +// }))); +// });/*BingoChatLong*/ } - private static void simpleCommand(CommandDispatcher dispatcher, String commandName, String[] parameters) { - dispatcher.register( - ClientCommandManager.literal(commandName) - .executes((context) -> { - sendPacket(new InternalCommandPacket(commandName, parameters)); - return 1; - }) - ); + public void registerRoleRequired(boolean hasDev, boolean hasAdmin, boolean hasMod, boolean hasSplasher, boolean hasBeta, boolean hasMiningEvents, boolean hasChChest) { +// if (hasMod) { +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bannounce").then(ClientCommandManager.argument("message", StringArgumentType.greedyString()).executes((context) -> { +// String message = StringArgumentType.getString(context, "message"); +// sendPacket(new BroadcastMessagePacket("", "", message)); +// return 1; +// }))); +// });/*bAnnounce*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bmute").then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string()).then(ClientCommandManager.argument("[Duration(d/h/m/s) | 0 forever]", StringArgumentType.string()).then(ClientCommandManager.argument("reason", StringArgumentType.greedyString()).executes((context) -> { +// String identification = StringArgumentType.getString(context, "userId/mcusername"); +// String duration = StringArgumentType.getString(context, "[Duration(d/h/m/s) | 0 forever]"); +// String reason = StringArgumentType.getString(context, "reason"); +// int userId = -1; +// String mcusername = ""; +// if (identification.replaceAll("[\\d]", "").trim().isEmpty()) { +// userId = Integer.parseInt(identification); +// } +// else { +// mcusername = identification; +// } +// sendPacket(new PunishUserPacket(PunishUserPacket.PUNISHMENT_TYPE_MUTE, userId, mcusername, duration, reason)); +// return 1; +// }))))); +// });/*bmute*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bban").then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string()).then(ClientCommandManager.argument("[Duration(d/h/m/s) | 0 forever]", StringArgumentType.string()).then(ClientCommandManager.argument("reason", StringArgumentType.greedyString()).executes((context) -> { +// String identification = StringArgumentType.getString(context, "userId/mcusername"); +// String duration = StringArgumentType.getString(context, "[Duration(d/h/m/s) | 0 forever]"); +// String reason = StringArgumentType.getString(context, "reason"); +// int userId = -1; +// String mcusername = ""; +// if (identification.replaceAll("[\\d]", "").trim().isEmpty()) { +// userId = Integer.parseInt(identification); +// } +// else { +// mcusername = identification; +// } +// sendPacket(new PunishUserPacket(PunishUserPacket.PUNISHMENT_TYPE_BAN, userId, mcusername, duration, reason)); +// return 1; +// }))))); +// });/*ban*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bgetinfo").then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string()).executes((context) -> { +// String identification = StringArgumentType.getString(context, "userId/mcusername"); +// sendPacket(new InternalCommandPacket(InternalCommandPacket.GET_USER_INFO, new String[]{identification})); +// return 1; +// }))); +// });/*getInfo*/ +// } +// if (hasSplasher) { +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("splashAnnounce").then(ClientCommandManager.argument("Hub", IntegerArgumentType.integer(1, 28)).then(ClientCommandManager.argument("location", StringArgumentType.string()).suggests((context, builder) -> { +// return CommandSource.suggestMatching(new String[]{"kat", "bea", "guild-house"}, builder); +// }).then(ClientCommandManager.argument("lasswaste", StringArgumentType.string()).suggests((context, builder) -> { +// return CommandSource.suggestMatching(new String[]{"true", "false"}, builder); +// }).then(ClientCommandManager.argument("extramessage", StringArgumentType.greedyString()).executes((context) -> { +// int hub = IntegerArgumentType.getInteger(context, "Hub"); +// String extramessage = StringArgumentType.getString(context, "extramessage"); +// String location = StringArgumentType.getString(context, "location"); +// boolean lessWaste = Boolean.parseBoolean(StringArgumentType.getString(context, "lasswaste")); +// splashAnnounce(hub, location, extramessage, lessWaste); +// return 1; +// })).executes((context) -> { +// int hub = IntegerArgumentType.getInteger(context, "Hub"); +// String location = StringArgumentType.getString(context, "location"); +// boolean lessWaste = Boolean.parseBoolean(StringArgumentType.getString(context, "lasswaste")); +// splashAnnounce(hub, location, "", lessWaste); +// return 1; +// }))).executes((context) -> { +// int hub = IntegerArgumentType.getInteger(context, "Hub"); +// String location = "bea"; +// splashAnnounce(hub, location, "", true); +// return 1; +// }) +// +// )); +// });/*SplashAnnounce*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("requestpottimes").executes((context) -> { +// sendPacket(new InternalCommandPacket(InternalCommandPacket.REQUEST_POT_DURATION, new String[0])); +// return 1; +// })); +// });/*requestpottimes*/ +// } +// if (hasAdmin) { +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bshutdown").then(ClientCommandManager.argument("Reason", StringArgumentType.greedyString()).suggests((context, builder) -> { +// return CommandSource.suggestMatching(new String[]{"Emergency Shutdown", "System Shutdown", "Other"}, builder); +// }).executes((context) -> { +// String reason = StringArgumentType.getString(context, "Reason"); +// sendPacket(new InternalCommandPacket(InternalCommandPacket.SHUTDOWN_SERVER, new String[]{reason})); +// return 1; +// }))); +// });/*BBShutdown*/ +// event.register((dispatcher, registryAccess) -> { +// dispatcher.register(ClientCommandManager.literal("bsetmotd").then(ClientCommandManager.argument("Message", StringArgumentType.greedyString()).suggests((context, builder) -> { +// return CommandSource.suggestMatching(new String[]{""}, builder); +// }).executes((context) -> { +// String message = StringArgumentType.getString(context, "Message").trim(); +// sendPacket(new InternalCommandPacket(InternalCommandPacket.SET_MOTD, new String[]{message})); +// return 1; +// }))); +// });/*BBServerMotd*/ +// } } - private static void miningEvent(CommandDispatcher dispatcher, String commandName, MiningEvents event) { - dispatcher.register( - ClientCommandManager.literal(commandName) - .executes((context) -> { - try { - sendPacket(new MiningEventPacket(event, - BBsentials.config.getUsername(), Objects.requireNonNull(EnvironmentCore.utils.getCurrentIsland()))); - } catch (Exception e) { - Chat.sendPrivateMessageToSelfError(e.getMessage()); - } -