Make SyncmaticaPayload.java be an inner Class of the SyncmaticaPacket

sakura-ryoko · Jun 16, 2024 · 4655a84 · 4655a84
1 parent 8efbaae
commit 4655a84
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 27 deletions.
diff --git a/src/main/java/ch/endte/syncmatica/Context.java b/src/main/java/ch/endte/syncmatica/Context.java
@@ -13,7 +13,7 @@
 import ch.endte.syncmatica.extended_core.PlayerIdentifierProvider;
 import ch.endte.syncmatica.network.handler.ClientPlayHandler;
 import ch.endte.syncmatica.network.handler.ServerPlayHandler;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import ch.endte.syncmatica.service.DebugService;
 import ch.endte.syncmatica.service.IService;
 import ch.endte.syncmatica.service.JsonConfiguration;

diff --git a/src/main/java/ch/endte/syncmatica/Syncmatica.java b/src/main/java/ch/endte/syncmatica/Syncmatica.java
@@ -8,7 +8,7 @@
 import ch.endte.syncmatica.data.IFileStorage;
 import ch.endte.syncmatica.data.SyncmaticManager;
 import ch.endte.syncmatica.network.actor.ActorClientPlayHandler;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/src/main/java/ch/endte/syncmatica/communication/ClientCommunicationManager.java b/src/main/java/ch/endte/syncmatica/communication/ClientCommunicationManager.java
@@ -14,7 +14,7 @@
 import ch.endte.syncmatica.litematica.LitematicManager;
 import ch.endte.syncmatica.litematica.ScreenHelper;
 import ch.endte.syncmatica.network.actor.ActorClientPlayHandler;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import net.minecraft.network.PacketByteBuf;
 import fi.dy.masa.malilib.gui.Message;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/CommunicationManager.java b/src/main/java/ch/endte/syncmatica/communication/CommunicationManager.java
@@ -13,7 +13,7 @@
 import ch.endte.syncmatica.extended_core.PlayerIdentifierProvider;
 import ch.endte.syncmatica.extended_core.SubRegionData;
 import ch.endte.syncmatica.extended_core.SubRegionPlacementModification;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import ch.endte.syncmatica.util.SyncmaticaUtil;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;

diff --git a/src/main/java/ch/endte/syncmatica/communication/ExchangeTarget.java b/src/main/java/ch/endte/syncmatica/communication/ExchangeTarget.java
@@ -8,8 +8,8 @@
 import ch.endte.syncmatica.communication.exchange.Exchange;
 import ch.endte.syncmatica.network.handler.ClientPlayHandler;
 import ch.endte.syncmatica.network.handler.ServerPlayHandler;
-import ch.endte.syncmatica.network.payload.PacketType;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.PacketType;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.network.ServerPlayNetworkHandler;

diff --git a/src/main/java/ch/endte/syncmatica/communication/ServerCommunicationManager.java b/src/main/java/ch/endte/syncmatica/communication/ServerCommunicationManager.java
@@ -8,7 +8,7 @@
 import ch.endte.syncmatica.data.LocalLitematicState;
 import ch.endte.syncmatica.data.ServerPlacement;
 import ch.endte.syncmatica.extended_core.PlayerIdentifier;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.network.PacketByteBuf;

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/DownloadExchange.java b/src/main/java/ch/endte/syncmatica/communication/exchange/DownloadExchange.java
@@ -14,7 +14,7 @@
 import ch.endte.syncmatica.communication.MessageType;
 import ch.endte.syncmatica.communication.ServerCommunicationManager;
 import ch.endte.syncmatica.data.ServerPlacement;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/Exchange.java b/src/main/java/ch/endte/syncmatica/communication/exchange/Exchange.java
@@ -2,7 +2,7 @@
 
 import ch.endte.syncmatica.Context;
 import ch.endte.syncmatica.communication.ExchangeTarget;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import net.minecraft.network.PacketByteBuf;
 
 // an exchange represents a portion of a communication with a specific goal 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/FeatureExchange.java b/src/main/java/ch/endte/syncmatica/communication/exchange/FeatureExchange.java
@@ -3,7 +3,7 @@
 import ch.endte.syncmatica.Context;
 import ch.endte.syncmatica.communication.ExchangeTarget;
 import ch.endte.syncmatica.communication.FeatureSet;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/ModifyExchangeClient.java b/src/main/java/ch/endte/syncmatica/communication/exchange/ModifyExchangeClient.java
@@ -6,7 +6,7 @@
 import ch.endte.syncmatica.data.ServerPlacement;
 import ch.endte.syncmatica.litematica.LitematicManager;
 import ch.endte.syncmatica.litematica.ScreenHelper;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 import fi.dy.masa.malilib.gui.Message;

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/ModifyExchangeServer.java b/src/main/java/ch/endte/syncmatica/communication/exchange/ModifyExchangeServer.java
@@ -5,7 +5,7 @@
 import ch.endte.syncmatica.communication.ExchangeTarget;
 import ch.endte.syncmatica.data.ServerPlacement;
 import ch.endte.syncmatica.extended_core.PlayerIdentifier;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/ShareLitematicExchange.java b/src/main/java/ch/endte/syncmatica/communication/exchange/ShareLitematicExchange.java
@@ -8,7 +8,7 @@
 import ch.endte.syncmatica.data.RedirectFileStorage;
 import ch.endte.syncmatica.data.ServerPlacement;
 import ch.endte.syncmatica.litematica.LitematicManager;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import net.minecraft.network.PacketByteBuf;
 import fi.dy.masa.litematica.schematic.placement.SchematicPlacement;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/UploadExchange.java b/src/main/java/ch/endte/syncmatica/communication/exchange/UploadExchange.java
