diff --git a/build.gradle b/build.gradle index 4cca1c59..6699a79a 100644 --- 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/src/main/java/ru/nanit/limbo/LimboConstants.java b/src/main/java/ua/nanit/limbo/LimboConstants.java similarity index 97% rename from src/main/java/ru/nanit/limbo/LimboConstants.java rename to src/main/java/ua/nanit/limbo/LimboConstants.java index 0c3d5b24..25eb72fc 100644 --- a/src/main/java/ru/nanit/limbo/LimboConstants.java +++ b/src/main/java/ua/nanit/limbo/LimboConstants.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo; +package ua.nanit.limbo; public final class LimboConstants { diff --git a/src/main/java/ru/nanit/limbo/NanoLimbo.java b/src/main/java/ua/nanit/limbo/NanoLimbo.java similarity index 89% rename from src/main/java/ru/nanit/limbo/NanoLimbo.java rename to src/main/java/ua/nanit/limbo/NanoLimbo.java index dbcee427..25a580a0 100644 --- a/src/main/java/ru/nanit/limbo/NanoLimbo.java +++ b/src/main/java/ua/nanit/limbo/NanoLimbo.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java b/src/main/java/ua/nanit/limbo/configuration/LimboConfig.java similarity index 96% rename from src/main/java/ru/nanit/limbo/configuration/LimboConfig.java rename to src/main/java/ua/nanit/limbo/configuration/LimboConfig.java index 78cdb124..56026327 100644 --- a/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java +++ b/src/main/java/ua/nanit/limbo/configuration/LimboConfig.java @@ -15,14 +15,17 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java b/src/main/java/ua/nanit/limbo/configuration/SocketAddressSerializer.java similarity index 97% rename from src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java rename to src/main/java/ua/nanit/limbo/configuration/SocketAddressSerializer.java index 18e737e6..66b4d0a0 100644 --- a/src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java +++ b/src/main/java/ua/nanit/limbo/configuration/SocketAddressSerializer.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java b/src/main/java/ua/nanit/limbo/connection/ClientChannelInitializer.java similarity index 85% rename from src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java rename to src/main/java/ua/nanit/limbo/connection/ClientChannelInitializer.java index c3946061..7972e0b0 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java +++ b/src/main/java/ua/nanit/limbo/connection/ClientChannelInitializer.java @@ -15,17 +15,17 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ua/nanit/limbo/connection/ClientConnection.java similarity index 94% rename from src/main/java/ru/nanit/limbo/connection/ClientConnection.java rename to src/main/java/ua/nanit/limbo/connection/ClientConnection.java index aca01ec5..7e0c74d5 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ua/nanit/limbo/connection/ClientConnection.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/GameProfile.java b/src/main/java/ua/nanit/limbo/connection/GameProfile.java similarity index 93% rename from src/main/java/ru/nanit/limbo/connection/GameProfile.java rename to src/main/java/ua/nanit/limbo/connection/GameProfile.java index 7d3dde77..b1376457 100644 --- a/src/main/java/ru/nanit/limbo/connection/GameProfile.java +++ b/src/main/java/ua/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 . - */ - -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 . + */ + +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/src/main/java/ru/nanit/limbo/connection/PacketHandler.java b/src/main/java/ua/nanit/limbo/connection/PacketHandler.java similarity index 87% rename from src/main/java/ru/nanit/limbo/connection/PacketHandler.java rename to src/main/java/ua/nanit/limbo/connection/PacketHandler.java index 48c6aa12..3e22a341 100644 --- a/src/main/java/ru/nanit/limbo/connection/PacketHandler.java +++ b/src/main/java/ua/nanit/limbo/connection/PacketHandler.java @@ -15,20 +15,20 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java b/src/main/java/ua/nanit/limbo/connection/PacketSnapshots.java similarity index 95% rename from src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java rename to src/main/java/ua/nanit/limbo/connection/PacketSnapshots.java index c1ab3bd5..5559a622 100644 --- a/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java +++ b/src/main/java/ua/nanit/limbo/connection/PacketSnapshots.java @@ -15,15 +15,15 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java b/src/main/java/ua/nanit/limbo/connection/pipeline/PacketDecoder.java similarity index 89% rename from src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java rename to src/main/java/ua/nanit/limbo/connection/pipeline/PacketDecoder.java index 8f8ba495..43aaffb5 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java +++ b/src/main/java/ua/nanit/limbo/connection/pipeline/PacketDecoder.java @@ -15,16 +15,16 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java b/src/main/java/ua/nanit/limbo/connection/pipeline/PacketEncoder.java similarity index 88% rename from src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java rename to src/main/java/ua/nanit/limbo/connection/pipeline/PacketEncoder.java index 4885aa8e..d3a137c0 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java +++ b/src/main/java/ua/nanit/limbo/connection/pipeline/PacketEncoder.java @@ -15,17 +15,17 @@ * along with this program. If not, see . */ -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 { diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java b/src/main/java/ua/nanit/limbo/connection/pipeline/VarIntByteDecoder.java similarity index 97% rename from src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java rename to src/main/java/ua/nanit/limbo/connection/pipeline/VarIntByteDecoder.java index 2f9a611b..17a856a7 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java +++ b/src/main/java/ua/nanit/limbo/connection/pipeline/VarIntByteDecoder.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.connection.pipeline; +package ua.nanit.limbo.connection.pipeline; import io.netty.util.ByteProcessor; diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java b/src/main/java/ua/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java similarity index 96% rename from src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java rename to src/main/java/ua/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java index 4160928c..9ee2ac12 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java +++ b/src/main/java/ua/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java b/src/main/java/ua/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java similarity index 94% rename from src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java rename to src/main/java/ua/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java index 940c42fd..d61fbdf3 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java +++ b/src/main/java/ua/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -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 { diff --git a/src/main/java/ru/nanit/limbo/protocol/ByteMessage.java b/src/main/java/ua/nanit/limbo/protocol/ByteMessage.java similarity index 99% rename from src/main/java/ru/nanit/limbo/protocol/ByteMessage.java rename to src/main/java/ua/nanit/limbo/protocol/ByteMessage.java index edc59958..b4b0128a 100644 --- a/src/main/java/ru/nanit/limbo/protocol/ByteMessage.java +++ b/src/main/java/ua/nanit/limbo/protocol/ByteMessage.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol; +package ua.nanit.limbo.protocol; import io.netty.buffer.*; import io.netty.handler.codec.DecoderException; diff --git a/src/main/java/ru/nanit/limbo/protocol/Packet.java b/src/main/java/ua/nanit/limbo/protocol/Packet.java similarity index 84% rename from src/main/java/ru/nanit/limbo/protocol/Packet.java rename to src/main/java/ua/nanit/limbo/protocol/Packet.java index 26638608..002c653f 100644 --- a/src/main/java/ru/nanit/limbo/protocol/Packet.java +++ b/src/main/java/ua/nanit/limbo/protocol/Packet.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -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/src/main/java/ru/nanit/limbo/protocol/PacketIn.java b/src/main/java/ua/nanit/limbo/protocol/PacketIn.java similarity index 91% rename from src/main/java/ru/nanit/limbo/protocol/PacketIn.java rename to src/main/java/ua/nanit/limbo/protocol/PacketIn.java index ed451974..6d4734bd 100644 --- a/src/main/java/ru/nanit/limbo/protocol/PacketIn.java +++ b/src/main/java/ua/nanit/limbo/protocol/PacketIn.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -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 { diff --git a/src/main/java/ru/nanit/limbo/protocol/PacketOut.java b/src/main/java/ua/nanit/limbo/protocol/PacketOut.java similarity index 91% rename from src/main/java/ru/nanit/limbo/protocol/PacketOut.java rename to src/main/java/ua/nanit/limbo/protocol/PacketOut.java index 9d7d9c42..de676272 100644 --- a/src/main/java/ru/nanit/limbo/protocol/PacketOut.java +++ b/src/main/java/ua/nanit/limbo/protocol/PacketOut.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -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 PacketOut extends Packet { diff --git a/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java b/src/main/java/ua/nanit/limbo/protocol/PacketSnapshot.java similarity index 97% rename from src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java rename to src/main/java/ua/nanit/limbo/protocol/PacketSnapshot.java index 2be6f013..9f0fe0e1 100644 --- a/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java +++ b/src/main/java/ua/nanit/limbo/protocol/PacketSnapshot.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol; +package ua.nanit.limbo.protocol; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.registry.Version; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/PacketHandshake.java b/src/main/java/ua/nanit/limbo/protocol/packets/PacketHandshake.java similarity index 81% rename from src/main/java/ru/nanit/limbo/protocol/packets/PacketHandshake.java rename to src/main/java/ua/nanit/limbo/protocol/packets/PacketHandshake.java index 3e0157b9..7ecf539c 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/PacketHandshake.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/PacketHandshake.java @@ -15,16 +15,14 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets; +package ua.nanit.limbo.protocol.packets; -import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketIn; -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.ClientConnection; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketIn; +import ua.nanit.limbo.protocol.registry.State; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.LimboServer; public class PacketHandshake implements PacketIn { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketDisconnect.java b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketDisconnect.java similarity index 85% rename from src/main/java/ru/nanit/limbo/protocol/packets/login/PacketDisconnect.java rename to src/main/java/ua/nanit/limbo/protocol/packets/login/PacketDisconnect.java index 2ba8b851..38236448 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketDisconnect.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketDisconnect.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.login; +package ua.nanit.limbo.protocol.packets.login; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketDisconnect implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginRequest.java b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginPluginRequest.java similarity index 88% rename from src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginRequest.java rename to src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginPluginRequest.java index 68b80c44..856a001a 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginRequest.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginPluginRequest.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.login; +package ua.nanit.limbo.protocol.packets.login; import io.netty.buffer.ByteBuf; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketLoginPluginRequest implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java similarity index 85% rename from src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java rename to src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java index c0ab46aa..b25e7334 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.login; +package ua.nanit.limbo.protocol.packets.login; -import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketIn; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.connection.ClientConnection; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketIn; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.LimboServer; public class PacketLoginPluginResponse implements PacketIn { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginStart.java b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginStart.java similarity index 81% rename from src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginStart.java rename to src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginStart.java index c555a623..5a04dc3a 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginStart.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginStart.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.login; +package ua.nanit.limbo.protocol.packets.login; -import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketIn; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.connection.ClientConnection; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketIn; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.LimboServer; public class PacketLoginStart implements PacketIn { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginSuccess.java b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginSuccess.java similarity index 89% rename from src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginSuccess.java rename to src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginSuccess.java index 6159c9f3..a07dd2ae 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginSuccess.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/login/PacketLoginSuccess.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.login; +package ua.nanit.limbo.protocol.packets.login; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; import java.util.UUID; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketBossBar.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketBossBar.java similarity index 86% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketBossBar.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketBossBar.java index 8361ad20..68201a72 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketBossBar.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketBossBar.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.data.BossBar; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.data.BossBar; import java.util.UUID; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketChatMessage.java similarity index 91% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketChatMessage.java index 21c57aad..2883ac9c 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketChatMessage.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; import java.util.UUID; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java similarity index 91% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java index fa4cf6f3..b0c717d6 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; import java.util.List; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketJoinGame.java similarity index 97% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketJoinGame.java index 3017ce6f..b8465d29 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketJoinGame.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.world.DimensionRegistry; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.world.DimensionRegistry; public class PacketJoinGame implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketKeepAlive.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketKeepAlive.java similarity index 90% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketKeepAlive.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketKeepAlive.java index 133ef328..f18d398a 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketKeepAlive.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketKeepAlive.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.Packet; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.Packet; +import ua.nanit.limbo.protocol.registry.Version; public class PacketKeepAlive implements Packet { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerAbilities.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerAbilities.java similarity index 85% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerAbilities.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerAbilities.java index 49e80688..f98c1446 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerAbilities.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerAbilities.java @@ -1,49 +1,49 @@ -/* - * 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 . - */ - -package ru.nanit.limbo.protocol.packets.play; - -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; - -public class PacketPlayerAbilities implements PacketOut { - - private int flags = 0x02; - private float flyingSpeed = 0.0F; - private float fieldOfView = 0.1F; - - public void setFlags(int flags) { - this.flags = flags; - } - - public void setFlyingSpeed(float flyingSpeed) { - this.flyingSpeed = flyingSpeed; - } - - public void setFieldOfView(float fieldOfView) { - this.fieldOfView = fieldOfView; - } - - @Override - public void encode(ByteMessage msg, Version version) { - msg.writeByte(flags); - msg.writeFloat(flyingSpeed); - msg.writeFloat(fieldOfView); - } - -} +/* + * 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 . + */ + +package ua.nanit.limbo.protocol.packets.play; + +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; + +public class PacketPlayerAbilities implements PacketOut { + + private int flags = 0x02; + private float flyingSpeed = 0.0F; + private float fieldOfView = 0.1F; + + public void setFlags(int flags) { + this.flags = flags; + } + + public void setFlyingSpeed(float flyingSpeed) { + this.flyingSpeed = flyingSpeed; + } + + public void setFieldOfView(float fieldOfView) { + this.fieldOfView = fieldOfView; + } + + @Override + public void encode(ByteMessage msg, Version version) { + msg.writeByte(flags); + msg.writeFloat(flyingSpeed); + msg.writeFloat(fieldOfView); + } + +} diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java similarity index 93% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java index 17f0d055..1de11f95 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; import java.util.EnumSet; import java.util.UUID; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerListHeader.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerListHeader.java similarity index 85% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerListHeader.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerListHeader.java index c4e4cb61..2fe062ca 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerListHeader.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerListHeader.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketPlayerListHeader implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerPositionAndLook.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerPositionAndLook.java similarity index 91% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerPositionAndLook.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerPositionAndLook.java index defec5d3..f907bc3d 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerPositionAndLook.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPlayerPositionAndLook.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketPlayerPositionAndLook implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPluginMessage.java similarity index 86% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPluginMessage.java index 1563775d..753b741a 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPluginMessage.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketPluginMessage.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketPluginMessage implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketSpawnPosition.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketSpawnPosition.java similarity index 69% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketSpawnPosition.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketSpawnPosition.java index 5723fdeb..871334d0 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketSpawnPosition.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketSpawnPosition.java @@ -1,10 +1,10 @@ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; -public class PacketSpawnPosition implements PacketOut { +public class PacketSpawnPosition implements PacketOut { private long x; private long y; diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleLegacy.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleLegacy.java similarity index 91% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleLegacy.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleLegacy.java index ff105ac3..f40b85a0 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleLegacy.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleLegacy.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.data.Title; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.data.Title; public class PacketTitleLegacy implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleSetSubTitle.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleSetSubTitle.java similarity index 84% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleSetSubTitle.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleSetSubTitle.java index 845412ab..1800eaff 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleSetSubTitle.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleSetSubTitle.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketTitleSetSubTitle implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleSetTitle.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleSetTitle.java similarity index 84% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleSetTitle.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleSetTitle.java index 8c327161..6961201b 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleSetTitle.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleSetTitle.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketTitleSetTitle implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleTimes.java b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleTimes.java similarity index 87% rename from src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleTimes.java rename to src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleTimes.java index 5e46dfff..2530d6a6 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketTitleTimes.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketTitleTimes.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.play; +package ua.nanit.limbo.protocol.packets.play; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; public class PacketTitleTimes implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusPing.java b/src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusPing.java similarity index 81% rename from src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusPing.java rename to src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusPing.java index 684ed899..5c07b5d2 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusPing.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusPing.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.status; +package ua.nanit.limbo.protocol.packets.status; -import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.Packet; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.connection.ClientConnection; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.Packet; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.LimboServer; public class PacketStatusPing implements Packet { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusRequest.java b/src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusRequest.java similarity index 79% rename from src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusRequest.java rename to src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusRequest.java index 9865b358..6565a653 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusRequest.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusRequest.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.status; +package ua.nanit.limbo.protocol.packets.status; -import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketIn; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.connection.ClientConnection; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketIn; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.LimboServer; public class PacketStatusRequest implements PacketIn { diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java b/src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusResponse.java similarity index 89% rename from src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java rename to src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusResponse.java index 3655af17..e1e2c440 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java +++ b/src/main/java/ua/nanit/limbo/protocol/packets/status/PacketStatusResponse.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.packets.status; +package ua.nanit.limbo.protocol.packets.status; -import ru.nanit.limbo.protocol.ByteMessage; -import ru.nanit.limbo.protocol.PacketOut; -import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.protocol.ByteMessage; +import ua.nanit.limbo.protocol.PacketOut; +import ua.nanit.limbo.protocol.registry.Version; +import ua.nanit.limbo.server.LimboServer; public class PacketStatusResponse implements PacketOut { diff --git a/src/main/java/ru/nanit/limbo/protocol/registry/State.java b/src/main/java/ua/nanit/limbo/protocol/registry/State.java similarity index 96% rename from src/main/java/ru/nanit/limbo/protocol/registry/State.java rename to src/main/java/ua/nanit/limbo/protocol/registry/State.java index 73a0e93e..49477d3e 100644 --- a/src/main/java/ru/nanit/limbo/protocol/registry/State.java +++ b/src/main/java/ua/nanit/limbo/protocol/registry/State.java @@ -15,20 +15,20 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.registry; +package ua.nanit.limbo.protocol.registry; -import ru.nanit.limbo.protocol.Packet; -import ru.nanit.limbo.protocol.packets.PacketHandshake; -import ru.nanit.limbo.protocol.packets.login.*; -import ru.nanit.limbo.protocol.packets.play.*; -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 ua.nanit.limbo.protocol.Packet; +import ua.nanit.limbo.protocol.packets.PacketHandshake; +import ua.nanit.limbo.protocol.packets.login.*; +import ua.nanit.limbo.protocol.packets.play.*; +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 java.util.*; import java.util.function.Supplier; -import static ru.nanit.limbo.protocol.registry.Version.*; +import static ua.nanit.limbo.protocol.registry.Version.*; public enum State { diff --git a/src/main/java/ru/nanit/limbo/protocol/registry/Version.java b/src/main/java/ua/nanit/limbo/protocol/registry/Version.java similarity index 98% rename from src/main/java/ru/nanit/limbo/protocol/registry/Version.java rename to src/main/java/ua/nanit/limbo/protocol/registry/Version.java index 57165f71..674b87f0 100644 --- a/src/main/java/ru/nanit/limbo/protocol/registry/Version.java +++ b/src/main/java/ua/nanit/limbo/protocol/registry/Version.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.protocol.registry; +package ua.nanit.limbo.protocol.registry; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/ru/nanit/limbo/server/Command.java b/src/main/java/ua/nanit/limbo/server/Command.java similarity index 71% rename from src/main/java/ru/nanit/limbo/server/Command.java rename to src/main/java/ua/nanit/limbo/server/Command.java index c1c7419e..39f787f1 100644 --- a/src/main/java/ru/nanit/limbo/server/Command.java +++ b/src/main/java/ua/nanit/limbo/server/Command.java @@ -1,4 +1,4 @@ -package ru.nanit.limbo.server; +package ua.nanit.limbo.server; public interface Command { diff --git a/src/main/java/ru/nanit/limbo/server/CommandManager.java b/src/main/java/ua/nanit/limbo/server/CommandManager.java similarity index 86% rename from src/main/java/ru/nanit/limbo/server/CommandManager.java rename to src/main/java/ua/nanit/limbo/server/CommandManager.java index e05fc18d..2cb0c82b 100644 --- a/src/main/java/ru/nanit/limbo/server/CommandManager.java +++ b/src/main/java/ua/nanit/limbo/server/CommandManager.java @@ -1,9 +1,9 @@ -package ru.nanit.limbo.server; +package ua.nanit.limbo.server; -import ru.nanit.limbo.server.commands.CmdConn; -import ru.nanit.limbo.server.commands.CmdHelp; -import ru.nanit.limbo.server.commands.CmdMem; -import ru.nanit.limbo.server.commands.CmdStop; +import ua.nanit.limbo.server.commands.CmdConn; +import ua.nanit.limbo.server.commands.CmdHelp; +import ua.nanit.limbo.server.commands.CmdMem; +import ua.nanit.limbo.server.commands.CmdStop; import java.util.*; diff --git a/src/main/java/ru/nanit/limbo/server/Connections.java b/src/main/java/ua/nanit/limbo/server/Connections.java similarity index 95% rename from src/main/java/ru/nanit/limbo/server/Connections.java rename to src/main/java/ua/nanit/limbo/server/Connections.java index 61e9c040..710f2006 100644 --- a/src/main/java/ru/nanit/limbo/server/Connections.java +++ b/src/main/java/ua/nanit/limbo/server/Connections.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server; +package ua.nanit.limbo.server; -import ru.nanit.limbo.connection.ClientConnection; +import ua.nanit.limbo.connection.ClientConnection; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/ru/nanit/limbo/server/LimboServer.java b/src/main/java/ua/nanit/limbo/server/LimboServer.java similarity index 93% rename from src/main/java/ru/nanit/limbo/server/LimboServer.java rename to src/main/java/ua/nanit/limbo/server/LimboServer.java index 6d8ab3ce..3616303b 100644 --- a/src/main/java/ru/nanit/limbo/server/LimboServer.java +++ b/src/main/java/ua/nanit/limbo/server/LimboServer.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server; +package ua.nanit.limbo.server; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelOption; @@ -27,12 +27,12 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.util.ResourceLeakDetector; -import ru.nanit.limbo.configuration.LimboConfig; -import ru.nanit.limbo.connection.ClientChannelInitializer; -import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.connection.PacketHandler; -import ru.nanit.limbo.connection.PacketSnapshots; -import ru.nanit.limbo.world.DimensionRegistry; +import ua.nanit.limbo.configuration.LimboConfig; +import ua.nanit.limbo.connection.ClientChannelInitializer; +import ua.nanit.limbo.connection.ClientConnection; +import ua.nanit.limbo.connection.PacketHandler; +import ua.nanit.limbo.connection.PacketSnapshots; +import ua.nanit.limbo.world.DimensionRegistry; import java.nio.file.Paths; import java.util.concurrent.ScheduledFuture; diff --git a/src/main/java/ru/nanit/limbo/server/Logger.java b/src/main/java/ua/nanit/limbo/server/Logger.java similarity index 98% rename from src/main/java/ru/nanit/limbo/server/Logger.java rename to src/main/java/ua/nanit/limbo/server/Logger.java index 14a120d0..46ab0bf0 100644 --- a/src/main/java/ru/nanit/limbo/server/Logger.java +++ b/src/main/java/ua/nanit/limbo/server/Logger.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server; +package ua.nanit.limbo.server; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/ru/nanit/limbo/server/commands/CmdConn.java b/src/main/java/ua/nanit/limbo/server/commands/CmdConn.java similarity index 71% rename from src/main/java/ru/nanit/limbo/server/commands/CmdConn.java rename to src/main/java/ua/nanit/limbo/server/commands/CmdConn.java index b93e6f59..0f779efc 100644 --- a/src/main/java/ru/nanit/limbo/server/commands/CmdConn.java +++ b/src/main/java/ua/nanit/limbo/server/commands/CmdConn.java @@ -1,8 +1,8 @@ -package ru.nanit.limbo.server.commands; +package ua.nanit.limbo.server.commands; -import ru.nanit.limbo.server.Command; -import ru.nanit.limbo.server.LimboServer; -import ru.nanit.limbo.server.Logger; +import ua.nanit.limbo.server.Command; +import ua.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.server.Logger; public class CmdConn implements Command { diff --git a/src/main/java/ru/nanit/limbo/server/commands/CmdHelp.java b/src/main/java/ua/nanit/limbo/server/commands/CmdHelp.java similarity index 79% rename from src/main/java/ru/nanit/limbo/server/commands/CmdHelp.java rename to src/main/java/ua/nanit/limbo/server/commands/CmdHelp.java index 6d25e4a1..6f1e7433 100644 --- a/src/main/java/ru/nanit/limbo/server/commands/CmdHelp.java +++ b/src/main/java/ua/nanit/limbo/server/commands/CmdHelp.java @@ -1,8 +1,8 @@ -package ru.nanit.limbo.server.commands; +package ua.nanit.limbo.server.commands; -import ru.nanit.limbo.server.Command; -import ru.nanit.limbo.server.LimboServer; -import ru.nanit.limbo.server.Logger; +import ua.nanit.limbo.server.Command; +import ua.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.server.Logger; import java.util.Map; diff --git a/src/main/java/ru/nanit/limbo/server/commands/CmdMem.java b/src/main/java/ua/nanit/limbo/server/commands/CmdMem.java similarity index 85% rename from src/main/java/ru/nanit/limbo/server/commands/CmdMem.java rename to src/main/java/ua/nanit/limbo/server/commands/CmdMem.java index bb5f65a4..25e1c438 100644 --- a/src/main/java/ru/nanit/limbo/server/commands/CmdMem.java +++ b/src/main/java/ua/nanit/limbo/server/commands/CmdMem.java @@ -1,7 +1,7 @@ -package ru.nanit.limbo.server.commands; +package ua.nanit.limbo.server.commands; -import ru.nanit.limbo.server.Command; -import ru.nanit.limbo.server.Logger; +import ua.nanit.limbo.server.Command; +import ua.nanit.limbo.server.Logger; public class CmdMem implements Command { diff --git a/src/main/java/ru/nanit/limbo/server/commands/CmdStop.java b/src/main/java/ua/nanit/limbo/server/commands/CmdStop.java similarity index 72% rename from src/main/java/ru/nanit/limbo/server/commands/CmdStop.java rename to src/main/java/ua/nanit/limbo/server/commands/CmdStop.java index 41202115..642df445 100644 --- a/src/main/java/ru/nanit/limbo/server/commands/CmdStop.java +++ b/src/main/java/ua/nanit/limbo/server/commands/CmdStop.java @@ -1,6 +1,6 @@ -package ru.nanit.limbo.server.commands; +package ua.nanit.limbo.server.commands; -import ru.nanit.limbo.server.Command; +import ua.nanit.limbo.server.Command; public class CmdStop implements Command { diff --git a/src/main/java/ru/nanit/limbo/server/data/BossBar.java b/src/main/java/ua/nanit/limbo/server/data/BossBar.java similarity index 98% rename from src/main/java/ru/nanit/limbo/server/data/BossBar.java rename to src/main/java/ua/nanit/limbo/server/data/BossBar.java index d77e89df..aeeab118 100644 --- a/src/main/java/ru/nanit/limbo/server/data/BossBar.java +++ b/src/main/java/ua/nanit/limbo/server/data/BossBar.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server.data; +package ua.nanit.limbo.server.data; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; -import ru.nanit.limbo.util.Colors; +import ua.nanit.limbo.util.Colors; import java.lang.reflect.Type; diff --git a/src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java b/src/main/java/ua/nanit/limbo/server/data/InfoForwarding.java similarity index 98% rename from src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java rename to src/main/java/ua/nanit/limbo/server/data/InfoForwarding.java index f96869f9..e20ad7a5 100644 --- a/src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java +++ b/src/main/java/ua/nanit/limbo/server/data/InfoForwarding.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server.data; +package ua.nanit.limbo.server.data; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.configurate.ConfigurationNode; diff --git a/src/main/java/ru/nanit/limbo/server/data/PingData.java b/src/main/java/ua/nanit/limbo/server/data/PingData.java similarity index 96% rename from src/main/java/ru/nanit/limbo/server/data/PingData.java rename to src/main/java/ua/nanit/limbo/server/data/PingData.java index 435f13e4..602f5b8c 100644 --- a/src/main/java/ru/nanit/limbo/server/data/PingData.java +++ b/src/main/java/ua/nanit/limbo/server/data/PingData.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server.data; +package ua.nanit.limbo.server.data; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.TypeSerializer; -import ru.nanit.limbo.util.Colors; +import ua.nanit.limbo.util.Colors; import java.lang.reflect.Type; diff --git a/src/main/java/ru/nanit/limbo/server/data/Title.java b/src/main/java/ua/nanit/limbo/server/data/Title.java similarity index 97% rename from src/main/java/ru/nanit/limbo/server/data/Title.java rename to src/main/java/ua/nanit/limbo/server/data/Title.java index 28f94cd2..190e8277 100644 --- a/src/main/java/ru/nanit/limbo/server/data/Title.java +++ b/src/main/java/ua/nanit/limbo/server/data/Title.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.server.data; +package ua.nanit.limbo.server.data; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.TypeSerializer; -import ru.nanit.limbo.util.Colors; +import ua.nanit.limbo.util.Colors; import java.lang.reflect.Type; diff --git a/src/main/java/ru/nanit/limbo/util/Colors.java b/src/main/java/ua/nanit/limbo/util/Colors.java similarity index 97% rename from src/main/java/ru/nanit/limbo/util/Colors.java rename to src/main/java/ua/nanit/limbo/util/Colors.java index 0a3e4375..8bf603df 100644 --- a/src/main/java/ru/nanit/limbo/util/Colors.java +++ b/src/main/java/ua/nanit/limbo/util/Colors.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.util; +package ua.nanit.limbo.util; public final class Colors { diff --git a/src/main/java/ru/nanit/limbo/util/UuidUtil.java b/src/main/java/ua/nanit/limbo/util/UuidUtil.java similarity index 97% rename from src/main/java/ru/nanit/limbo/util/UuidUtil.java rename to src/main/java/ua/nanit/limbo/util/UuidUtil.java index 54019a76..377fd787 100644 --- a/src/main/java/ru/nanit/limbo/util/UuidUtil.java +++ b/src/main/java/ua/nanit/limbo/util/UuidUtil.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.util; +package ua.nanit.limbo.util; import java.nio.charset.StandardCharsets; import java.util.UUID; diff --git a/src/main/java/ru/nanit/limbo/world/Dimension.java b/src/main/java/ua/nanit/limbo/world/Dimension.java similarity index 97% rename from src/main/java/ru/nanit/limbo/world/Dimension.java rename to src/main/java/ua/nanit/limbo/world/Dimension.java index 5b3c8156..9b60714e 100644 --- a/src/main/java/ru/nanit/limbo/world/Dimension.java +++ b/src/main/java/ua/nanit/limbo/world/Dimension.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.world; +package ua.nanit.limbo.world; import net.kyori.adventure.nbt.CompoundBinaryTag; diff --git a/src/main/java/ru/nanit/limbo/world/DimensionRegistry.java b/src/main/java/ua/nanit/limbo/world/DimensionRegistry.java similarity index 97% rename from src/main/java/ru/nanit/limbo/world/DimensionRegistry.java rename to src/main/java/ua/nanit/limbo/world/DimensionRegistry.java index eaaa1acd..49b5aa1e 100644 --- a/src/main/java/ru/nanit/limbo/world/DimensionRegistry.java +++ b/src/main/java/ua/nanit/limbo/world/DimensionRegistry.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.world; +package ua.nanit.limbo.world; import net.kyori.adventure.nbt.CompoundBinaryTag; import net.kyori.adventure.nbt.ListBinaryTag; import net.kyori.adventure.nbt.TagStringIO; -import ru.nanit.limbo.server.LimboServer; -import ru.nanit.limbo.server.Logger; +import ua.nanit.limbo.server.LimboServer; +import ua.nanit.limbo.server.Logger; import java.io.*; import java.nio.charset.StandardCharsets;