aboutsummaryrefslogtreecommitdiff
path: root/forge/src/main/java
diff options
context:
space:
mode:
authorHacktheTime <l4bg0jb7@duck.com>2023-10-14 12:10:15 +0200
committerHacktheTime <l4bg0jb7@duck.com>2023-10-14 12:10:15 +0200
commit77fb80356b42260a95610aa5971d2b03d8d30e1d (patch)
tree6d9892029e1f682e357811e61f3632ade2615aec /forge/src/main/java
parent764cd84919c5b30a6bb0e6ec2e32feba07633ebf (diff)
downloadBBsentials-77fb80356b42260a95610aa5971d2b03d8d30e1d.tar.gz
BBsentials-77fb80356b42260a95610aa5971d2b03d8d30e1d.tar.bz2
BBsentials-77fb80356b42260a95610aa5971d2b03d8d30e1d.zip
more changes
Diffstat (limited to 'forge/src/main/java')
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java49
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java)6
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java)4
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java)5
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java)5
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java)5
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java)5
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java)6
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java)5
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java)10
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java)6
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java)6
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java)6
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java)6
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java (renamed from forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java)11
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/Commands.java467
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java3
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java15
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/FabricChat.java37
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/ForgeChat.java39
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/MCUtils.java27
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/Options.java7
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/Temphook.java3
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java579
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/chat/Sender.java100
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/CommandBBI.java7
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Config.java198
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java340
28 files changed, 309 insertions, 1648 deletions
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<String> getPlayers() {
List<String> 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/client/Commands/Command2xPowder.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java
index 8044991..0914bad 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
public class Command2xPowder extends CommandBase {
@@ -20,7 +20,7 @@ public class Command2xPowder extends CommandBase {
@Override
public void processCommand(ICommandSender sender, String[] args) {
- bbserver.sendMessage("?dwevent 2xpowder");
+ connection.sendMessage("?dwevent 2xpowder");
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java
index 3d2afb7..032c599 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.common.chat.Chat;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java
index 7c94a27..6150b6e 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java
@@ -1,5 +1,6 @@
-package de.hype.bbsentials.forge.client.Commands;
+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;
@@ -29,7 +30,7 @@ public class CommandBBServer extends CommandBase {
BBsentials.connectToBBserver();
}
else {
- BBsentials.bbserver.sendMessage(message);
+ BBsentials.connection.sendMessage(message);
}
}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java
index 15d99b7..09efc8b 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java
index 0b46507..08f9bee 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java
index 3fd6390..0dab562 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java
index 78f20f8..fb3d647 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
public class CommandBetterTogether extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandBetterTogether extends CommandBase {
@Override
public void processCommand(ICommandSender sender, String[] args) {
- bbserver.sendMessage("?dwevent bettertogether");
+ connection.sendMessage("?dwevent bettertogether");
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java
index 655cfdb..6967259 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java
index daaa1f3..3914d03 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java
@@ -1,12 +1,12 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+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.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
public class CommandChChest extends CommandBase {
@@ -36,9 +36,9 @@ public class CommandChChest extends CommandBase {
String contactWay = args[4];
String combinedString = "?chchest " + item + " " + x + " " + y + " " + z + " " + contactWay;
- bbserver.sendMessage(combinedString);
+ connection.sendMessage(combinedString);
} catch (Exception e) {
- Chat.sendPrivateMessageToSelf("§cYour coords were invalid.");
+ Chat.sendPrivateMessageToSelfError("Your coords were invalid.");
}
}
@Override
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java
index bb7d276..2b0ec28 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
public class CommandGoblinRaid extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandGoblinRaid extends CommandBase {
@Override
public void processCommand(ICommandSender sender, String[] args) {
- bbserver.sendMessage("?dwevent goblinraid");
+ connection.sendMessage("?dwevent goblinraid");
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java
index 602e422..c079ed1 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
public class CommandGoneWithTheWind extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandGoneWithTheWind extends CommandBase {
@Override
public void processCommand(ICommandSender sender, String[] args) {
- bbserver.sendMessage("?dwevent gonewiththewind");
+ connection.sendMessage("?dwevent gonewiththewind");
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java
index 235c538..4e17c42 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
public class CommandRaffle extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandRaffle extends CommandBase {
@Override
public void processCommand(ICommandSender sender, String[] args) {
- bbserver.sendMessage("?dwevent raffle");
+ connection.sendMessage("?dwevent raffle");
}
@Override
public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java
index 041d0fc..52e4167 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandSplashAnnounce.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
-import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.common.chat.Chat;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.NumberInvalidException;
@@ -28,7 +28,7 @@ public class CommandSplashAnnounce extends CommandBase {
try {
hub_Number = parseInt(args[0], 1, 28);
} catch (NumberInvalidException e) {
- Chat.sendPrivateMessageToSelf("§cInvalid hub number");
+ Chat.sendPrivateMessageToSelfError("§cInvalid hub number");
}
String location = args[1];
String message = "";
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java
index d42970f..349013d 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandsOLD.java
@@ -1,8 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
+import de.hype.bbsentials.common.client.BBsentials;
import net.minecraftforge.client.ClientCommandHandler;
-import static de.hype.bbsentials.forge.client.BBsentials.getConfig;
+import static de.hype.bbsentials.common.client.BBsentials.getConfig;
public class CommandsOLD {
@@ -17,12 +18,12 @@ public class CommandsOLD {
ClientCommandHandler.instance.registerCommand(new CommandBC());
ClientCommandHandler.instance.registerCommand(new CommandBingoChat());
if (getConfig().bbsentialsRoles != null) {
- if (getConfig().bbsentialsRoles.contains("mod")) {
+ if (getConfig().hasBBRoles("mod")) {
ClientCommandHandler.instance.registerCommand(new CommandBAnnounce());
ClientCommandHandler.instance.registerCommand(new CommandBMute());
ClientCommandHandler.instance.registerCommand(new CommandBBan());
}
- if (getConfig().bbsentialsRoles.contains("splasher")) {
+ if (getConfig().hasBBRoles("splasher")) {
ClientCommandHandler.instance.registerCommand(new CommandSplashAnnounce());
}
else {
@@ -31,7 +32,7 @@ public class CommandsOLD {
}
public void sendCommand(String message) {
- BBsentials.bbserver.sendCommand(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<ClientCommandRegistrationCallback> 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<String> 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((dispa