Merge pull request #2 from U61vashka/dev

NanoLimbo 1.5 support
bivashy · Dec 11, 2022 · 27783a1 · 27783a1
2 parents b4a1055 + b9d25d7
commit 27783a1
Show file tree

Hide file tree

Showing 83 changed files with 603 additions and 575 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ The general features:
 
 Symbol `X` means all minor versions.
 
+- [x] 1.7.X
 - [x] 1.8.X
 - [x] 1.9.X
 - [x] 1.10.X
@@ -35,6 +36,8 @@ Symbol `X` means all minor versions.
 - [x] 1.18.X
 - [x] 1.19
 - [x] 1.19.1
+- [x] 1.19.2
+- [x] 1.19.3
 
 The server **doesn't** support snapshots.
 
@@ -87,7 +90,7 @@ Required software:
 To build minimized .jar, go to project root and write in terminal:
 
 ```
-gradlew shadowJar
+./gradlew shadowJar
 ```
 
 ### Contacts

diff --git a/api/build.gradle b/api/build.gradle
@@ -8,6 +8,6 @@ dependencies {
 
 shadowJar{
     manifest {
-        attributes 'Main-Class': 'ru.nanit.limbo.NanoLimbo'
+        attributes 'Main-Class': 'ua.nanit.limbo.NanoLimbo'
     }
 }
diff --git a/api/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java b/api/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java
diff --git a/api/src/main/java/ru/nanit/limbo/world/Location.java b/api/src/main/java/ru/nanit/limbo/world/Location.java
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/...c/main/java/ru/nanit/limbo/NanoLimbo.java → ...c/main/java/ua/nanit/limbo/NanoLimbo.java b/...c/main/java/ru/nanit/limbo/NanoLimbo.java → ...c/main/java/ua/nanit/limbo/NanoLimbo.java
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ru.nanit.limbo;
+package ua.nanit.limbo;
 
 import java.nio.file.Paths;
 
-import ru.nanit.limbo.configuration.YamlLimboConfig;
-import ru.nanit.limbo.server.ConsoleCommandHandler;
-import ru.nanit.limbo.server.LimboServer;
-import ru.nanit.limbo.server.Logger;
+import ua.nanit.limbo.configuration.YamlLimboConfig;
+import ua.nanit.limbo.server.ConsoleCommandHandler;
+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
@@ -1,12 +1,11 @@
-package ru.nanit.limbo.configuration;
+package ua.nanit.limbo.configuration;
 
 import java.net.SocketAddress;
 
-import ru.nanit.limbo.server.data.BossBar;
-import ru.nanit.limbo.server.data.InfoForwarding;
-import ru.nanit.limbo.server.data.PingData;
-import ru.nanit.limbo.server.data.Title;
-import ru.nanit.limbo.world.Location;
+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;
 
 public interface LimboConfig {
     SocketAddress getAddress();
@@ -17,8 +16,6 @@ public interface LimboConfig {
 
     String getDimensionType();
 
-    Location getSpawnPosition();
-
     int getGameMode();
 
     InfoForwarding getInfoForwarding();

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/.../limbo/configuration/YamlLimboConfig.java → .../limbo/configuration/YamlLimboConfig.java b/.../limbo/configuration/YamlLimboConfig.java → .../limbo/configuration/YamlLimboConfig.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 java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -31,12 +31,11 @@
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
-import ru.nanit.limbo.server.data.BossBar;
-import ru.nanit.limbo.server.data.InfoForwarding;
-import ru.nanit.limbo.server.data.PingData;
-import ru.nanit.limbo.server.data.Title;
-import ru.nanit.limbo.util.Colors;
-import ru.nanit.limbo.world.Location;
+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 ua.nanit.limbo.util.Colors;
 
 public final class YamlLimboConfig implements LimboConfig {
 
@@ -48,7 +47,6 @@ public final class YamlLimboConfig implements LimboConfig {
     private PingData pingData;
 
     private String dimensionType;
-    private Location spawnPosition;
     private int gameMode;
 
     private boolean useBrandName;
@@ -99,7 +97,6 @@ public YamlLimboConfig load() throws Exception {
         if (dimensionType.equalsIgnoreCase("end")) {
             dimensionType = "the_end";
         }
-        spawnPosition = conf.node("spawnPosition").get(Location.class);
         gameMode = conf.node("gameMode").getInt();
         useBrandName = conf.node("brandName", "enable").getBoolean();
         useJoinMessage = conf.node("joinMessage", "enable").getBoolean();
@@ -159,7 +156,6 @@ private TypeSerializerCollection getSerializers() {
                 .register(PingData.class, new PingData.Serializer())
                 .register(BossBar.class, new BossBar.Serializer())
                 .register(Title.class, new Title.Serializer())
-                .register(Location.class, new Location.Serializer())
                 .build();
     }
 
@@ -183,11 +179,6 @@ public String getDimensionType() {
         return dimensionType;
     }
 
-    @Override
-    public Location getSpawnPosition() {
-        return spawnPosition;
-    }
-
     @Override
     public int getGameMode() {
         return gameMode;
@@ -287,4 +278,4 @@ public int getBossGroupSize() {
     public int getWorkerGroupSize() {
         return workerGroupSize;
     }
-}
+}
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;