@@ -4,7 +4,7 @@
 import ch.endte.syncmatica.Context;
 import ch.endte.syncmatica.communication.ExchangeTarget;
 import ch.endte.syncmatica.data.ServerPlacement;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/VersionHandshakeClient.java b/src/main/java/ch/endte/syncmatica/communication/exchange/VersionHandshakeClient.java
@@ -7,7 +7,7 @@
 import ch.endte.syncmatica.communication.FeatureSet;
 import ch.endte.syncmatica.data.ServerPlacement;
 import ch.endte.syncmatica.litematica.LitematicManager;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 

diff --git a/src/main/java/ch/endte/syncmatica/communication/exchange/VersionHandshakeServer.java b/src/main/java/ch/endte/syncmatica/communication/exchange/VersionHandshakeServer.java
@@ -7,7 +7,7 @@
 import ch.endte.syncmatica.communication.ExchangeTarget;
 import ch.endte.syncmatica.communication.FeatureSet;
 import ch.endte.syncmatica.data.ServerPlacement;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketByteBuf;
 

diff --git a/src/main/java/ch/endte/syncmatica/litematica/gui/WidgetSyncmaticaServerPlacementEntry.java b/src/main/java/ch/endte/syncmatica/litematica/gui/WidgetSyncmaticaServerPlacementEntry.java
@@ -11,7 +11,7 @@
 import ch.endte.syncmatica.communication.ClientCommunicationManager;
 import ch.endte.syncmatica.communication.ExchangeTarget;
 import ch.endte.syncmatica.litematica.LitematicManager;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import fi.dy.masa.malilib.gui.button.ButtonBase;
 import fi.dy.masa.malilib.gui.button.ButtonGeneric;
 import fi.dy.masa.malilib.gui.button.IButtonActionListener;

diff --git a/src/main/java/ch/endte/syncmatica/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/ch/endte/syncmatica/mixin/MixinClientPlayNetworkHandler.java
@@ -8,7 +8,7 @@
 import ch.endte.syncmatica.communication.ExchangeTarget;
 import ch.endte.syncmatica.network.actor.IClientPlay;
 import ch.endte.syncmatica.network.handler.ClientPlayHandler;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/ch/endte/syncmatica/mixin/MixinPlayerManager.java b/src/main/java/ch/endte/syncmatica/mixin/MixinPlayerManager.java
@@ -4,8 +4,8 @@
 import ch.endte.syncmatica.Reference;
 import ch.endte.syncmatica.Syncmatica;
 import ch.endte.syncmatica.network.handler.ServerPlayHandler;
-import ch.endte.syncmatica.network.payload.PacketType;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.PacketType;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import io.netty.buffer.Unpooled;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/ch/endte/syncmatica/mixin/MixinServerPlayNetworkHandler.java b/src/main/java/ch/endte/syncmatica/mixin/MixinServerPlayNetworkHandler.java
@@ -8,7 +8,7 @@
 import ch.endte.syncmatica.communication.ServerCommunicationManager;
 import ch.endte.syncmatica.network.actor.IServerPlay;
 import ch.endte.syncmatica.network.handler.ServerPlayHandler;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;

diff --git a/...yncmatica/network/payload/PacketType.java → .../endte/syncmatica/network/PacketType.java b/...yncmatica/network/payload/PacketType.java → .../endte/syncmatica/network/PacketType.java
@@ -1,4 +1,4 @@
-package ch.endte.syncmatica.network.payload;
+package ch.endte.syncmatica.network;
 
 import net.minecraft.util.Identifier;
 

diff --git a/...ica/network/payload/SyncmaticaPacket.java → .../syncmatica/network/SyncmaticaPacket.java b/...ica/network/payload/SyncmaticaPacket.java → .../syncmatica/network/SyncmaticaPacket.java
@@ -1,4 +1,4 @@
-package ch.endte.syncmatica.network.payload;
+package ch.endte.syncmatica.network;
 
 import javax.annotation.Nonnull;
 import ch.endte.syncmatica.Syncmatica;

diff --git a/src/main/java/ch/endte/syncmatica/network/actor/ActorClientPlayHandler.java b/src/main/java/ch/endte/syncmatica/network/actor/ActorClientPlayHandler.java
@@ -11,7 +11,7 @@
 import ch.endte.syncmatica.data.SyncmaticManager;
 import ch.endte.syncmatica.litematica.LitematicManager;
 import ch.endte.syncmatica.litematica.ScreenHelper;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.PacketByteBuf;

diff --git a/src/main/java/ch/endte/syncmatica/network/handler/ClientPlayHandler.java b/src/main/java/ch/endte/syncmatica/network/handler/ClientPlayHandler.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nonnull;
 import java.util.Objects;
 import ch.endte.syncmatica.network.actor.ActorClientPlayHandler;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.client.network.ClientPlayNetworkHandler;

diff --git a/src/main/java/ch/endte/syncmatica/network/handler/ServerPlayHandler.java b/src/main/java/ch/endte/syncmatica/network/handler/ServerPlayHandler.java
@@ -2,7 +2,7 @@
 
 import javax.annotation.Nonnull;
 import ch.endte.syncmatica.network.actor.IServerPlay;
-import ch.endte.syncmatica.network.payload.SyncmaticaPacket;
+import ch.endte.syncmatica.network.SyncmaticaPacket;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.network.packet.Packet;

diff --git a/src/main/java/ch/endte/syncmatica/service/DebugService.java b/src/main/java/ch/endte/syncmatica/service/DebugService.java
@@ -1,7 +1,7 @@
 package ch.endte.syncmatica.service;
 
 import ch.endte.syncmatica.Syncmatica;
-import ch.endte.syncmatica.network.payload.PacketType;
+import ch.endte.syncmatica.network.PacketType;
 
 public class DebugService extends AbstractService {