Tidy up

diff --git a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
index 165493a48a818ee5808aa0897e7af3d3848957e8..2da7b4c817038beb856941589d03415944dba419 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
+++ b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
@@ -3,25 +3,19 @@ package com.irtimaled.bbor.client;
 import com.irtimaled.bbor.client.events.*;
 import com.irtimaled.bbor.client.gui.SettingsScreen;
 import com.irtimaled.bbor.client.keyboard.KeyListener;
-import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.common.CommonProxy;
 import com.irtimaled.bbor.common.EventBus;
 import com.irtimaled.bbor.common.VillageColorCache;
-import com.irtimaled.bbor.common.models.BoundingBox;
-import com.irtimaled.bbor.common.models.BoundingBoxWorldSpawn;
 import com.irtimaled.bbor.config.ConfigManager;
 import com.irtimaled.bbor.config.Setting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.dimension.DimensionType;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import static com.irtimaled.bbor.client.Constants.CHUNK_SIZE;
-
 public class ClientProxy extends CommonProxy {
     public static final String Name = "Bounding Box Outline Reloaded";
     public static boolean active;

diff --git a/src/main/java/com/irtimaled/bbor/common/CommonProxy.java b/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
index 39400e7c0e4e729df3ff8a830a9943766a374255..ced3f96d51a83cc58df4391ab73d3201f351af68 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
+++ b/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
@@ -16,13 +16,10 @@ import io.netty.channel.local.LocalAddress;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.SPacketCustomPayload;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.village.VillageCollection;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.dimension.DimensionType;
-import net.minecraft.world.gen.ChunkProviderServer;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -56,8 +53,7 @@ public class CommonProxy {
     }
 
     private void worldLoaded(World world) {
-        IChunkProvider chunkProvider = world.getChunkProvider();
-        if (chunkProvider instanceof ChunkProviderServer) {
+        if (world instanceof WorldServer) {
             DimensionType dimensionType = world.dimension.getType();
             BoundingBoxCache boundingBoxCache = getOrCreateCache(dimensionType);
             ChunkProcessor chunkProcessor = null;

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/gui/MixinGuiOptions.java b/src/main/java/com/irtimaled/bbor/mixin/client/gui/MixinGuiOptions.java
index 793d72a4a9b01c5514d7e3537b93e722ae377e69..dac769ca3cb66c8a53cd6108b2296301229abcce 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/gui/MixinGuiOptions.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/gui/MixinGuiOptions.java
@@ -1,8 +1,9 @@
 package com.irtimaled.bbor.mixin.client.gui;
 
 import com.irtimaled.bbor.client.gui.SettingsScreenButton;
-import net.minecraft.client.gui.*;
-import net.minecraft.client.resources.I18n;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiOptions;
+import net.minecraft.client.gui.GuiScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java b/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java
index b7f58c63d78442bb37b1ff217a74aa7ac8e86b02..222f2fa6f3c6b05a2c4fe2f45e1394d3279791d1 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java
@@ -5,8 +5,6 @@ import com.irtimaled.bbor.client.events.DisconnectedFromRemoteServer;
 import com.irtimaled.bbor.common.EventBus;
 import net.minecraft.client.network.NetHandlerLoginClient;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.login.server.SPacketLoginSuccess;
-import net.minecraft.util.text.ITextComponent;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerPlayClient.java b/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerPlayClient.java
index 70c91e820ae9d003f0ee058e081555c944424aba..8b93ca461f2e62dfe389fc5ed64228fe560cdc32 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerPlayClient.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerPlayClient.java
@@ -3,7 +3,6 @@ package com.irtimaled.bbor.mixin.client.network;
 import com.irtimaled.bbor.client.events.DisconnectedFromRemoteServer;
 import com.irtimaled.bbor.common.EventBus;
 import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.util.text.ITextComponent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
index 960e16b73db82b30948efd27d0ff82e542833fc1..02000a0865dba7ab6a1ea602a50ff29e060533cd 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
+++ b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
@@ -5,15 +5,15 @@ import net.minecraft.launchwrapper.Launch;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.channels.Channels;
-import java.util.*;
-import java.util.function.Consumer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ServerRunner {
     private static final Map<String, String> VANILLA_SERVER_JARS = new HashMap<>();