Dieser Commit ist enthalten in:
Chaoscaot 2022-04-24 22:32:19 +02:00
Ursprung ed24abe67f
Commit f2cf9b40a4
11 geänderte Dateien mit 44 neuen und 20 gelöschten Zeilen

Datei anzeigen

@ -20,15 +20,16 @@
package de.steamwar.network.packets.client; package de.steamwar.network.packets.client;
import de.steamwar.network.packets.server.ServerNetworkHandler; import de.steamwar.network.packets.server.ServerNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
@Data @Data
@AllArgsConstructor
public class ExecuteCommandPacket extends ClientPacket { public class ExecuteCommandPacket extends ClientPacket {
private static final long serialVersionUID = 6283457297487602016L; private static final long serialVersionUID = 6283457297487602016L;
@NonNull
private int playerId; private int playerId;
@NonNull
private String command; private String command;
@Override @Override

Datei anzeigen

@ -20,11 +20,9 @@
package de.steamwar.network.packets.client; package de.steamwar.network.packets.client;
import de.steamwar.network.packets.server.ServerNetworkHandler; import de.steamwar.network.packets.server.ServerNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@Data @Data
@AllArgsConstructor
public class ImALobbyPacket extends ClientPacket { public class ImALobbyPacket extends ClientPacket {
private static final long serialVersionUID = 8110246509205246654L; private static final long serialVersionUID = 8110246509205246654L;

Datei anzeigen

@ -22,13 +22,17 @@ package de.steamwar.network.packets.client;
import de.steamwar.network.packets.server.ServerNetworkHandler; import de.steamwar.network.packets.server.ServerNetworkHandler;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
public class InventoryCallbackPacket extends ClientPacket { public class InventoryCallbackPacket extends ClientPacket {
private static final long serialVersionUID = -261823209186008718L; private static final long serialVersionUID = -261823209186008718L;
@NonNull
private int position; private int position;
@NonNull
private int owner; private int owner;
@NonNull
private CallbackType type; private CallbackType type;
private ClickType clickType; private ClickType clickType;

Datei anzeigen

@ -20,16 +20,18 @@
package de.steamwar.network.packets.client; package de.steamwar.network.packets.client;
import de.steamwar.network.packets.server.ServerNetworkHandler; import de.steamwar.network.packets.server.ServerNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
@Data @Data
@AllArgsConstructor
public class PrepareSchemPacket extends ClientPacket { public class PrepareSchemPacket extends ClientPacket {
private static final long serialVersionUID = -4798561188105813349L; private static final long serialVersionUID = -4798561188105813349L;
@NonNull
private int player; private int player;
@NonNull
private int schem; private int schem;
@NonNull
private String schemType; private String schemType;
@Override @Override

Datei anzeigen

@ -20,21 +20,26 @@
package de.steamwar.network.packets.common; package de.steamwar.network.packets.common;
import de.steamwar.network.packets.NetworkHandler; import de.steamwar.network.packets.NetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
import java.util.List; import java.util.List;
@Data @Data
@AllArgsConstructor
public class FightEndsPacket extends CommonPacket { public class FightEndsPacket extends CommonPacket {
private static final long serialVersionUID = 1279352415549011332L; private static final long serialVersionUID = 1279352415549011332L;
@NonNull
private byte win; private byte win;
@NonNull
private int blueSchem; private int blueSchem;
@NonNull
private int redSchem; private int redSchem;
@NonNull
private List<Integer> bluePlayers; private List<Integer> bluePlayers;
@NonNull
private List<Integer> redPlayers; private List<Integer> redPlayers;
@NonNull
private String gameMode; private String gameMode;
@Override @Override

Datei anzeigen

@ -20,29 +20,42 @@
package de.steamwar.network.packets.common; package de.steamwar.network.packets.common;
import de.steamwar.network.packets.NetworkHandler; import de.steamwar.network.packets.NetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
import java.util.List; import java.util.List;
@Data @Data
@AllArgsConstructor
public class FightInfoPacket extends CommonPacket{ public class FightInfoPacket extends CommonPacket{
private static final long serialVersionUID = 7448644597856605853L; private static final long serialVersionUID = 7448644597856605853L;
@NonNull
private String serverName; private String serverName;
@NonNull
private String gameMode; private String gameMode;
@NonNull
private String arena; private String arena;
@NonNull
private String blueName; private String blueName;
@NonNull
private String redName; private String redName;
@NonNull
private String fightState; private String fightState;
@NonNull
private int countdown; private int countdown;
@NonNull
private int blueLeader; private int blueLeader;
@NonNull
private int redLeader; private int redLeader;
@NonNull
private int blueSchem; private int blueSchem;
@NonNull
private int redSchem; private int redSchem;
@NonNull
private List<Integer> bluePlayers; private List<Integer> bluePlayers;
@NonNull
private List<Integer> redPlayers; private List<Integer> redPlayers;
@NonNull
private List<Integer> spectators; private List<Integer> spectators;
@Override @Override

Datei anzeigen

@ -20,11 +20,9 @@
package de.steamwar.network.packets.server; package de.steamwar.network.packets.server;
import de.steamwar.network.packets.client.ClientNetworkHandler; import de.steamwar.network.packets.client.ClientNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@Data @Data
@AllArgsConstructor
public class BaumemberUpdatePacket extends ServerPacket{ public class BaumemberUpdatePacket extends ServerPacket{
private static final long serialVersionUID = 6863118892424244051L; private static final long serialVersionUID = 6863118892424244051L;

Datei anzeigen

@ -20,14 +20,14 @@
package de.steamwar.network.packets.server; package de.steamwar.network.packets.server;
import de.steamwar.network.packets.client.ClientNetworkHandler; import de.steamwar.network.packets.client.ClientNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
@Data @Data
@AllArgsConstructor
public class CloseInventoryPacket extends ServerPacket { public class CloseInventoryPacket extends ServerPacket {
private static final long serialVersionUID = -2191021190060504521L; private static final long serialVersionUID = -2191021190060504521L;
@NonNull
private int playerId; private int playerId;
@Override @Override

Datei anzeigen

@ -20,19 +20,22 @@
package de.steamwar.network.packets.server; package de.steamwar.network.packets.server;
import de.steamwar.network.packets.client.ClientNetworkHandler; import de.steamwar.network.packets.client.ClientNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
import java.util.Map; import java.util.Map;
@Data @Data
@AllArgsConstructor
public class InventoryPacket extends ServerPacket { public class InventoryPacket extends ServerPacket {
private static final long serialVersionUID = 8071052544654047316L; private static final long serialVersionUID = 8071052544654047316L;
@NonNull
private String title; private String title;
@NonNull
private int player; private int player;
@NonNull
private int size; private int size;
@NonNull
private Map<Integer, String> items; private Map<Integer, String> items;
@Override @Override

Datei anzeigen

@ -20,13 +20,13 @@
package de.steamwar.network.packets.server; package de.steamwar.network.packets.server;
import de.steamwar.network.packets.client.ClientNetworkHandler; import de.steamwar.network.packets.client.ClientNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
@Data @Data
@AllArgsConstructor
public class PingPacket extends ServerPacket { public class PingPacket extends ServerPacket {
private static final long serialVersionUID = 714647343959550378L; private static final long serialVersionUID = 714647343959550378L;
@NonNull
private int id; private int id;
@Override @Override

Datei anzeigen

@ -20,13 +20,13 @@
package de.steamwar.network.packets.server; package de.steamwar.network.packets.server;
import de.steamwar.network.packets.client.ClientNetworkHandler; import de.steamwar.network.packets.client.ClientNetworkHandler;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
@Data @Data
@AllArgsConstructor
public class StartingServerPacket extends ServerPacket { public class StartingServerPacket extends ServerPacket {
private static final long serialVersionUID = 2808607245898121801L; private static final long serialVersionUID = 2808607245898121801L;
@NonNull
private int user; private int user;
@Override @Override