From dba4a297e295d68980da31264b0069fe9b18a13e Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Thu, 12 Oct 2023 20:17:28 +0200 Subject: preperations to have a common code and different implementations for forge and fabric to ease up maintaining both versions --- .../de/hype/bbsentials/packets/AbstractPacket.java | 67 -------------- .../bbsentials/packets/EnviromentPacketConfig.java | 7 -- .../java/de/hype/bbsentials/packets/Packet.java | 26 ------ .../de/hype/bbsentials/packets/PacketManager.java | 53 ----------- .../de/hype/bbsentials/packets/PacketUtils.java | 103 --------------------- .../packets/packets/BingoChatMessagePacket.java | 25 ----- .../packets/packets/BroadcastMessagePacket.java | 18 ---- .../bbsentials/packets/packets/ChChestPacket.java | 23 ----- .../packets/packets/DisconnectPacket.java | 23 ----- .../packets/DisplayTellrawMessagePacket.java | 12 --- .../packets/packets/InternalCommandPacket.java | 32 ------- .../packets/InvalidCommandFeedbackPacket.java | 24 ----- .../packets/packets/MiningEventPacket.java | 25 ----- .../bbsentials/packets/packets/PartyPacket.java | 16 ---- .../packets/packets/PunishUserPacket.java | 24 ----- .../packets/packets/RequestConnectPacket.java | 20 ---- .../packets/packets/SplashNotifyPacket.java | 28 ------ .../packets/packets/SplashUpdatePacket.java | 22 ----- .../packets/packets/SystemMessagePacket.java | 16 ---- .../packets/packets/WelcomeClientPacket.java | 18 ---- 20 files changed, 582 deletions(-) delete mode 100644 src/main/java/de/hype/bbsentials/packets/AbstractPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/EnviromentPacketConfig.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/Packet.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/PacketManager.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/PacketUtils.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/BingoChatMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/BroadcastMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/ChChestPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/DisconnectPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/DisplayTellrawMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/InternalCommandPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/InvalidCommandFeedbackPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/MiningEventPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/PartyPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/PunishUserPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/RequestConnectPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/SplashNotifyPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/SplashUpdatePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/SystemMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/WelcomeClientPacket.java (limited to 'src/main/java/de/hype/bbsentials/packets') diff --git a/src/main/java/de/hype/bbsentials/packets/AbstractPacket.java b/src/main/java/de/hype/bbsentials/packets/AbstractPacket.java deleted file mode 100644 index 152e3d8..0000000 --- a/src/main/java/de/hype/bbsentials/packets/AbstractPacket.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.hype.bbsentials.packets; - -import de.hype.bbsentials.chat.Chat; -import de.hype.bbsentials.client.BBsentials; -import de.hype.bbsentials.client.Config; -import de.hype.bbsentials.communication.BBsentialConnection; -import de.hype.bbsentials.packets.packets.InvalidCommandFeedbackPacket; - -import java.lang.reflect.Field; - -public class AbstractPacket { - public final int apiVersionMin; - public final int apiVersionMax; - - protected AbstractPacket(int apiVersionMin, int apiVersionMax) { - this.apiVersionMax = apiVersionMax; - this.apiVersionMin = apiVersionMin; - - } - - public boolean isValid(BBsentialConnection connection, String[] allowedNullFields) { - if (isApiSupported(BBsentials.config)) { - Chat.sendPrivateMessageToSelfFatal("You are using an outdated version of the mod"); - } - return true; - } - - public boolean isApiSupported(Config config) { - //int version = Core.getConfig().getVersion(); - int version = config.getApiVersion(); - if (version >= apiVersionMin && version <= apiVersionMax) { - return true; - } - return false; - } - - public String hasNullFields(String[] allowedNullFields) { - Field[] fields = this.getClass().getDeclaredFields(); - if (!this.getClass().getSimpleName().equals(InvalidCommandFeedbackPacket.class.getSimpleName())) { - for (Field field : fields) { - field.setAccessible(true); - try { - if (field.get(this) == null) { - if (allowedNullFields == null) return field.getName(); - if (isAllowedNull(allowedNullFields, field.getName())) { - return field.getName(); - } - } - } catch (IllegalAccessException e) { - // Handle the exception if needed - e.printStackTrace(); - } - } - } - return null; - - } - - public boolean isAllowedNull(String[] allowedFields, String fieldName) { - for (String allowedField : allowedFields) { - if (allowedField.equals(fieldName)) { - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/src/main/java/de/hype/bbsentials/packets/EnviromentPacketConfig.java b/src/main/java/de/hype/bbsentials/packets/EnviromentPacketConfig.java deleted file mode 100644 index da05704..0000000 --- a/src/main/java/de/hype/bbsentials/packets/EnviromentPacketConfig.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.hype.bbsentials.packets; - -public class EnviromentPacketConfig { - public static final String enviroment = "Client"; - public static final String notEnviroment = "Server"; - public static final int apiVersion = 1; -} diff --git a/src/main/java/de/hype/bbsentials/packets/Packet.java b/src/main/java/de/hype/bbsentials/packets/Packet.java deleted file mode 100644 index 6a4ecbf..0000000 --- a/src/main/java/de/hype/bbsentials/packets/Packet.java +++ /dev/null @@ -1,26 +0,0 @@ -package de.hype.bbsentials.packets; - -import java.util.function.Consumer; - -public class Packet { - - private final Class clazz; - private final Consumer consumer; - - public Packet(Class clazz, Consumer consumer) { - this.clazz = clazz; - this.consumer = consumer; - } - - public String getName() { - return clazz.getSimpleName(); - } - - public Class getClazz() { - return clazz; - } - - public Consumer getConsumer() { - return consumer; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/PacketManager.java b/src/main/java/de/hype/bbsentials/packets/PacketManager.java deleted file mode 100644 index cda4315..0000000 --- a/src/main/java/de/hype/bbsentials/packets/PacketManager.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.hype.bbsentials.packets; - -import de.hype.bbsentials.communication.BBsentialConnection; -import de.hype.bbsentials.packets.packets.*; - -import java.util.ArrayList; -import java.util.List; - -public class PacketManager { - private static List> packets = new ArrayList<>(); - - public List> getPackets() { - return packets; - } - - // Define a map to store packet classes and their associated actions - BBsentialConnection connection; - - // Method to initialize packet actions - public PacketManager(BBsentialConnection connection) { - this.connection = connection; - initializePacketActions(connection); - } - - public static void initializePacketActions(BBsentialConnection connection) { - packets.add(new Packet<>(BingoChatMessagePacket.class, connection::onBingoChatMessagePacket)); - packets.add(new Packet<>(BroadcastMessagePacket.class, connection::onBroadcastMessagePacket)); - packets.add(new Packet<>(ChChestPacket.class, connection::onChChestPacket)); - packets.add(new Packet<>(DisconnectPacket.class, connection::onDisconnectPacket)); - packets.add(new Packet<>(DisplayTellrawMessagePacket.class, connection::onDisplayTellrawMessagePacket)); - packets.add(new Packet<>(InternalCommandPacket.class, connection::onInternalCommandPacket)); - packets.add(new Packet<>(InvalidCommandFeedbackPacket.class, connection::onInvalidCommandFeedbackPacket)); - packets.add(new Packet<>(MiningEventPacket.class, connection::onMiningEventPacket)); - packets.add(new Packet<>(PartyPacket.class, connection::onPartyPacket)); -// packets.add(new Packet<>(RequestConnectPacket.class, connection::dummy)); - packets.add(new Packet<>(SplashNotifyPacket.class, connection::onSplashNotifyPacket)); - packets.add(new Packet<>(SystemMessagePacket.class, connection::onSystemMessagePacket)); - packets.add(new Packet<>(WelcomeClientPacket.class, connection::onWelcomePacket)); - } - - // Method to handle a received packet - - - // method to get a list of all packets - public static List> getAllPacketClasses() { - initializePacketActions(null); - List> allPackets = new ArrayList<>(); - for (int i = 0; i < allPackets.size(); i++) { - allPackets.add(packets.get(i).getClazz()); - } - return allPackets; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/PacketUtils.java b/src/main/java/de/hype/bbsentials/packets/PacketUtils.java deleted file mode 100644 index e9aeb27..0000000 --- a/src/main/java/de/hype/bbsentials/packets/PacketUtils.java +++ /dev/null @@ -1,103 +0,0 @@ -package de.hype.bbsentials.packets; - -import com.google.gson.Gson; -import de.hype.bbsentials.chat.Chat; -import de.hype.bbsentials.client.BBsentials; -import de.hype.bbsentials.client.CustomGson; -import de.hype.bbsentials.communication.BBsentialConnection; - -import java.util.function.Consumer; - - -public class PacketUtils { - public static final Gson gson = CustomGson.create(); - - public static String parsePacketToJson(AbstractPacket packet) { - return gson.toJson(packet); - } - - public static void tryToProcessPacket(Packet packet, String rawJson) { - Class clazz = packet.getClazz(); - Consumer consumer = packet.getConsumer(); - T abstractPacket = gson.fromJson(rawJson, clazz); - consumer.accept(abstractPacket); - } - - private static void showError(Throwable t, String errorMessage) { - System.out.println(errorMessage + " because of: " + t.getClass().getSimpleName() + ": " + t.getMessage()); - new Error(errorMessage, t).printStackTrace(); - } - - public static class APIException extends Error { - - public APIException(String errorMessage, Throwable t) { - super(errorMessage, t); - } - - public APIException(String errorMessage) { - super(errorMessage); - } - } - - public static T getAsPacket(String message, Class clazz) { - if (!message.contains(".")) return null; - String packetName = message.split("\\.")[0]; - String rawJson = message.substring(packetName.length() + 1); - if (!packetName.equals(clazz.getSimpleName())) { - try { - T parsedPacket = gson.fromJson(rawJson, clazz); - return parsedPacket; - } catch (Throwable t) { - showError(t, "Could not process packet '" + packetName + "' from " + EnviromentPacketConfig.notEnviroment); - } - } - String errorMessage = "Could not process packet '" + packetName + "' from " + EnviromentPacketConfig.notEnviroment; - - showError(new APIException("Found unknown packet: " + packetName + "'"), errorMessage); - return null; - } - - public static boolean isPacket(String message, Class clazz) { - if (!message.contains(".")) return false; - String packetName = message.split("\\.")[0]; - if (packetName.equals(clazz.getSimpleName())) { - return true; - } - return false; - } - - public static boolean isPacket(String message) { - if (!message.contains(".")) return false; - String packetName = message.split("\\.")[0]; - for (Class packetClass : PacketManager.getAllPacketClasses()) { - if (!packetName.equals(packetClass.getSimpleName())) { - return true; - } - } - return false; - } - - public static boolean handleIfPacket(BBsentialConnection connection, String message) { - //Return = is Packet - if (!message.contains(".")) return false; - String packetName = message.split("\\.")[0]; - String rawJson = message.substring(packetName.length() + 1); - PacketManager manager = new PacketManager(connection); - for (Packet packet : manager.getPackets()) { - if (!packetName.equals(packet.getClazz().getSimpleName())) continue; - try { - if (BBsentials.getConfig().isDetailedDevModeEnabled()) Chat.sendPrivateMessageToSelfDebug(packetName+":"+rawJson); - tryToProcessPacket(packet, rawJson); - return true; - }catch (RuntimeException e){ - throw e; - }catch (Exception t) { - showError(t, "Could not process packet '" + packetName + "' from " + EnviromentPacketConfig.notEnviroment); - } - } - String errorMessage = "Could not process packet '" + packetName + "' from " + EnviromentPacketConfig.notEnviroment; - - showError(new APIException("Found unknown packet: " + packetName + "'"), errorMessage); - return false; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/BingoChatMessagePacket.java b/src/main/java/de/hype/bbsentials/packets/packets/BingoChatMessagePacket.java deleted file mode 100644 index b62db7d..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/BingoChatMessagePacket.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.hype.bbsentials.packets.packets; - - -import de.hype.bbsentials.packets.AbstractPacket; - -public class BingoChatMessagePacket extends AbstractPacket { - - public BingoChatMessagePacket(String prefix, String username, String message, int bingo_cards) { - super(1, 1); //Min and Max supported Version - this.message = message; - this.username = username; - this.prefix = prefix; - this.bingo_cards = bingo_cards; - } - - public final String message; - public final String username; - public final String prefix; - public final int bingo_cards; - - public boolean baseCheck() { - boolean cancelPacket = false; - return !cancelPacket; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/BroadcastMessagePacket.java b/src/main/java/de/hype/bbsentials/packets/packets/BroadcastMessagePacket.java deleted file mode 100644 index aa0cb89..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/BroadcastMessagePacket.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.hype.bbsentials.packets.packets; - - -import de.hype.bbsentials.packets.AbstractPacket; - -public class BroadcastMessagePacket extends AbstractPacket { - - public final String message; - public final String username; - public final String prefix; - - public BroadcastMessagePacket(String prefix, String username, String message) { - super(1, 1); //Min and Max supported Version - this.message = message; - this.username = username; - this.prefix = prefix; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/ChChestPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/ChChestPacket.java deleted file mode 100644 index 4519b66..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/ChChestPacket.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; -import de.hype.bbsentials.constants.enviromentShared.ChChestItem; - -public class ChChestPacket extends AbstractPacket { - - public ChChestPacket(String announcerUsername, ChChestItem[] items, String locationCoords, String bbcommand, String extraMessage) { - super(1, 1); //Min and Max supported Version - this.announcerUsername = announcerUsername; - this.locationCoords = locationCoords; - this.bbcommand = bbcommand; - this.extraMessage = extraMessage; - this.items = items; - } - - public final String announcerUsername; - public final String locationCoords; - public final String bbcommand; - public final String extraMessage; - public final ChChestItem[] items; - -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/DisconnectPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/DisconnectPacket.java deleted file mode 100644 index 7cb461e..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/DisconnectPacket.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; -import de.hype.bbsentials.constants.enviromentShared.InternalReasonConstants; - -public class DisconnectPacket extends AbstractPacket { - - public DisconnectPacket(InternalReasonConstants internalReason, int[] waitBeforeReconnect, int randomExtraDelay, String displayReason, String displayMessage) { - super(1, 1); //Min and Max supportet Version - this.internalReason = internalReason; - this.waitBeforeReconnect = waitBeforeReconnect; - this.displayReason = displayReason; - this.displayMessage = displayMessage; - this.randomExtraDelay = randomExtraDelay; - } - - public final InternalReasonConstants internalReason; - public final int[] waitBeforeReconnect; - public final int randomExtraDelay; - public final String displayReason; - public final String displayMessage; - -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/DisplayTellrawMessagePacket.java b/src/main/java/de/hype/bbsentials/packets/packets/DisplayTellrawMessagePacket.java deleted file mode 100644 index b0580e5..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/DisplayTellrawMessagePacket.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class DisplayTellrawMessagePacket extends AbstractPacket { - public final String rawJson; - - public DisplayTellrawMessagePacket(String rawJson) { - super(1, 1); //Min and Max supported Version - this.rawJson = rawJson; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/InternalCommandPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/InternalCommandPacket.java deleted file mode 100644 index a5ae416..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/InternalCommandPacket.java +++ /dev/null @@ -1,32 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -//Only used for small things which don't really need an own Packet. -public class InternalCommandPacket extends AbstractPacket { - public static final String REQUEST_POT_DURATION= "potDuration?"; - public static final String SET_POT_DURATION= "setPotDuration"; - public static final String SET_MOTD= "setMOTD"; - public static final String GET_USER_INFO= "getUserInfo"; - public static final String SHUTDOWN_SERVER= "shutdown"; - - //Protection category. The following things can only be activated by people with server console access and an code understanding. - public static final String CRASH= "crash"; - public static final String INSTACRASH= "immediateCrash"; - public static final String HUB= "hub"; - public static final String PRIVATE_ISLAND= "is"; - public static final String HIDDEN_HUB= "hidden_Hub"; - public static final String HIDDEN_PRIVATE_ISLAND= "hidden_is"; - public static final String SELFDESTRUCT= "destroy"; //used when someone may not sue the mod in the future anymore - public static final String PEACEFULLDESTRUCT= "silentDestroy"; //Used when The game should not crash, when the mod was removed - - public InternalCommandPacket(String command, String[] parameters) { - super(1, 1); //Min and Max supported Version - this.command = command; - this.parameters = parameters; - } - - public final String command; - public final String[] parameters; - -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/InvalidCommandFeedbackPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/InvalidCommandFeedbackPacket.java deleted file mode 100644 index d1173ea..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/InvalidCommandFeedbackPacket.java +++ /dev/null @@ -1,24 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class InvalidCommandFeedbackPacket extends AbstractPacket { - - public InvalidCommandFeedbackPacket(String internalReason, String command, String displayMessage, String argument, String permissionNeeded, String[] userPermissions) { - super(1, 1); //Min and Max supportet Version - this.internalReason = internalReason; - this.argument = argument; - this.permissionNeeded = permissionNeeded; - this.userPermissions = userPermissions; - this.command = command; - this.displayMessage = displayMessage; - } - - public final String internalReason; - public final String argument; - public final String permissionNeeded; - public final String[] userPermissions; - public final String command; - public final String displayMessage; - -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/MiningEventPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/MiningEventPacket.java deleted file mode 100644 index ae2f436..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/MiningEventPacket.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; -import de.hype.bbsentials.constants.enviromentShared.Islands; -import de.hype.bbsentials.constants.enviromentShared.MiningEvents; - -public class MiningEventPacket extends AbstractPacket { - - - public final MiningEvents event; - public final String username; - public final Islands island; - - public MiningEventPacket(MiningEvents event, String username, Islands island) throws Exception { - super(1, 1); //Min and Max supported Version - this.event = event; - this.username = username; - if (island.equals(Islands.CRYSTAL_HOLLOWS)) { - if (event.equals(MiningEvents.MITHRIL_GOURMAND) || event.equals(MiningEvents.RAFFLE) || event.equals(MiningEvents.GOBLIN_RAID)) { - throw new Exception("The specified event can not happen on this Server"); - } - } - this.island = island; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/PartyPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/PartyPacket.java deleted file mode 100644 index 23325d9..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/PartyPacket.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class PartyPacket extends AbstractPacket { - - public PartyPacket(String type, String[] users) { - super(1, 1); //Min and Max supportet Version - this.type = type; - this.users = users; - } - - public final String type; - public final String[] users; - -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/PunishUserPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/PunishUserPacket.java deleted file mode 100644 index 43cb6e5..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/PunishUserPacket.java +++ /dev/null @@ -1,24 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class PunishUserPacket extends AbstractPacket { - public static final String PUNISHMENT_TYPE_BAN = "BAN"; - public static final String PUNISHMENT_TYPE_MUTE = "MUTE"; - - public PunishUserPacket(String punishmentType,int userId, String username, String duration, String reason) { - super(1, 1); - this.type = punishmentType; - this.username = username; - this.userId = userId; - this.duration = duration; - this.reason = reason; - } - - public final String username; - public final String type; - public final int userId; - public final String duration; - public final String reason; - -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/RequestConnectPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/RequestConnectPacket.java deleted file mode 100644 index 6009de5..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/RequestConnectPacket.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class RequestConnectPacket extends AbstractPacket { - - - public RequestConnectPacket(String mcuuid, String key, int clientApiVersion, String authType) { - super(1, 1); //Min and Max supported Version - this.mcuuid = mcuuid; - this.key = key; - this.authType = authType; - this.clientApiVersion = clientApiVersion; - } - - public final String mcuuid; - public final String key; - public final String authType; - public final int clientApiVersion; -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/SplashNotifyPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/SplashNotifyPacket.java deleted file mode 100644 index e0b4fa4..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/SplashNotifyPacket.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; -import de.hype.bbsentials.constants.enviromentShared.Islands; - -public class SplashNotifyPacket extends AbstractPacket { - - - public SplashNotifyPacket(int splashId, int hub, String splasherUsername, String location, Islands hubType, String extraMessage, boolean lessWaste) { - super(1, 1); //Min and Max supported Version - this.hub = hub; - this.splashId = splashId; - - this.lessWaste = lessWaste; - this.splasherUsername = splasherUsername; - this.location = location; - this.hubType = hubType; - this.extraMessage = extraMessage; - } - - public final int hub; - public final int splashId; - public final boolean lessWaste; - public final String splasherUsername; - public final String location; - public final Islands hubType; - public final String extraMessage; -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/SplashUpdatePacket.java b/src/main/java/de/hype/bbsentials/packets/packets/SplashUpdatePacket.java deleted file mode 100644 index 201ff37..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/SplashUpdatePacket.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.hype.bbsentials.packets.packets; - - -import de.hype.bbsentials.packets.AbstractPacket; - -public class SplashUpdatePacket extends AbstractPacket { - public static final String STATUS_WAITING = "Waiting"; - public static final String STATUS_FULL = "Full"; - public static final String STATUS_SPLASHING = "Splashing"; - public static final String STATUS_CANCELED = "Canceled"; - public static final String STATUS_DONE = "Done"; - - - public SplashUpdatePacket(int splashId, String status) { - super(1, 1); //Min and Max supported Version - this.splashId = splashId; - this.status = status; - } - - public final int splashId; - public final String status; -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/SystemMessagePacket.java b/src/main/java/de/hype/bbsentials/packets/packets/SystemMessagePacket.java deleted file mode 100644 index c8ba534..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/SystemMessagePacket.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class SystemMessagePacket extends AbstractPacket { - public final String message; - public final boolean important; - public final boolean ping; - - public SystemMessagePacket(String message, boolean important, boolean ping) { - super(1, 1); //Min and Max supported Version - this.message = message; - this.important = important; - this.ping = ping; - } -} diff --git a/src/main/java/de/hype/bbsentials/packets/packets/WelcomeClientPacket.java b/src/main/java/de/hype/bbsentials/packets/packets/WelcomeClientPacket.java deleted file mode 100644 index f1c80b3..0000000 --- a/src/main/java/de/hype/bbsentials/packets/packets/WelcomeClientPacket.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.hype.bbsentials.packets.packets; - -import de.hype.bbsentials.packets.AbstractPacket; - -public class WelcomeClientPacket extends AbstractPacket { - - public WelcomeClientPacket(String[] roles, String motd, boolean success) { - super(1, 1); //Min and Max supportet Version - this.roles = roles; - this.motd = motd; - this.success = success; - } - - public final String[] roles; - public final String motd; - public final boolean success; - -} \ No newline at end of file -- cgit