From 1343535933d8764b566c35139da57cadd4095f0c Mon Sep 17 00:00:00 2001 From: josua Date: Tue, 3 Sep 2019 12:42:33 +1000 Subject: [PATCH] Cleaned unused imports --- src/shootergame/Main.java | 8 ----- src/shootergame/Test.java | 29 ++++++++++++------- src/shootergame/audio/AudioEngine.java | 3 -- src/shootergame/audio/AudioObject.java | 27 +++++++++-------- src/shootergame/audio/AudioRandom.java | 1 - src/shootergame/audio/AudioSources.java | 5 ++-- src/shootergame/display/DisplayRender.java | 12 ++++++-- src/shootergame/display/DisplayRenderUI.java | 2 -- src/shootergame/entity/Entity.java | 3 -- src/shootergame/entity/EntityBullet.java | 5 ---- .../entity/EntityEventHandler.java | 11 ------- src/shootergame/entity/EntityItem.java | 1 - src/shootergame/entity/EntityTnt.java | 3 -- src/shootergame/entity/EntityZombie.java | 4 --- .../entity/particle/ParticleBreak.java | 1 - .../entity/player/EntityPlayer.java | 9 ------ src/shootergame/init/Textures.java | 2 +- src/shootergame/input/KeyCallback.java | 7 ++++- src/shootergame/resources/Resource.java | 11 +++---- .../resources/ResourceDownload.java | 1 - src/shootergame/tiles/Tile.java | 2 -- src/shootergame/tiles/TileChest.java | 2 -- src/shootergame/tiles/TileFlat.java | 3 -- src/shootergame/tiles/TileLadder.java | 1 - src/shootergame/tiles/TileLadderUp.java | 2 -- src/shootergame/tiles/TilePortalDown.java | 4 --- src/shootergame/tiles/TileVertical.java | 4 --- src/shootergame/tiles/TileWall.java | 1 - src/shootergame/util/gl/GlHelpers.java | 22 +++++++++++--- src/shootergame/util/gl/VerticalRender.java | 1 - .../gl/texture/AnimationEventHandler.java | 1 - src/shootergame/util/gl/texture/Texture.java | 9 ------ .../util/gl/texture/TextureMap.java | 11 ++++++- .../util/gl/texture/TextureReference.java | 2 +- .../gl/texture/TextureReferenceRandom.java | 1 - src/shootergame/world/chunk/Chunk.java | 4 --- src/shootergame/world/chunk/ChunkEmpty.java | 2 -- .../world/chunk/ChunkEventHandler.java | 4 --- src/shootergame/world/layer/Layer.java | 3 -- .../world/layer/layergen/LayerGenCaves.java | 5 ---- .../world/layer/layergen/LayerGenEarth.java | 3 -- 41 files changed, 83 insertions(+), 149 deletions(-) diff --git a/src/shootergame/Main.java b/src/shootergame/Main.java index 6ec7847..e5ba62b 100644 --- a/src/shootergame/Main.java +++ b/src/shootergame/Main.java @@ -2,8 +2,6 @@ package shootergame; import java.util.Random; -import javax.swing.text.html.parser.Entity; - import mainloop.manager.MainloopManager; import shootergame.audio.AudioEngine; import shootergame.audio.AudioSources; @@ -11,18 +9,12 @@ import shootergame.cheats.Cheats; import shootergame.display.DisplayStatsEventHandler; import shootergame.display.DisplayWindow; import shootergame.entity.EntityEventHandler; -import shootergame.entity.EntityZombie; import shootergame.entity.player.EntityPlayer; -import shootergame.init.Entities; import shootergame.init.Resources; import shootergame.init.Sounds; import shootergame.init.Textures; import shootergame.input.JoystickCallback; import shootergame.mainloop.MainloopEventHandler; -import shootergame.resources.Resource; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; import shootergame.world.World; import shootergame.world.chunk.ChunkEventHandler; import shootergame.world.layer.layergen.LayerGenCaves; diff --git a/src/shootergame/Test.java b/src/shootergame/Test.java index e8aa19d..e084a77 100644 --- a/src/shootergame/Test.java +++ b/src/shootergame/Test.java @@ -1,15 +1,25 @@ package shootergame; -import org.lwjgl.openal.*; -import org.lwjgl.system.*; +import static org.lwjgl.openal.AL10.AL_BUFFER; +import static org.lwjgl.openal.AL10.AL_FORMAT_MONO16; +import static org.lwjgl.openal.AL10.AL_FORMAT_STEREO16; +import static org.lwjgl.openal.AL10.alBufferData; +import static org.lwjgl.openal.AL10.alGenBuffers; +import static org.lwjgl.openal.AL10.alGenSources; +import static org.lwjgl.openal.AL10.alSourcePlay; +import static org.lwjgl.openal.AL10.alSourcei; +import static org.lwjgl.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER; +import static org.lwjgl.openal.ALC10.alcCreateContext; +import static org.lwjgl.openal.ALC10.alcGetString; +import static org.lwjgl.openal.ALC10.alcMakeContextCurrent; +import static org.lwjgl.openal.ALC10.alcOpenDevice; +import static org.lwjgl.stb.STBVorbis.stb_vorbis_decode_filename; +import static org.lwjgl.system.MemoryStack.stackPush; -import java.nio.*; +import java.nio.IntBuffer; +import java.nio.ShortBuffer; -import static org.lwjgl.openal.AL10.*; -import static org.lwjgl.openal.ALC10.*; -import static org.lwjgl.stb.STBVorbis.*; -import static org.lwjgl.system.MemoryStack.*; -import static org.lwjgl.system.libc.LibCStdlib.*; +import org.lwjgl.system.MemoryStack; public class Test { @@ -22,9 +32,6 @@ public class Test long context = alcCreateContext(device, attributes); alcMakeContextCurrent(context); - ALCCapabilities alcCapabilities = ALC.createCapabilities(device); - ALCapabilities alCapabilities = AL.createCapabilities(alcCapabilities); - ShortBuffer rawAudioBuffer; int channels; diff --git a/src/shootergame/audio/AudioEngine.java b/src/shootergame/audio/AudioEngine.java index 103c460..0b16acc 100644 --- a/src/shootergame/audio/AudioEngine.java +++ b/src/shootergame/audio/AudioEngine.java @@ -1,15 +1,12 @@ package shootergame.audio; import static org.lwjgl.openal.ALC11.*; -import static org.lwjgl.openal.AL11.*; import org.lwjgl.openal.AL; import org.lwjgl.openal.ALC; import org.lwjgl.openal.ALCCapabilities; import org.lwjgl.openal.ALCapabilities; -import shootergame.util.math.vec.Vec3d; - public class AudioEngine { String deviceName; diff --git a/src/shootergame/audio/AudioObject.java b/src/shootergame/audio/AudioObject.java index 8ee0793..0373a75 100644 --- a/src/shootergame/audio/AudioObject.java +++ b/src/shootergame/audio/AudioObject.java @@ -1,27 +1,26 @@ package shootergame.audio; +import static org.lwjgl.openal.AL10.AL_BUFFER; +import static org.lwjgl.openal.AL10.AL_FORMAT_MONO16; +import static org.lwjgl.openal.AL10.AL_FORMAT_STEREO16; +import static org.lwjgl.openal.AL10.AL_GAIN; +import static org.lwjgl.openal.AL10.AL_POSITION; +import static org.lwjgl.openal.AL10.alBufferData; +import static org.lwjgl.openal.AL10.alGenBuffers; +import static org.lwjgl.openal.AL10.alSource3f; +import static org.lwjgl.openal.AL10.alSourcePlay; +import static org.lwjgl.openal.AL10.alSourceStop; +import static org.lwjgl.openal.AL10.alSourcef; +import static org.lwjgl.openal.AL10.alSourcei; + import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import org.lwjgl.openal.AL10; -import org.lwjgl.openal.AL11; -import org.lwjgl.openal.ALC10; import org.lwjgl.stb.STBVorbis; import org.lwjgl.system.MemoryStack; -import org.lwjgl.system.libc.LibCStdlib; - -import static org.lwjgl.openal.AL10.AL_BUFFER; -import static org.lwjgl.openal.AL10.AL_GAIN; -import static org.lwjgl.openal.AL10.AL_POSITION; -import static org.lwjgl.openal.AL10.alSource3f; -import static org.lwjgl.openal.AL10.alSourcePlay; -import static org.lwjgl.openal.AL10.alSourcef; -import static org.lwjgl.openal.AL10.alSourcei; -import static org.lwjgl.openal.AL11.*; import shootergame.Main; -import shootergame.display.Camera; import shootergame.resources.Resource; import shootergame.util.math.MathHelpers; import shootergame.util.math.vec.Vec2d; diff --git a/src/shootergame/audio/AudioRandom.java b/src/shootergame/audio/AudioRandom.java index 9b60259..c12dae1 100644 --- a/src/shootergame/audio/AudioRandom.java +++ b/src/shootergame/audio/AudioRandom.java @@ -2,7 +2,6 @@ package shootergame.audio; import java.util.Random; -import shootergame.resources.Resource; import shootergame.util.math.vec.Vec3d; public class AudioRandom extends AudioObject diff --git a/src/shootergame/audio/AudioSources.java b/src/shootergame/audio/AudioSources.java index 85db081..14ab16f 100644 --- a/src/shootergame/audio/AudioSources.java +++ b/src/shootergame/audio/AudioSources.java @@ -1,9 +1,8 @@ package shootergame.audio; -import java.nio.IntBuffer; -import java.util.ArrayList; +import static org.lwjgl.openal.AL10.alGenSources; -import static org.lwjgl.openal.AL11.*; +import java.util.ArrayList; public class AudioSources { diff --git a/src/shootergame/display/DisplayRender.java b/src/shootergame/display/DisplayRender.java index 2678554..621311f 100644 --- a/src/shootergame/display/DisplayRender.java +++ b/src/shootergame/display/DisplayRender.java @@ -1,6 +1,15 @@ package shootergame.display; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; +import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; +import static org.lwjgl.opengl.GL11.GL_MODELVIEW; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.glClear; +import static org.lwjgl.opengl.GL11.glLoadMatrixf; +import static org.lwjgl.opengl.GL11.glMatrixMode; +import static org.lwjgl.opengl.GL11.glViewport; import org.joml.Matrix4f; import org.lwjgl.opengl.GL; @@ -10,7 +19,6 @@ import shootergame.Main; import shootergame.display.transparent.TransparentObjects; import shootergame.entity.player.EntityPlayer; import shootergame.init.Textures; -import shootergame.text.Text; import shootergame.util.gl.GlHelpers; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec3d; diff --git a/src/shootergame/display/DisplayRenderUI.java b/src/shootergame/display/DisplayRenderUI.java index f2dfe43..53b8c0a 100644 --- a/src/shootergame/display/DisplayRenderUI.java +++ b/src/shootergame/display/DisplayRenderUI.java @@ -1,11 +1,9 @@ package shootergame.display; import shootergame.Main; -import shootergame.audio.AudioSources; import shootergame.entity.EntityInventory; import shootergame.entity.player.EntityPlayer; import shootergame.init.Textures; -import shootergame.inventory.IInventory; import shootergame.inventory.Inventory; import shootergame.items.ItemStack; import shootergame.text.Text; diff --git a/src/shootergame/entity/Entity.java b/src/shootergame/entity/Entity.java index e0a0878..b856a9e 100644 --- a/src/shootergame/entity/Entity.java +++ b/src/shootergame/entity/Entity.java @@ -1,6 +1,5 @@ package shootergame.entity; -import java.util.ArrayList; import java.util.Random; import shootergame.Main; @@ -13,8 +12,6 @@ import shootergame.util.math.MathHelpers; import shootergame.util.math.TileState; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.World; import shootergame.world.chunk.Chunk; import shootergame.world.layer.Layer; diff --git a/src/shootergame/entity/EntityBullet.java b/src/shootergame/entity/EntityBullet.java index 58cac8f..dfde378 100644 --- a/src/shootergame/entity/EntityBullet.java +++ b/src/shootergame/entity/EntityBullet.java @@ -1,16 +1,11 @@ package shootergame.entity; -import java.util.Random; - -import shootergame.Main; import shootergame.display.Camera; import shootergame.entity.particle.ParticleBlood; import shootergame.init.Sounds; -import shootergame.init.Tiles; import shootergame.tiles.Tile; import shootergame.util.gl.GlHelpers; import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; diff --git a/src/shootergame/entity/EntityEventHandler.java b/src/shootergame/entity/EntityEventHandler.java index 0979ecb..c44b2f8 100644 --- a/src/shootergame/entity/EntityEventHandler.java +++ b/src/shootergame/entity/EntityEventHandler.java @@ -1,22 +1,11 @@ package shootergame.entity; -import java.util.ArrayList; -import java.util.Random; - import mainloop.task.IMainloopTask; import shootergame.Main; -import shootergame.init.Entities; -import shootergame.mainloop.MainloopEventHandler; -import shootergame.util.math.map.Map2DElement; -import shootergame.util.math.random.RandomHelpers; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; public class EntityEventHandler implements IMainloopTask { public static final EntityEventHandler ENTITY_EVENT_HANDLER = new EntityEventHandler(); - - private Random rand = new Random(); @Override public boolean MainLoopDelay(long millis) { diff --git a/src/shootergame/entity/EntityItem.java b/src/shootergame/entity/EntityItem.java index aa31e44..ac1cc42 100644 --- a/src/shootergame/entity/EntityItem.java +++ b/src/shootergame/entity/EntityItem.java @@ -1,7 +1,6 @@ package shootergame.entity; import shootergame.display.Camera; -import shootergame.inventory.Inventory; import shootergame.items.ItemStack; import shootergame.util.gl.GlHelpers; import shootergame.util.gl.texture.TextureReference; diff --git a/src/shootergame/entity/EntityTnt.java b/src/shootergame/entity/EntityTnt.java index bac9d36..8d146a2 100644 --- a/src/shootergame/entity/EntityTnt.java +++ b/src/shootergame/entity/EntityTnt.java @@ -1,7 +1,5 @@ package shootergame.entity; -import java.util.Random; - import shootergame.Main; import shootergame.display.Camera; import shootergame.entity.particle.ParticleBlood; @@ -11,7 +9,6 @@ import shootergame.entity.particle.ParticleSpark; import shootergame.init.Sounds; import shootergame.init.Textures; import shootergame.init.Tiles; -import shootergame.tiles.TileStone; import shootergame.util.gl.GlHelpers; import shootergame.util.math.MathHelpers; import shootergame.util.math.TileState; diff --git a/src/shootergame/entity/EntityZombie.java b/src/shootergame/entity/EntityZombie.java index a613603..6087416 100644 --- a/src/shootergame/entity/EntityZombie.java +++ b/src/shootergame/entity/EntityZombie.java @@ -1,13 +1,9 @@ package shootergame.entity; -import java.util.Random; - import shootergame.Main; -import shootergame.init.Sounds; import shootergame.init.Textures; import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; import shootergame.world.chunk.Chunk; import shootergame.world.layer.Layer; diff --git a/src/shootergame/entity/particle/ParticleBreak.java b/src/shootergame/entity/particle/ParticleBreak.java index 2f27e25..fbc69e0 100644 --- a/src/shootergame/entity/particle/ParticleBreak.java +++ b/src/shootergame/entity/particle/ParticleBreak.java @@ -2,7 +2,6 @@ package shootergame.entity.particle; import shootergame.Main; import shootergame.display.Camera; -import shootergame.entity.EntityParticle; import shootergame.entity.EntityVertical; import shootergame.util.gl.GlHelpers; import shootergame.util.gl.texture.IHasTexture; diff --git a/src/shootergame/entity/player/EntityPlayer.java b/src/shootergame/entity/player/EntityPlayer.java index 3be116c..c04e59b 100644 --- a/src/shootergame/entity/player/EntityPlayer.java +++ b/src/shootergame/entity/player/EntityPlayer.java @@ -1,7 +1,5 @@ package shootergame.entity.player; -import java.util.Random; - import shootergame.Main; import shootergame.cheats.Cheats; import shootergame.display.Camera; @@ -10,10 +8,7 @@ import shootergame.entity.EntityAlive; import shootergame.entity.EntityBullet; import shootergame.entity.EntityInventory; import shootergame.entity.EntityItem; -import shootergame.entity.EntityTnt; import shootergame.entity.EntityVertical; -import shootergame.init.Items; -import shootergame.init.Sounds; import shootergame.init.Textures; import shootergame.inventory.Inventory; import shootergame.items.ItemStack; @@ -21,8 +16,6 @@ import shootergame.util.gl.GlHelpers; import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.MathHelpers; import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; import shootergame.world.chunk.Chunk; import shootergame.world.layer.Layer; @@ -38,7 +31,6 @@ public class EntityPlayer extends EntityVertical implements EntityAlive, EntityI public double height = 0; private int bullet_frequency = 0; - private Random rand; private double health_max = 1000; private double health = health_max; public boolean dead = false; @@ -55,7 +47,6 @@ public class EntityPlayer extends EntityVertical implements EntityAlive, EntityI super(TextureReference.EMPTY, size); this.angle = 45; - rand = new Random(); // Set some settings hitbox = 0.5; diff --git a/src/shootergame/init/Textures.java b/src/shootergame/init/Textures.java index e5169c2..1417f7c 100644 --- a/src/shootergame/init/Textures.java +++ b/src/shootergame/init/Textures.java @@ -5,10 +5,10 @@ import java.util.ArrayList; import org.lwjgl.opengl.GL; import shootergame.display.DisplayWindow; +import shootergame.util.gl.texture.AnimationReference; import shootergame.util.gl.texture.TextureMap; import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReferenceRandom; -import shootergame.util.gl.texture.AnimationReference; public class Textures { diff --git a/src/shootergame/input/KeyCallback.java b/src/shootergame/input/KeyCallback.java index 3976899..99b803a 100644 --- a/src/shootergame/input/KeyCallback.java +++ b/src/shootergame/input/KeyCallback.java @@ -1,6 +1,11 @@ package shootergame.input; -import static org.lwjgl.glfw.GLFW.*; +import static org.lwjgl.glfw.GLFW.GLFW_KEY_A; +import static org.lwjgl.glfw.GLFW.GLFW_KEY_D; +import static org.lwjgl.glfw.GLFW.GLFW_KEY_ENTER; +import static org.lwjgl.glfw.GLFW.GLFW_KEY_S; +import static org.lwjgl.glfw.GLFW.GLFW_KEY_W; +import static org.lwjgl.glfw.GLFW.GLFW_RELEASE; import org.lwjgl.glfw.GLFWKeyCallbackI; diff --git a/src/shootergame/resources/Resource.java b/src/shootergame/resources/Resource.java index cc54506..baccea3 100644 --- a/src/shootergame/resources/Resource.java +++ b/src/shootergame/resources/Resource.java @@ -1,14 +1,11 @@ package shootergame.resources; -import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URL; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -17,7 +14,7 @@ public class Resource String path; byte[] data; - private InputStream fileURLStream(String path, int tries) + /*private InputStream fileURLStream(String path, int tries) { System.err.println("Getting \""+fileURL(path)+"\". Try "+ tries); @@ -52,11 +49,11 @@ public class Resource return this.fileURLStream(path, tries+1); } } - } + }*/ - private InputStream fileURLStream(String path) { + /*private InputStream fileURLStream(String path) { return this.fileURLStream(path, 0); - } + }*/ private String fileURL(String path) { return "https://www.onewaycoding.ml/files/game_resources/ShooterGame/"+path; diff --git a/src/shootergame/resources/ResourceDownload.java b/src/shootergame/resources/ResourceDownload.java index 69a3aa3..f785c93 100644 --- a/src/shootergame/resources/ResourceDownload.java +++ b/src/shootergame/resources/ResourceDownload.java @@ -1,6 +1,5 @@ package shootergame.resources; -import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/src/shootergame/tiles/Tile.java b/src/shootergame/tiles/Tile.java index a0a6f66..5022f80 100644 --- a/src/shootergame/tiles/Tile.java +++ b/src/shootergame/tiles/Tile.java @@ -4,11 +4,9 @@ import shootergame.display.Camera; import shootergame.display.transparent.ITransparentObject; import shootergame.display.transparent.TransparentObjects; import shootergame.entity.Entity; -import shootergame.entity.player.EntityPlayer; import shootergame.util.math.TileState; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; import shootergame.world.chunk.Chunk; import shootergame.world.layer.Layer; diff --git a/src/shootergame/tiles/TileChest.java b/src/shootergame/tiles/TileChest.java index e3faba9..d843a82 100644 --- a/src/shootergame/tiles/TileChest.java +++ b/src/shootergame/tiles/TileChest.java @@ -7,9 +7,7 @@ import shootergame.entity.Entity; import shootergame.entity.EntityItem; import shootergame.init.Items; import shootergame.init.Textures; -import shootergame.items.Item; import shootergame.items.ItemStack; -import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; diff --git a/src/shootergame/tiles/TileFlat.java b/src/shootergame/tiles/TileFlat.java index 39465d8..c87448c 100644 --- a/src/shootergame/tiles/TileFlat.java +++ b/src/shootergame/tiles/TileFlat.java @@ -1,13 +1,10 @@ package shootergame.tiles; import shootergame.display.Camera; -import shootergame.entity.player.EntityPlayer; import shootergame.util.gl.GlHelpers; import shootergame.util.gl.texture.IHasTexture; import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; public class TileFlat extends Tile implements IHasTexture { diff --git a/src/shootergame/tiles/TileLadder.java b/src/shootergame/tiles/TileLadder.java index 88f6d93..a7db05a 100644 --- a/src/shootergame/tiles/TileLadder.java +++ b/src/shootergame/tiles/TileLadder.java @@ -1,7 +1,6 @@ package shootergame.tiles; import shootergame.init.Textures; -import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.vec.Vec2d; public class TileLadder extends TileVertical diff --git a/src/shootergame/tiles/TileLadderUp.java b/src/shootergame/tiles/TileLadderUp.java index ab87327..d503582 100644 --- a/src/shootergame/tiles/TileLadderUp.java +++ b/src/shootergame/tiles/TileLadderUp.java @@ -5,10 +5,8 @@ import shootergame.Main; import shootergame.entity.Entity; import shootergame.entity.player.EntityPlayer; import shootergame.init.Textures; -import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; import shootergame.world.layer.Layer; public class TileLadderUp extends TileVertical diff --git a/src/shootergame/tiles/TilePortalDown.java b/src/shootergame/tiles/TilePortalDown.java index 1e5119a..160f035 100644 --- a/src/shootergame/tiles/TilePortalDown.java +++ b/src/shootergame/tiles/TilePortalDown.java @@ -5,12 +5,8 @@ import shootergame.Main; import shootergame.entity.Entity; import shootergame.entity.player.EntityPlayer; import shootergame.init.Textures; -import shootergame.init.Tiles; -import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; import shootergame.world.chunk.ChunkEventHandler; import shootergame.world.layer.Layer; diff --git a/src/shootergame/tiles/TileVertical.java b/src/shootergame/tiles/TileVertical.java index f8fdaa4..724fca3 100644 --- a/src/shootergame/tiles/TileVertical.java +++ b/src/shootergame/tiles/TileVertical.java @@ -1,14 +1,10 @@ package shootergame.tiles; -import shootergame.Main; import shootergame.display.Camera; -import shootergame.entity.player.EntityPlayer; -import shootergame.util.gl.GlHelpers; import shootergame.util.gl.VerticalRender; import shootergame.util.gl.texture.IHasTexture; import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; public class TileVertical extends Tile implements IHasTexture { diff --git a/src/shootergame/tiles/TileWall.java b/src/shootergame/tiles/TileWall.java index b6364aa..7404c2a 100644 --- a/src/shootergame/tiles/TileWall.java +++ b/src/shootergame/tiles/TileWall.java @@ -1,7 +1,6 @@ package shootergame.tiles; import shootergame.init.Textures; -import shootergame.util.gl.texture.TextureReference; public class TileWall extends TileFlat { diff --git a/src/shootergame/util/gl/GlHelpers.java b/src/shootergame/util/gl/GlHelpers.java index b61578b..d4921d9 100644 --- a/src/shootergame/util/gl/GlHelpers.java +++ b/src/shootergame/util/gl/GlHelpers.java @@ -1,9 +1,23 @@ package shootergame.util.gl; -import static org.lwjgl.opengl.GL11.*; - -import shootergame.Main; -import shootergame.display.DisplayRender; +import static org.lwjgl.opengl.GL11.GL_ALPHA; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_CULL_FACE; +import static org.lwjgl.opengl.GL11.GL_DEPTH_TEST; +import static org.lwjgl.opengl.GL11.GL_QUADS; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; +import static org.lwjgl.opengl.GL11.glBegin; +import static org.lwjgl.opengl.GL11.glColor3d; +import static org.lwjgl.opengl.GL11.glColor4d; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.glEnd; +import static org.lwjgl.opengl.GL11.glPopMatrix; +import static org.lwjgl.opengl.GL11.glPushMatrix; +import static org.lwjgl.opengl.GL11.glRotated; +import static org.lwjgl.opengl.GL11.glTranslated; +import static org.lwjgl.opengl.GL11.glVertex2d; +import static org.lwjgl.opengl.GL11.glVertex3d; public class GlHelpers { diff --git a/src/shootergame/util/gl/VerticalRender.java b/src/shootergame/util/gl/VerticalRender.java index e5091eb..d1c1934 100644 --- a/src/shootergame/util/gl/VerticalRender.java +++ b/src/shootergame/util/gl/VerticalRender.java @@ -1,7 +1,6 @@ package shootergame.util.gl; import shootergame.display.Camera; -import shootergame.entity.player.EntityPlayer; import shootergame.util.gl.texture.TextureReference; import shootergame.util.math.vec.Vec2d; diff --git a/src/shootergame/util/gl/texture/AnimationEventHandler.java b/src/shootergame/util/gl/texture/AnimationEventHandler.java index c1894d8..9bd830f 100644 --- a/src/shootergame/util/gl/texture/AnimationEventHandler.java +++ b/src/shootergame/util/gl/texture/AnimationEventHandler.java @@ -1,7 +1,6 @@ package shootergame.util.gl.texture; import mainloop.task.IMainloopTask; -import mainloop.task.MainloopTask; import shootergame.init.Textures; public class AnimationEventHandler implements IMainloopTask diff --git a/src/shootergame/util/gl/texture/Texture.java b/src/shootergame/util/gl/texture/Texture.java index c1ddcdd..91f4553 100644 --- a/src/shootergame/util/gl/texture/Texture.java +++ b/src/shootergame/util/gl/texture/Texture.java @@ -1,15 +1,6 @@ package shootergame.util.gl.texture; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.nio.MappedByteBuffer; -import java.nio.charset.StandardCharsets; - -import javax.swing.plaf.SliderUI; import org.lwjgl.stb.STBImage; diff --git a/src/shootergame/util/gl/texture/TextureMap.java b/src/shootergame/util/gl/texture/TextureMap.java index 09077ea..fab0b03 100644 --- a/src/shootergame/util/gl/texture/TextureMap.java +++ b/src/shootergame/util/gl/texture/TextureMap.java @@ -1,6 +1,15 @@ package shootergame.util.gl.texture; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_NEAREST; +import static org.lwjgl.opengl.GL11.GL_RGBA; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_MAG_FILTER; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_MIN_FILTER; +import static org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE; +import static org.lwjgl.opengl.GL11.glBindTexture; +import static org.lwjgl.opengl.GL11.glGenTextures; +import static org.lwjgl.opengl.GL11.glTexImage2D; +import static org.lwjgl.opengl.GL11.glTexParameteri; import shootergame.resources.Resource; diff --git a/src/shootergame/util/gl/texture/TextureReference.java b/src/shootergame/util/gl/texture/TextureReference.java index 48b0e72..de09366 100644 --- a/src/shootergame/util/gl/texture/TextureReference.java +++ b/src/shootergame/util/gl/texture/TextureReference.java @@ -1,6 +1,6 @@ package shootergame.util.gl.texture; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.glTexCoord2f; import shootergame.util.math.MathHelpers; diff --git a/src/shootergame/util/gl/texture/TextureReferenceRandom.java b/src/shootergame/util/gl/texture/TextureReferenceRandom.java index 6d4dc64..09613aa 100644 --- a/src/shootergame/util/gl/texture/TextureReferenceRandom.java +++ b/src/shootergame/util/gl/texture/TextureReferenceRandom.java @@ -1,6 +1,5 @@ package shootergame.util.gl.texture; -import java.util.ArrayList; import java.util.Random; import shootergame.util.math.random.RandomHelpers; diff --git a/src/shootergame/world/chunk/Chunk.java b/src/shootergame/world/chunk/Chunk.java index a5fe626..09da31c 100644 --- a/src/shootergame/world/chunk/Chunk.java +++ b/src/shootergame/world/chunk/Chunk.java @@ -6,13 +6,11 @@ import java.util.Random; import shootergame.display.Camera; import shootergame.entity.Entity; import shootergame.entity.EntityAlive; -import shootergame.entity.EntityTnt; import shootergame.entity.particle.ParticleBreak; import shootergame.init.Tiles; import shootergame.tiles.Tile; import shootergame.util.math.MathHelpers; import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.range.Range2i; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; @@ -30,14 +28,12 @@ public class Chunk private short tiles_front_meta[] = new short[CHUNK_INDEX]; private short tiles_back_meta[] = new short[CHUNK_INDEX]; public ArrayList entities = new ArrayList(); - private Random rand; private Layer layer; private Vec2i c_pos; public Chunk(Layer layer, Vec2i c_pos, Random rand) { // Set some specified values - this.rand = rand; this.layer = layer; this.c_pos = c_pos; diff --git a/src/shootergame/world/chunk/ChunkEmpty.java b/src/shootergame/world/chunk/ChunkEmpty.java index ff05024..869f501 100644 --- a/src/shootergame/world/chunk/ChunkEmpty.java +++ b/src/shootergame/world/chunk/ChunkEmpty.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import shootergame.display.Camera; import shootergame.entity.Entity; -import shootergame.init.Tiles; -import shootergame.tiles.Tile; import shootergame.util.math.TileState; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; diff --git a/src/shootergame/world/chunk/ChunkEventHandler.java b/src/shootergame/world/chunk/ChunkEventHandler.java index 0ae74e5..2e8a9f4 100644 --- a/src/shootergame/world/chunk/ChunkEventHandler.java +++ b/src/shootergame/world/chunk/ChunkEventHandler.java @@ -1,12 +1,8 @@ package shootergame.world.chunk; -import java.util.Random; - import mainloop.task.IMainloopTask; import shootergame.Main; import shootergame.util.math.map.Map2DElement; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; import shootergame.world.layer.Layer; diff --git a/src/shootergame/world/layer/Layer.java b/src/shootergame/world/layer/Layer.java index e9573ba..d04d919 100644 --- a/src/shootergame/world/layer/Layer.java +++ b/src/shootergame/world/layer/Layer.java @@ -6,15 +6,12 @@ import java.util.Random; import shootergame.Main; import shootergame.display.Camera; import shootergame.entity.Entity; -import shootergame.init.Tiles; -import shootergame.tiles.Tile; import shootergame.util.math.MathHelpers; import shootergame.util.math.TileState; import shootergame.util.math.map.Map2D; import shootergame.util.math.map.Map2DElement; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; -import shootergame.world.World; import shootergame.world.chunk.Chunk; import shootergame.world.layer.layergen.LayerGen; diff --git a/src/shootergame/world/layer/layergen/LayerGenCaves.java b/src/shootergame/world/layer/layergen/LayerGenCaves.java index 666c8a0..6dcfd47 100644 --- a/src/shootergame/world/layer/layergen/LayerGenCaves.java +++ b/src/shootergame/world/layer/layergen/LayerGenCaves.java @@ -2,15 +2,10 @@ package shootergame.world.layer.layergen; import java.util.Random; -import org.lwjgl.stb.STBPerlin; - import shootergame.Main; import shootergame.entity.Entity; -import shootergame.entity.EntityItem; import shootergame.entity.EntityZombie; -import shootergame.init.Items; import shootergame.init.Tiles; -import shootergame.items.ItemStack; import shootergame.util.math.TileState; import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.random.RandomHelpers; diff --git a/src/shootergame/world/layer/layergen/LayerGenEarth.java b/src/shootergame/world/layer/layergen/LayerGenEarth.java index 1dc0743..8c44e40 100644 --- a/src/shootergame/world/layer/layergen/LayerGenEarth.java +++ b/src/shootergame/world/layer/layergen/LayerGenEarth.java @@ -4,14 +4,11 @@ import java.util.Random; import shootergame.Main; import shootergame.entity.Entity; -import shootergame.entity.EntityBullet; import shootergame.entity.EntityZombie; import shootergame.init.Tiles; -import shootergame.tiles.Tile; import shootergame.util.math.TileState; import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.range.Range2i; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; import shootergame.world.chunk.Chunk;