Renamed root packet

Nan1t · Dec 11, 2022 · 77a68ef · 77a68ef
1 parent 8210e61
commit 77a68ef
Show file tree

Hide file tree

Showing 63 changed files with 331 additions and 330 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ shadowJar {
     from 'LICENSE'
 
     manifest {
-        attributes('Main-Class': 'ru.nanit.limbo.NanoLimbo')
+        attributes('Main-Class': 'ua.nanit.limbo.NanoLimbo')
     }
 
     minimize()

diff --git a/...n/java/ru/nanit/limbo/LimboConstants.java → ...n/java/ua/nanit/limbo/LimboConstants.java b/...n/java/ru/nanit/limbo/LimboConstants.java → ...n/java/ua/nanit/limbo/LimboConstants.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo;
+package ua.nanit.limbo;
 
 public final class LimboConstants {
 

diff --git a/src/main/java/ru/nanit/limbo/NanoLimbo.java → src/main/java/ua/nanit/limbo/NanoLimbo.java b/src/main/java/ru/nanit/limbo/NanoLimbo.java → src/main/java/ua/nanit/limbo/NanoLimbo.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo;
+package ua.nanit.limbo;
 
-import ru.nanit.limbo.server.LimboServer;
-import ru.nanit.limbo.server.Logger;
+import ua.nanit.limbo.server.LimboServer;
+import ua.nanit.limbo.server.Logger;
 
 public final class NanoLimbo {
 

diff --git a/...anit/limbo/configuration/LimboConfig.java → ...anit/limbo/configuration/LimboConfig.java b/...anit/limbo/configuration/LimboConfig.java → ...anit/limbo/configuration/LimboConfig.java
@@ -15,14 +15,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.configuration;
+package ua.nanit.limbo.configuration;
 
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.ConfigurationOptions;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
-import ru.nanit.limbo.server.data.*;
-import ru.nanit.limbo.util.Colors;
+import ua.nanit.limbo.util.Colors;
+import ua.nanit.limbo.server.data.BossBar;
+import ua.nanit.limbo.server.data.InfoForwarding;
+import ua.nanit.limbo.server.data.PingData;
+import ua.nanit.limbo.server.data.Title;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;

diff --git a/...onfiguration/SocketAddressSerializer.java → ...onfiguration/SocketAddressSerializer.java b/...onfiguration/SocketAddressSerializer.java → ...onfiguration/SocketAddressSerializer.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.configuration;
+package ua.nanit.limbo.configuration;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;

diff --git a/.../connection/ClientChannelInitializer.java → .../connection/ClientChannelInitializer.java b/.../connection/ClientChannelInitializer.java → .../connection/ClientChannelInitializer.java
@@ -15,17 +15,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection;
+package ua.nanit.limbo.connection;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.timeout.ReadTimeoutHandler;
-import ru.nanit.limbo.connection.pipeline.PacketDecoder;
-import ru.nanit.limbo.connection.pipeline.PacketEncoder;
-import ru.nanit.limbo.connection.pipeline.VarIntFrameDecoder;
-import ru.nanit.limbo.connection.pipeline.VarIntLengthEncoder;
-import ru.nanit.limbo.server.LimboServer;
+import ua.nanit.limbo.connection.pipeline.PacketDecoder;
+import ua.nanit.limbo.connection.pipeline.PacketEncoder;
+import ua.nanit.limbo.connection.pipeline.VarIntFrameDecoder;
+import ua.nanit.limbo.connection.pipeline.VarIntLengthEncoder;
+import ua.nanit.limbo.server.LimboServer;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...it/limbo/connection/ClientConnection.java → ...it/limbo/connection/ClientConnection.java b/...it/limbo/connection/ClientConnection.java → ...it/limbo/connection/ClientConnection.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection;
+package ua.nanit.limbo.connection;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
@@ -26,17 +26,17 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import org.jetbrains.annotations.NotNull;
-import ru.nanit.limbo.connection.pipeline.PacketDecoder;
-import ru.nanit.limbo.connection.pipeline.PacketEncoder;
-import ru.nanit.limbo.protocol.ByteMessage;
-import ru.nanit.limbo.protocol.Packet;
-import ru.nanit.limbo.protocol.packets.login.*;
-import ru.nanit.limbo.protocol.packets.play.*;
-import ru.nanit.limbo.protocol.registry.State;
-import ru.nanit.limbo.protocol.registry.Version;
-import ru.nanit.limbo.server.LimboServer;
-import ru.nanit.limbo.server.Logger;
-import ru.nanit.limbo.util.UuidUtil;
+import ua.nanit.limbo.connection.pipeline.PacketDecoder;
+import ua.nanit.limbo.connection.pipeline.PacketEncoder;
+import ua.nanit.limbo.protocol.ByteMessage;
+import ua.nanit.limbo.protocol.Packet;
+import ua.nanit.limbo.protocol.packets.login.PacketDisconnect;
+import ua.nanit.limbo.protocol.packets.play.PacketKeepAlive;
+import ua.nanit.limbo.protocol.registry.State;
+import ua.nanit.limbo.protocol.registry.Version;
+import ua.nanit.limbo.server.LimboServer;
+import ua.nanit.limbo.server.Logger;
+import ua.nanit.limbo.util.UuidUtil;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;

diff --git a/...u/nanit/limbo/connection/GameProfile.java → ...a/nanit/limbo/connection/GameProfile.java b/...u/nanit/limbo/connection/GameProfile.java → ...a/nanit/limbo/connection/GameProfile.java
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2020 Nan1t
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ru.nanit.limbo.connection;
-
-import java.util.UUID;
-
-public class GameProfile {
-
-    private UUID uuid;
-    private String username;
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-}
+/*
+ * Copyright (C) 2020 Nan1t
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package ua.nanit.limbo.connection;
+
+import java.util.UUID;
+
+public class GameProfile {
+
+    private UUID uuid;
+    private String username;
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/...nanit/limbo/connection/PacketHandler.java → ...nanit/limbo/connection/PacketHandler.java b/...nanit/limbo/connection/PacketHandler.java → ...nanit/limbo/connection/PacketHandler.java
@@ -15,20 +15,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection;
+package ua.nanit.limbo.connection;
 
 import io.netty.buffer.Unpooled;
-import ru.nanit.limbo.LimboConstants;
-import ru.nanit.limbo.protocol.packets.PacketHandshake;
-import ru.nanit.limbo.protocol.packets.login.PacketLoginPluginRequest;
-import ru.nanit.limbo.protocol.packets.login.PacketLoginPluginResponse;
-import ru.nanit.limbo.protocol.packets.login.PacketLoginStart;
-import ru.nanit.limbo.protocol.packets.status.PacketStatusPing;
-import ru.nanit.limbo.protocol.packets.status.PacketStatusRequest;
-import ru.nanit.limbo.protocol.packets.status.PacketStatusResponse;
-import ru.nanit.limbo.server.LimboServer;
-import ru.nanit.limbo.server.Logger;
-import ru.nanit.limbo.util.UuidUtil;
+import ua.nanit.limbo.LimboConstants;
+import ua.nanit.limbo.protocol.packets.PacketHandshake;
+import ua.nanit.limbo.protocol.packets.login.PacketLoginPluginRequest;
+import ua.nanit.limbo.protocol.packets.login.PacketLoginPluginResponse;
+import ua.nanit.limbo.protocol.packets.login.PacketLoginStart;
+import ua.nanit.limbo.protocol.packets.status.PacketStatusPing;
+import ua.nanit.limbo.protocol.packets.status.PacketStatusRequest;
+import ua.nanit.limbo.protocol.packets.status.PacketStatusResponse;
+import ua.nanit.limbo.server.LimboServer;
+import ua.nanit.limbo.server.Logger;
+import ua.nanit.limbo.util.UuidUtil;
 
 import java.util.concurrent.ThreadLocalRandom;
 

diff --git a/...nit/limbo/connection/PacketSnapshots.java → ...nit/limbo/connection/PacketSnapshots.java b/...nit/limbo/connection/PacketSnapshots.java → ...nit/limbo/connection/PacketSnapshots.java
@@ -15,15 +15,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection;
-
-import ru.nanit.limbo.LimboConstants;
-import ru.nanit.limbo.protocol.PacketSnapshot;
-import ru.nanit.limbo.protocol.packets.login.PacketLoginSuccess;
-import ru.nanit.limbo.protocol.packets.play.*;
-import ru.nanit.limbo.server.LimboServer;
-import ru.nanit.limbo.server.data.Title;
-import ru.nanit.limbo.util.UuidUtil;
+package ua.nanit.limbo.connection;
+
+import ua.nanit.limbo.LimboConstants;
+import ua.nanit.limbo.protocol.PacketSnapshot;
+import ua.nanit.limbo.protocol.packets.login.PacketLoginSuccess;
+import ua.nanit.limbo.protocol.packets.play.*;
+import ua.nanit.limbo.server.LimboServer;
+import ua.nanit.limbo.server.data.Title;
+import ua.nanit.limbo.util.UuidUtil;
 
 import java.util.Collections;
 import java.util.UUID;

diff --git a/...bo/connection/pipeline/PacketDecoder.java → ...bo/connection/pipeline/PacketDecoder.java b/...bo/connection/pipeline/PacketDecoder.java → ...bo/connection/pipeline/PacketDecoder.java
@@ -15,16 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection.pipeline;
+package ua.nanit.limbo.connection.pipeline;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
-import ru.nanit.limbo.protocol.ByteMessage;
-import ru.nanit.limbo.protocol.Packet;
-import ru.nanit.limbo.protocol.registry.State;
-import ru.nanit.limbo.protocol.registry.Version;
-import ru.nanit.limbo.server.Logger;
+import ua.nanit.limbo.protocol.ByteMessage;
+import ua.nanit.limbo.protocol.Packet;
+import ua.nanit.limbo.protocol.registry.State;
+import ua.nanit.limbo.protocol.registry.Version;
+import ua.nanit.limbo.server.Logger;
 
 import java.util.List;
 

diff --git a/...bo/connection/pipeline/PacketEncoder.java → ...bo/connection/pipeline/PacketEncoder.java b/...bo/connection/pipeline/PacketEncoder.java → ...bo/connection/pipeline/PacketEncoder.java
@@ -15,17 +15,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection.pipeline;
+package ua.nanit.limbo.connection.pipeline;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import ru.nanit.limbo.protocol.ByteMessage;
-import ru.nanit.limbo.protocol.Packet;
-import ru.nanit.limbo.protocol.PacketSnapshot;
-import ru.nanit.limbo.protocol.registry.State;
-import ru.nanit.limbo.protocol.registry.Version;
-import ru.nanit.limbo.server.Logger;
+import ua.nanit.limbo.protocol.ByteMessage;
+import ua.nanit.limbo.protocol.Packet;
+import ua.nanit.limbo.protocol.PacketSnapshot;
+import ua.nanit.limbo.protocol.registry.State;
+import ua.nanit.limbo.protocol.registry.Version;
+import ua.nanit.limbo.server.Logger;
 
 public class PacketEncoder extends MessageToByteEncoder<Packet> {
 

diff --git a/...onnection/pipeline/VarIntByteDecoder.java → ...onnection/pipeline/VarIntByteDecoder.java b/...onnection/pipeline/VarIntByteDecoder.java → ...onnection/pipeline/VarIntByteDecoder.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection.pipeline;
+package ua.nanit.limbo.connection.pipeline;
 
 import io.netty.util.ByteProcessor;
 

diff --git a/...nnection/pipeline/VarIntFrameDecoder.java → ...nnection/pipeline/VarIntFrameDecoder.java b/...nnection/pipeline/VarIntFrameDecoder.java → ...nnection/pipeline/VarIntFrameDecoder.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection.pipeline;
+package ua.nanit.limbo.connection.pipeline;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-import ru.nanit.limbo.server.Logger;
+import ua.nanit.limbo.server.Logger;
 
 import java.util.List;
 

diff --git a/...nection/pipeline/VarIntLengthEncoder.java → ...nection/pipeline/VarIntLengthEncoder.java b/...nection/pipeline/VarIntLengthEncoder.java → ...nection/pipeline/VarIntLengthEncoder.java
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.connection.pipeline;
+package ua.nanit.limbo.connection.pipeline;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import ru.nanit.limbo.protocol.ByteMessage;
+import ua.nanit.limbo.protocol.ByteMessage;
 
 @ChannelHandler.Sharable
 public class VarIntLengthEncoder extends MessageToByteEncoder<ByteBuf> {

diff --git a/.../ru/nanit/limbo/protocol/ByteMessage.java → .../ua/nanit/limbo/protocol/ByteMessage.java b/.../ru/nanit/limbo/protocol/ByteMessage.java → .../ua/nanit/limbo/protocol/ByteMessage.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.protocol;
+package ua.nanit.limbo.protocol;
 
 import io.netty.buffer.*;
 import io.netty.handler.codec.DecoderException;

diff --git a/.../java/ru/nanit/limbo/protocol/Packet.java → .../java/ua/nanit/limbo/protocol/Packet.java b/.../java/ru/nanit/limbo/protocol/Packet.java → .../java/ua/nanit/limbo/protocol/Packet.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.protocol;
+package ua.nanit.limbo.protocol;
 
-import ru.nanit.limbo.connection.ClientConnection;
-import ru.nanit.limbo.protocol.registry.Version;
-import ru.nanit.limbo.server.LimboServer;
+import ua.nanit.limbo.connection.ClientConnection;
+import ua.nanit.limbo.protocol.registry.Version;
+import ua.nanit.limbo.server.LimboServer;
 
 public interface Packet {
 

diff --git a/...ava/ru/nanit/limbo/protocol/PacketIn.java → ...ava/ua/nanit/limbo/protocol/PacketIn.java b/...ava/ru/nanit/limbo/protocol/PacketIn.java → ...ava/ua/nanit/limbo/protocol/PacketIn.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo.protocol;
+package ua.nanit.limbo.protocol;
 
-import ru.nanit.limbo.protocol.registry.Version;
+import ua.nanit.limbo.protocol.registry.Version;
 
 public interface PacketIn extends Packet {