From 9df6406a939986aa280d8552a61edfd64af20456 Mon Sep 17 00:00:00 2001 From: Sen Date: Sun, 16 Mar 2025 17:45:08 +0100 Subject: [PATCH] organize imports --- java/src/game/Game.java | 12 +++++------- java/src/game/Server.java | 6 +++--- java/src/game/ai/EntityAIFindEntityNearest.java | 1 + .../src/game/ai/EntityAINearestAttackableTarget.java | 1 + java/src/game/audio/AudioInterface.java | 5 ++--- java/src/game/block/BlockHopper.java | 1 + java/src/game/entity/attributes/AttributeMap.java | 3 +-- java/src/game/entity/item/EntityHopperCart.java | 1 + java/src/game/entity/npc/EntityZombie.java | 1 + java/src/game/entity/types/EntityLiving.java | 2 +- java/src/game/gui/Gui.java | 2 +- java/src/game/gui/GuiBinds.java | 2 +- java/src/game/gui/GuiConfirm.java | 2 +- java/src/game/gui/GuiConsole.java | 2 +- java/src/game/gui/GuiGameOver.java | 2 +- java/src/game/gui/GuiStyle.java | 4 ++-- java/src/game/gui/container/GuiContainer.java | 2 +- java/src/game/gui/element/GuiList.java | 2 +- java/src/game/gui/world/GuiEdit.java | 2 +- java/src/game/gui/world/GuiWorlds.java | 4 ++-- java/src/game/init/RotationRegistry.java | 2 +- java/src/game/init/SmeltingRegistry.java | 3 +-- java/src/game/init/UniverseRegistry.java | 5 ++--- java/src/game/item/ItemArmor.java | 2 +- java/src/game/item/ItemMagnet.java | 1 + java/src/game/item/ItemPotion.java | 3 +-- java/src/game/item/ItemStack.java | 3 +-- java/src/game/model/ModelBakery.java | 3 +-- java/src/game/model/ModelManager.java | 3 +-- java/src/game/nbt/NBTTagCompound.java | 3 +-- java/src/game/network/NetHandlerPlayClient.java | 3 +-- java/src/game/network/NetHandlerPlayServer.java | 2 +- java/src/game/potion/Potion.java | 3 +-- java/src/game/renderer/EntityRenderer.java | 1 + java/src/game/renderer/entity/Render.java | 2 +- java/src/game/renderer/texture/EntityTexManager.java | 3 +-- .../renderer/tileentity/TileEntitySignRenderer.java | 2 +- java/src/game/rng/WeightedList.java | 3 ++- java/src/game/tileentity/TileEntityHopper.java | 1 + java/src/game/window/WCF.java | 5 +++-- java/src/game/world/Chunk.java | 2 +- java/src/game/world/EmptyChunk.java | 1 + java/src/game/world/Facing.java | 2 +- java/src/game/world/State.java | 2 +- java/src/game/world/World.java | 2 +- java/src/game/world/WorldServer.java | 2 +- 46 files changed, 59 insertions(+), 62 deletions(-) diff --git a/java/src/game/Game.java b/java/src/game/Game.java index 0339d34..e68e19a 100755 --- a/java/src/game/Game.java +++ b/java/src/game/Game.java @@ -1,7 +1,6 @@ package game; import java.awt.Desktop; -import java.awt.GraphicsEnvironment; import java.awt.image.BufferedImage; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -40,7 +39,6 @@ import java.util.concurrent.FutureTask; import java.util.function.Function; import javax.imageio.ImageIO; -import javax.swing.JOptionPane; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -123,19 +121,19 @@ import game.util.FileUtils; import game.util.PerfSection; import game.util.Timing; import game.util.Util; +import game.vars.BaseVar.VarFunction; import game.vars.BoolVar; +import game.vars.BoolVar.BoolFunction; import game.vars.CVar; import game.vars.CVarCategory; import game.vars.ColorVar; import game.vars.EnumVar; -import game.vars.FloatVar; -import game.vars.IntVar; -import game.vars.Variable; -import game.vars.BaseVar.VarFunction; -import game.vars.BoolVar.BoolFunction; import game.vars.EnumVar.EnumFunction; +import game.vars.FloatVar; import game.vars.FloatVar.FloatFunction; +import game.vars.IntVar; import game.vars.IntVar.IntFunction; +import game.vars.Variable; import game.vars.Variable.IntType; import game.window.Bind; import game.window.Button; diff --git a/java/src/game/Server.java b/java/src/game/Server.java index f3b7dad..c6ba42e 100755 --- a/java/src/game/Server.java +++ b/java/src/game/Server.java @@ -69,6 +69,9 @@ import game.world.PortalType; import game.world.Position; import game.world.Region; import game.world.Region.FolderInfo; +import game.world.World; +import game.world.WorldPos; +import game.world.WorldServer; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelException; @@ -85,9 +88,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; -import game.world.World; -import game.world.WorldPos; -import game.world.WorldServer; public final class Server implements Runnable, IThreadListener { private static final LazyLoadBase SERVER_NIO_EVENTLOOP = new LazyLoadBase() { diff --git a/java/src/game/ai/EntityAIFindEntityNearest.java b/java/src/game/ai/EntityAIFindEntityNearest.java index d32952e..e4366d5 100755 --- a/java/src/game/ai/EntityAIFindEntityNearest.java +++ b/java/src/game/ai/EntityAIFindEntityNearest.java @@ -2,6 +2,7 @@ package game.ai; import java.util.Collections; import java.util.List; + import com.google.common.base.Predicate; import game.entity.attributes.AttributeInstance; diff --git a/java/src/game/ai/EntityAINearestAttackableTarget.java b/java/src/game/ai/EntityAINearestAttackableTarget.java index bde8809..a377701 100755 --- a/java/src/game/ai/EntityAINearestAttackableTarget.java +++ b/java/src/game/ai/EntityAINearestAttackableTarget.java @@ -3,6 +3,7 @@ package game.ai; import java.util.Collections; import java.util.Comparator; import java.util.List; + import com.google.common.base.Predicate; import game.entity.Entity; diff --git a/java/src/game/audio/AudioInterface.java b/java/src/game/audio/AudioInterface.java index 501dfcf..ea4fe36 100644 --- a/java/src/game/audio/AudioInterface.java +++ b/java/src/game/audio/AudioInterface.java @@ -7,12 +7,11 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat.Encoding; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine.Info; - -import com.google.common.collect.Lists; - import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; +import com.google.common.collect.Lists; + import game.log.Log; public class AudioInterface implements Runnable { diff --git a/java/src/game/block/BlockHopper.java b/java/src/game/block/BlockHopper.java index a2fa8c5..9391e1b 100755 --- a/java/src/game/block/BlockHopper.java +++ b/java/src/game/block/BlockHopper.java @@ -1,6 +1,7 @@ package game.block; import java.util.List; + import com.google.common.base.Predicate; import game.entity.Entity; diff --git a/java/src/game/entity/attributes/AttributeMap.java b/java/src/game/entity/attributes/AttributeMap.java index 1079671..d77c069 100755 --- a/java/src/game/entity/attributes/AttributeMap.java +++ b/java/src/game/entity/attributes/AttributeMap.java @@ -3,12 +3,11 @@ package game.entity.attributes; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.Set; - public class AttributeMap { protected final Map attributes = Maps.newHashMap(); diff --git a/java/src/game/entity/item/EntityHopperCart.java b/java/src/game/entity/item/EntityHopperCart.java index 986c3a1..ba0aabe 100755 --- a/java/src/game/entity/item/EntityHopperCart.java +++ b/java/src/game/entity/item/EntityHopperCart.java @@ -1,6 +1,7 @@ package game.entity.item; import java.util.List; + import com.google.common.base.Predicate; import game.entity.DamageSource; diff --git a/java/src/game/entity/npc/EntityZombie.java b/java/src/game/entity/npc/EntityZombie.java index 7a64395..7009b27 100755 --- a/java/src/game/entity/npc/EntityZombie.java +++ b/java/src/game/entity/npc/EntityZombie.java @@ -1,6 +1,7 @@ package game.entity.npc; import java.util.List; + import com.google.common.base.Predicate; import game.ai.EntityAIMoveThroughVillage; diff --git a/java/src/game/entity/types/EntityLiving.java b/java/src/game/entity/types/EntityLiving.java index d9dd8b5..331e9f3 100755 --- a/java/src/game/entity/types/EntityLiving.java +++ b/java/src/game/entity/types/EntityLiving.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/java/src/game/gui/Gui.java b/java/src/game/gui/Gui.java index fadcef7..9be5967 100644 --- a/java/src/game/gui/Gui.java +++ b/java/src/game/gui/Gui.java @@ -6,8 +6,8 @@ import com.google.common.collect.Lists; import game.Game; import game.gui.element.Dropdown; -import game.gui.element.Element; import game.gui.element.Dropdown.Handle; +import game.gui.element.Element; import game.renderer.DefaultVertexFormats; import game.renderer.Drawing; import game.renderer.GlState; diff --git a/java/src/game/gui/GuiBinds.java b/java/src/game/gui/GuiBinds.java index 169037c..e9cb075 100644 --- a/java/src/game/gui/GuiBinds.java +++ b/java/src/game/gui/GuiBinds.java @@ -2,8 +2,8 @@ package game.gui; import game.color.TextColor; import game.gui.element.ActButton; -import game.gui.element.Label; import game.gui.element.ActButton.Mode; +import game.gui.element.Label; import game.util.Formatter; import game.window.Bind; diff --git a/java/src/game/gui/GuiConfirm.java b/java/src/game/gui/GuiConfirm.java index d596b72..ecf1b2c 100755 --- a/java/src/game/gui/GuiConfirm.java +++ b/java/src/game/gui/GuiConfirm.java @@ -1,9 +1,9 @@ package game.gui; import game.gui.element.ActButton; +import game.gui.element.ActButton.Mode; import game.gui.element.Label; import game.gui.element.Textbox; -import game.gui.element.ActButton.Mode; public class GuiConfirm extends Gui implements ActButton.Callback { public static interface Callback { diff --git a/java/src/game/gui/GuiConsole.java b/java/src/game/gui/GuiConsole.java index 595b641..dcdb2a9 100644 --- a/java/src/game/gui/GuiConsole.java +++ b/java/src/game/gui/GuiConsole.java @@ -7,8 +7,8 @@ import com.google.common.collect.Lists; import game.gui.element.ActButton; import game.gui.element.Fill; import game.gui.element.Textbox; -import game.gui.element.TransparentBox; import game.gui.element.Textbox.Action; +import game.gui.element.TransparentBox; import game.log.Log; import game.network.NetHandlerPlayServer; import game.packet.CPacketComplete; diff --git a/java/src/game/gui/GuiGameOver.java b/java/src/game/gui/GuiGameOver.java index 922c880..23bd033 100755 --- a/java/src/game/gui/GuiGameOver.java +++ b/java/src/game/gui/GuiGameOver.java @@ -2,8 +2,8 @@ package game.gui; import game.color.TextColor; import game.gui.element.ActButton; -import game.gui.element.Label; import game.gui.element.ActButton.Mode; +import game.gui.element.Label; public class GuiGameOver extends Gui { public static final GuiGameOver INSTANCE = new GuiGameOver(); diff --git a/java/src/game/gui/GuiStyle.java b/java/src/game/gui/GuiStyle.java index 414b3cb..f6f1c30 100644 --- a/java/src/game/gui/GuiStyle.java +++ b/java/src/game/gui/GuiStyle.java @@ -1,14 +1,14 @@ package game.gui; import game.gui.element.ActButton; +import game.gui.element.ActButton.Mode; import game.gui.element.Dropdown; import game.gui.element.SelectedButton; import game.gui.element.Slider; import game.gui.element.Switch; import game.gui.element.Textbox; -import game.gui.element.Toggle; -import game.gui.element.ActButton.Mode; import game.gui.element.Textbox.Action; +import game.gui.element.Toggle; public class GuiStyle extends GuiOptions implements Dropdown.Callback, ActButton.Callback, Toggle.Callback, Switch.Callback, Slider.Callback, Textbox.Callback { private static final String[] STYLE_CVARS = { diff --git a/java/src/game/gui/container/GuiContainer.java b/java/src/game/gui/container/GuiContainer.java index 1754c1f..a4c48bb 100755 --- a/java/src/game/gui/container/GuiContainer.java +++ b/java/src/game/gui/container/GuiContainer.java @@ -16,9 +16,9 @@ import game.item.CheatTab; import game.item.ItemStack; import game.packet.CPacketCheat; import game.renderer.Drawing; +import game.renderer.Drawing.Vec2i; import game.renderer.GlState; import game.renderer.ItemRenderer; -import game.renderer.Drawing.Vec2i; import game.renderer.entity.RenderItem; import game.util.ExtMath; import game.window.Button; diff --git a/java/src/game/gui/element/GuiList.java b/java/src/game/gui/element/GuiList.java index f6181a4..520882f 100755 --- a/java/src/game/gui/element/GuiList.java +++ b/java/src/game/gui/element/GuiList.java @@ -8,10 +8,10 @@ import game.gui.Gui; import game.renderer.DefaultVertexFormats; import game.renderer.Drawing; import game.renderer.GlState; +import game.renderer.RenderBuffer; import game.renderer.Tessellator; import game.util.ExtMath; import game.window.Button; -import game.renderer.RenderBuffer; public abstract class GuiList extends Gui { diff --git a/java/src/game/gui/world/GuiEdit.java b/java/src/game/gui/world/GuiEdit.java index c254906..0212d3d 100755 --- a/java/src/game/gui/world/GuiEdit.java +++ b/java/src/game/gui/world/GuiEdit.java @@ -5,9 +5,9 @@ import java.io.File; import game.color.TextColor; import game.gui.Gui; import game.gui.element.ActButton; +import game.gui.element.ActButton.Mode; import game.gui.element.Label; import game.gui.element.Textbox; -import game.gui.element.ActButton.Mode; import game.gui.element.Textbox.Action; import game.network.NetHandlerPlayServer; import game.world.Region; diff --git a/java/src/game/gui/world/GuiWorlds.java b/java/src/game/gui/world/GuiWorlds.java index 0bf90e2..cda73b1 100755 --- a/java/src/game/gui/world/GuiWorlds.java +++ b/java/src/game/gui/world/GuiWorlds.java @@ -17,9 +17,9 @@ import game.dimension.Dimension; import game.gui.GuiConfirm; import game.gui.GuiMenu; import game.gui.element.ActButton; +import game.gui.element.ActButton.Mode; import game.gui.element.GuiList; import game.gui.element.ListEntry; -import game.gui.element.ActButton.Mode; import game.gui.world.GuiEdit.Callback; import game.init.Config; import game.init.UniverseRegistry; @@ -34,8 +34,8 @@ import game.window.WCF; import game.world.Converter; import game.world.Converter.SaveVersion; import game.world.Region; -import game.world.World; import game.world.Region.FolderInfo; +import game.world.World; public class GuiWorlds extends GuiList implements ActButton.Callback { diff --git a/java/src/game/init/RotationRegistry.java b/java/src/game/init/RotationRegistry.java index d04e766..6fb4772 100755 --- a/java/src/game/init/RotationRegistry.java +++ b/java/src/game/init/RotationRegistry.java @@ -3,8 +3,8 @@ package game.init; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/java/src/game/init/SmeltingRegistry.java b/java/src/game/init/SmeltingRegistry.java index 1ab21e1..aea4035 100755 --- a/java/src/game/init/SmeltingRegistry.java +++ b/java/src/game/init/SmeltingRegistry.java @@ -2,11 +2,10 @@ package game.init; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; -import java.util.Set; - import game.block.Block; import game.block.BlockStoneBrick; import game.color.DyeColor; diff --git a/java/src/game/init/UniverseRegistry.java b/java/src/game/init/UniverseRegistry.java index 5170612..ad0dfcb 100755 --- a/java/src/game/init/UniverseRegistry.java +++ b/java/src/game/init/UniverseRegistry.java @@ -3,13 +3,12 @@ package game.init; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.Set; - import game.biome.Biome; import game.block.BlockColored; import game.block.BlockSand; @@ -20,7 +19,6 @@ import game.dimension.DimType; import game.dimension.Dimension; import game.dimension.Dimension.GeneratorType; import game.dimension.Dimension.ReplacerType; -import game.log.Log; import game.dimension.Domain; import game.dimension.Galaxy; import game.dimension.Moon; @@ -29,6 +27,7 @@ import game.dimension.Sector; import game.dimension.Semi; import game.dimension.Space; import game.dimension.Star; +import game.log.Log; import game.nbt.NBTException; import game.nbt.NBTParser; import game.nbt.NBTTagCompound; diff --git a/java/src/game/item/ItemArmor.java b/java/src/game/item/ItemArmor.java index 778c8ba..698f5c4 100755 --- a/java/src/game/item/ItemArmor.java +++ b/java/src/game/item/ItemArmor.java @@ -3,8 +3,8 @@ package game.item; import java.util.List; import java.util.Map; import java.util.Set; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Sets; import game.block.BlockDispenser; diff --git a/java/src/game/item/ItemMagnet.java b/java/src/game/item/ItemMagnet.java index 92960ab..c5ad218 100755 --- a/java/src/game/item/ItemMagnet.java +++ b/java/src/game/item/ItemMagnet.java @@ -1,6 +1,7 @@ package game.item; import java.util.List; + import com.google.common.base.Predicate; import game.entity.Entity; diff --git a/java/src/game/item/ItemPotion.java b/java/src/game/item/ItemPotion.java index 7368b60..63e40e3 100755 --- a/java/src/game/item/ItemPotion.java +++ b/java/src/game/item/ItemPotion.java @@ -4,12 +4,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.Set; - import game.color.TextColor; import game.entity.attributes.Attribute; import game.entity.attributes.AttributeModifier; diff --git a/java/src/game/item/ItemStack.java b/java/src/game/item/ItemStack.java index 7d78a9a..e7cb583 100755 --- a/java/src/game/item/ItemStack.java +++ b/java/src/game/item/ItemStack.java @@ -4,12 +4,11 @@ import java.text.DecimalFormat; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.util.Set; - import game.block.Block; import game.color.TextColor; import game.enchantment.Enchantment; diff --git a/java/src/game/model/ModelBakery.java b/java/src/game/model/ModelBakery.java index 21e6343..57a0f45 100755 --- a/java/src/game/model/ModelBakery.java +++ b/java/src/game/model/ModelBakery.java @@ -5,13 +5,12 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.Set; - import game.init.BlockRegistry; import game.init.FluidRegistry; import game.init.IRegistry; diff --git a/java/src/game/model/ModelManager.java b/java/src/game/model/ModelManager.java index f774bcd..1668942 100755 --- a/java/src/game/model/ModelManager.java +++ b/java/src/game/model/ModelManager.java @@ -3,11 +3,10 @@ package game.model; import java.util.Collections; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; -import java.util.Set; - import game.block.Block; import game.block.BlockLiquid; import game.init.BlockRegistry; diff --git a/java/src/game/nbt/NBTTagCompound.java b/java/src/game/nbt/NBTTagCompound.java index 3feb7dd..776f99a 100755 --- a/java/src/game/nbt/NBTTagCompound.java +++ b/java/src/game/nbt/NBTTagCompound.java @@ -5,11 +5,10 @@ import java.io.DataOutput; import java.io.IOException; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; -import java.util.Set; - public class NBTTagCompound extends NBTBase { private Map tagMap = Maps.newHashMap(); diff --git a/java/src/game/network/NetHandlerPlayClient.java b/java/src/game/network/NetHandlerPlayClient.java index eea156a..2926200 100755 --- a/java/src/game/network/NetHandlerPlayClient.java +++ b/java/src/game/network/NetHandlerPlayClient.java @@ -3,11 +3,10 @@ package game.network; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; -import java.util.Set; - import game.Game; import game.audio.PositionedSound; import game.dimension.Dimension; diff --git a/java/src/game/network/NetHandlerPlayServer.java b/java/src/game/network/NetHandlerPlayServer.java index 513dfe7..257184d 100755 --- a/java/src/game/network/NetHandlerPlayServer.java +++ b/java/src/game/network/NetHandlerPlayServer.java @@ -6,8 +6,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; import java.util.Set; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; diff --git a/java/src/game/potion/Potion.java b/java/src/game/potion/Potion.java index 7c15d5d..c703156 100755 --- a/java/src/game/potion/Potion.java +++ b/java/src/game/potion/Potion.java @@ -2,11 +2,10 @@ package game.potion; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Maps; -import java.util.Set; - import game.entity.DamageSource; import game.entity.attributes.Attribute; import game.entity.attributes.AttributeInstance; diff --git a/java/src/game/renderer/EntityRenderer.java b/java/src/game/renderer/EntityRenderer.java index 1521ee4..a0c2984 100755 --- a/java/src/game/renderer/EntityRenderer.java +++ b/java/src/game/renderer/EntityRenderer.java @@ -4,6 +4,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.List; + import com.google.common.base.Predicate; import game.Game; diff --git a/java/src/game/renderer/entity/Render.java b/java/src/game/renderer/entity/Render.java index 47e5aab..bc66cab 100755 --- a/java/src/game/renderer/entity/Render.java +++ b/java/src/game/renderer/entity/Render.java @@ -5,11 +5,11 @@ import game.block.Block; import game.entity.Entity; import game.renderer.DefaultVertexFormats; import game.renderer.Drawing; +import game.renderer.Drawing.Vec2i; import game.renderer.Frustum; import game.renderer.GlState; import game.renderer.RenderBuffer; import game.renderer.Tessellator; -import game.renderer.Drawing.Vec2i; import game.renderer.texture.TextureAtlasSprite; import game.renderer.texture.TextureMap; import game.window.WCF; diff --git a/java/src/game/renderer/texture/EntityTexManager.java b/java/src/game/renderer/texture/EntityTexManager.java index 742f0e5..4efecc2 100755 --- a/java/src/game/renderer/texture/EntityTexManager.java +++ b/java/src/game/renderer/texture/EntityTexManager.java @@ -8,13 +8,12 @@ import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.Set; - import game.Game; import game.entity.npc.EntityNPC; import game.init.SpeciesRegistry; diff --git a/java/src/game/renderer/tileentity/TileEntitySignRenderer.java b/java/src/game/renderer/tileentity/TileEntitySignRenderer.java index 4018b76..b30ca1e 100755 --- a/java/src/game/renderer/tileentity/TileEntitySignRenderer.java +++ b/java/src/game/renderer/tileentity/TileEntitySignRenderer.java @@ -4,8 +4,8 @@ import game.block.Block; import game.gui.Font; import game.init.Blocks; import game.renderer.Drawing; -import game.renderer.GlState; import game.renderer.Drawing.Vec2i; +import game.renderer.GlState; import game.renderer.model.ModelSign; import game.tileentity.TileEntitySign; import game.window.WCF; diff --git a/java/src/game/rng/WeightedList.java b/java/src/game/rng/WeightedList.java index 5b1a01a..1f58e19 100755 --- a/java/src/game/rng/WeightedList.java +++ b/java/src/game/rng/WeightedList.java @@ -3,9 +3,10 @@ package game.rng; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; -import com.google.common.base.Predicate; import java.util.function.UnaryOperator; +import com.google.common.base.Predicate; + public class WeightedList extends ArrayList { protected boolean modified; protected int total; diff --git a/java/src/game/tileentity/TileEntityHopper.java b/java/src/game/tileentity/TileEntityHopper.java index 56d9767..d08aff9 100755 --- a/java/src/game/tileentity/TileEntityHopper.java +++ b/java/src/game/tileentity/TileEntityHopper.java @@ -1,6 +1,7 @@ package game.tileentity; import java.util.List; + import com.google.common.base.Predicate; import game.block.Block; diff --git a/java/src/game/window/WCF.java b/java/src/game/window/WCF.java index c6dac89..b7e47ac 100644 --- a/java/src/game/window/WCF.java +++ b/java/src/game/window/WCF.java @@ -1,8 +1,9 @@ package game.window; +import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks; import static org.lwjgl.glfw.GLFW.*; -import static org.lwjgl.glfw.Callbacks.*; -import static org.lwjgl.system.MemoryUtil.*; +import static org.lwjgl.system.MemoryUtil.NULL; + import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/java/src/game/world/Chunk.java b/java/src/game/world/Chunk.java index 373c319..a345559 100755 --- a/java/src/game/world/Chunk.java +++ b/java/src/game/world/Chunk.java @@ -4,8 +4,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Maps; import game.biome.Biome; diff --git a/java/src/game/world/EmptyChunk.java b/java/src/game/world/EmptyChunk.java index ffd1187..39a3d22 100755 --- a/java/src/game/world/EmptyChunk.java +++ b/java/src/game/world/EmptyChunk.java @@ -1,6 +1,7 @@ package game.world; import java.util.List; + import com.google.common.base.Predicate; import game.block.Block; diff --git a/java/src/game/world/Facing.java b/java/src/game/world/Facing.java index 5035692..61dd7e0 100755 --- a/java/src/game/world/Facing.java +++ b/java/src/game/world/Facing.java @@ -2,8 +2,8 @@ package game.world; import java.util.Iterator; import java.util.Map; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Iterators; import com.google.common.collect.Maps; diff --git a/java/src/game/world/State.java b/java/src/game/world/State.java index cfca3d6..13b8121 100755 --- a/java/src/game/world/State.java +++ b/java/src/game/world/State.java @@ -7,11 +7,11 @@ import java.util.Map; import java.util.Map.Entry; import com.google.common.base.Function; +import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableTable; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import game.block.Block; diff --git a/java/src/game/world/World.java b/java/src/game/world/World.java index 5dcaeb1..9e7136c 100755 --- a/java/src/game/world/World.java +++ b/java/src/game/world/World.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/java/src/game/world/WorldServer.java b/java/src/game/world/WorldServer.java index 6e33185..5d55ea0 100755 --- a/java/src/game/world/WorldServer.java +++ b/java/src/game/world/WorldServer.java @@ -11,8 +11,8 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; -import com.google.common.base.Predicate; +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets;