Merge branch 'dev/1.4'

README.md

@@ -79,7 +79,7 @@ which will not significantly load the server.
 
 Required software:
 
-* JDK 1.8
+* JDK 1.8+
 * Gradle 7+
 
 To build minimized .jar, go to project root and write in terminal:

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'java'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 group 'ru.nanit'
-version '1.3.2'
+version '1.4'
 
 repositories {
     mavenCentral()
@@ -20,13 +20,13 @@ dependencies {
     implementation 'com.grack:nanojson:1.7'
 }
 
-jar {
+shadowJar {
+    from 'LICENSE'
+
     manifest {
         attributes('Main-Class': 'ru.nanit.limbo.NanoLimbo')
     }
-}
 
-shadowJar {
     minimize()
 }
 

src/main/java/ru/nanit/limbo/LimboConstants.java

@@ -1,8 +1,26 @@
+/*
+ * 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;
 
 public final class LimboConstants {
 
     public static final String VELOCITY_INFO_CHANNEL = "velocity:player_info";
+    public static final String BRAND_CHANNEL = "minecraft:brand";
 
     private LimboConstants() {}
 

src/main/java/ru/nanit/limbo/NanoLimbo.java

@@ -1,3 +1,20 @@
+/*
+ * 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;
 
 import ru.nanit.limbo.server.LimboServer;

src/main/java/ru/nanit/limbo/configuration/LimboConfig.java

@@ -1,3 +1,20 @@
+/*
+ * 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.configuration;
 
 import org.spongepowered.configurate.ConfigurationNode;
@@ -6,6 +23,7 @@
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 import ru.nanit.limbo.server.data.*;
 import ru.nanit.limbo.util.Colors;
+import ru.nanit.limbo.world.Location;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -24,8 +42,11 @@ public final class LimboConfig {
     private int maxPlayers;
     private PingData pingData;
 
+    private boolean useSchematic;
+    private Path schematicPath;
+
     private String dimensionType;
-    private Position spawnPosition;
+    private Location spawnPosition;
     private int gameMode;
 
     private boolean useBrandName;
@@ -61,14 +82,18 @@ public void load() throws Exception {
         address = conf.node("bind").get(SocketAddress.class);
         maxPlayers = conf.node("maxPlayers").getInt();
         pingData = conf.node("ping").get(PingData.class);
+        //useSchematic = conf.node("world", "enable").getBoolean(false);
         dimensionType = conf.node("dimension").getString();
-        spawnPosition = conf.node("spawnPosition").get(Position.class);
+        spawnPosition = conf.node("spawnPosition").get(Location.class);
         gameMode = conf.node("gameMode").getInt();
         useBrandName = conf.node("brandName", "enable").getBoolean();
         useJoinMessage = conf.node("joinMessage", "enable").getBoolean();
         useBossBar = conf.node("bossBar", "enable").getBoolean();
         useTitle = conf.node("title", "enable").getBoolean();
 
+        /*if (useSchematic)
+            schematicPath = Paths.get(conf.node("world", "path").getString("./spawn.schem"));*/
+
         if(useBrandName)
             brandName = conf.node("brandName", "content").getString();
 
@@ -113,7 +138,7 @@ private TypeSerializerCollection getSerializers() {
                 .register(PingData.class, new PingData.Serializer())
                 .register(BossBar.class, new BossBar.Serializer())
                 .register(Title.class, new Title.Serializer())
-                .register(Position.class, new Position.Serializer())
+                .register(Location.class, new Location.Serializer())
                 .build();
     }
 
@@ -129,11 +154,19 @@ public PingData getPingData() {
         return pingData;
     }
 
+    public boolean isUseSchematic() {
+        return useSchematic;
+    }
+
+    public Path getSchematicPath() {
+        return schematicPath;
+    }
+
     public String getDimensionType() {
         return dimensionType;
     }
 
-    public Position getSpawnPosition() {
+    public Location getSpawnPosition() {
         return spawnPosition;
     }
 

src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java

@@ -1,3 +1,20 @@
+/*
+ * 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.configuration;
 
 import org.checkerframework.checker.nullness.qual.Nullable;

src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java

@@ -1,3 +1,20 @@
+/*
+ * 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 io.netty.channel.Channel;

src/main/java/ru/nanit/limbo/connection/ClientConnection.java

@@ -1,3 +1,20 @@
+/*
+ * 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 com.grack.nanojson.JsonArray;
@@ -421,7 +438,7 @@ public static void initPackets(LimboServer server) {
 
         if (server.getConfig().isUseBrandName()){
             PacketPluginMessage pluginMessage = new PacketPluginMessage();
-            pluginMessage.setChannel("minecraft:brand");
+            pluginMessage.setChannel(LimboConstants.BRAND_CHANNEL);
             pluginMessage.setMessage(server.getConfig().getBrandName());
             PACKET_PLUGIN_MESSAGE = PacketSnapshot.of(pluginMessage);
         }

src/main/java/ru/nanit/limbo/connection/GameProfile.java

@@ -1,3 +1,20 @@
+/*
+ * 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;

src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java

@@ -1,3 +1,20 @@
+/*
+ * 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.pipeline;
 
 import io.netty.buffer.ByteBuf;

src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java

@@ -1,3 +1,20 @@
+/*
+ * 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.pipeline;
 
 import io.netty.buffer.ByteBuf;

src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java

@@ -1,3 +1,20 @@
+/*
+ * 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.pipeline;
 
 import io.netty.util.ByteProcessor;

src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java

@@ -1,3 +1,20 @@
+/*
+ * 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.pipeline;
 
 import io.netty.buffer.ByteBuf;

src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java

@@ -1,3 +1,20 @@
+/*
+ * 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.pipeline;
 
 import io.netty.buffer.ByteBuf;