From 86f22ffc76714f4be298532f74c5d1df7c3e4dfd Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 12 Aug 2018 19:23:32 +0300 Subject: [PATCH] optimize imports --- core/src/main/java/mc/core/GameLoop.java | 3 +-- core/src/main/java/mc/core/Main.java | 2 -- core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java | 1 - core/src/main/java/mc/core/serialization/IChunkReader.java | 2 +- core/src/test/java/mc/core/EntityLocationTest.java | 2 +- flat_world/src/main/java/mc/world/flat/FlatWorld.java | 5 ++++- .../src/main/java/mc/world/flat/SimpleChunkSection.java | 2 +- .../core/network/proto_1_12_2/packets/ChunkDataPacket.java | 2 +- .../core/network/proto_1_12_2/packets/KeepAlivePacket.java | 5 ++++- .../mc/core/network/proto_1_12_2/packets/PingPacket.java | 5 ++++- .../network/proto_1_12_2/packets/PluginMessagePacket.java | 5 ++++- .../mc/core/network/proto_1_12_2/netty/PacketEncoder.java | 2 +- .../network/proto_1_12_2/netty/handlers/PlayHandler.java | 3 +-- 13 files changed, 23 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index e4a141d..b9581dc 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -7,9 +7,8 @@ package mc.core; import com.google.common.eventbus.Subscribe; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.events.EventBusGetter; import mc.core.events.CS_PlayerMoveEvent; -import mc.core.events.SC_PlayerMoveEvent; +import mc.core.events.EventBusGetter; import mc.core.player.PlayerManager; import mc.core.time.TimeProcessor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/main/java/mc/core/Main.java b/core/src/main/java/mc/core/Main.java index 9869da9..211f210 100644 --- a/core/src/main/java/mc/core/Main.java +++ b/core/src/main/java/mc/core/Main.java @@ -9,10 +9,8 @@ import mc.core.network.Server; import mc.core.network.StartServerException; import org.apache.commons.io.IOUtils; import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; diff --git a/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java b/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java index e8c8274..5b8b08b 100644 --- a/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java +++ b/core/src/main/java/mc/core/events/CS_PlayerMoveEvent.java @@ -8,7 +8,6 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import mc.core.EntityLocation; -import mc.core.Location; import mc.core.player.Player; @RequiredArgsConstructor diff --git a/core/src/main/java/mc/core/serialization/IChunkReader.java b/core/src/main/java/mc/core/serialization/IChunkReader.java index 386f2ff..ad11c5a 100644 --- a/core/src/main/java/mc/core/serialization/IChunkReader.java +++ b/core/src/main/java/mc/core/serialization/IChunkReader.java @@ -1,7 +1,7 @@ package mc.core.serialization; -import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; +import mc.core.world.chunk.ChunkSection; import java.io.IOException; diff --git a/core/src/test/java/mc/core/EntityLocationTest.java b/core/src/test/java/mc/core/EntityLocationTest.java index f366759..7adfc7f 100644 --- a/core/src/test/java/mc/core/EntityLocationTest.java +++ b/core/src/test/java/mc/core/EntityLocationTest.java @@ -1,10 +1,10 @@ package mc.core; import com.flowpowered.nbt.Tag; -import mc.core.world.chunk.ChunkSection; import mc.core.world.IWorldType; import mc.core.world.Region; import mc.core.world.World; +import mc.core.world.chunk.ChunkSection; import org.junit.Assert; import org.junit.Test; diff --git a/flat_world/src/main/java/mc/world/flat/FlatWorld.java b/flat_world/src/main/java/mc/world/flat/FlatWorld.java index 069a2b3..362dfda 100644 --- a/flat_world/src/main/java/mc/world/flat/FlatWorld.java +++ b/flat_world/src/main/java/mc/world/flat/FlatWorld.java @@ -8,7 +8,10 @@ import com.flowpowered.nbt.Tag; import lombok.Getter; import lombok.Setter; import mc.core.EntityLocation; -import mc.core.world.*; +import mc.core.world.IWorldType; +import mc.core.world.Region; +import mc.core.world.World; +import mc.core.world.WorldType; import mc.core.world.chunk.ChunkSection; import java.util.UUID; diff --git a/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java b/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java index fee4045..73e47f1 100644 --- a/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java +++ b/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java @@ -5,12 +5,12 @@ package mc.world.flat; import mc.core.world.Biome; -import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import mc.core.world.World; import mc.core.world.block.Block; import mc.core.world.block.BlockFactory; import mc.core.world.block.BlockType; +import mc.core.world.chunk.ChunkSection; public class SimpleChunkSection implements ChunkSection { @Override diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java index 818932c..ff94732 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java @@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream; -import mc.core.world.chunk.ChunkSection; import mc.core.world.block.Block; +import mc.core.world.chunk.ChunkSection; import java.util.ArrayList; import java.util.List; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java index c41ae76..bb4ed23 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java @@ -8,7 +8,10 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; -import mc.core.network.*; +import mc.core.network.CSPacket; +import mc.core.network.NetInputStream; +import mc.core.network.NetOutputStream; +import mc.core.network.SCPacket; @AllArgsConstructor @NoArgsConstructor diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java index 5bd0c25..3f63723 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java @@ -5,7 +5,10 @@ package mc.core.network.proto_1_12_2.packets; import lombok.ToString; -import mc.core.network.*; +import mc.core.network.CSPacket; +import mc.core.network.NetInputStream; +import mc.core.network.NetOutputStream; +import mc.core.network.SCPacket; @ToString public class PingPacket implements CSPacket, SCPacket { diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java index b10208d..cef386f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java @@ -5,7 +5,10 @@ package mc.core.network.proto_1_12_2.packets; import lombok.*; -import mc.core.network.*; +import mc.core.network.CSPacket; +import mc.core.network.NetInputStream; +import mc.core.network.NetOutputStream; +import mc.core.network.SCPacket; @AllArgsConstructor @NoArgsConstructor diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java index f2a9a9d..7e92a18 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java @@ -10,8 +10,8 @@ import io.netty.handler.codec.MessageToByteEncoder; import lombok.extern.slf4j.Slf4j; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.State; import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream; +import mc.core.network.proto_1_12_2.State; import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetOutputStream; import static mc.core.network.proto_1_12_2.netty.NettyServer.ATTR_STATE; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java index b48e6f6..a677bb5 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java @@ -7,10 +7,9 @@ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import mc.core.EntityLocation; -import mc.core.Location; import mc.core.chat.ChatProcessor; -import mc.core.events.EventBusGetter; import mc.core.events.CS_PlayerMoveEvent; +import mc.core.events.EventBusGetter; import mc.core.network.proto_1_12_2.TeleportManager; import mc.core.network.proto_1_12_2.packets.*; import mc.core.player.Player;