Cleaned unused imports

This commit is contained in:
josua 2019-09-03 12:42:33 +10:00
parent e48d0cfc6c
commit 1343535933
41 changed files with 83 additions and 149 deletions

View File

@ -2,8 +2,6 @@ package shootergame;
import java.util.Random; import java.util.Random;
import javax.swing.text.html.parser.Entity;
import mainloop.manager.MainloopManager; import mainloop.manager.MainloopManager;
import shootergame.audio.AudioEngine; import shootergame.audio.AudioEngine;
import shootergame.audio.AudioSources; import shootergame.audio.AudioSources;
@ -11,18 +9,12 @@ import shootergame.cheats.Cheats;
import shootergame.display.DisplayStatsEventHandler; import shootergame.display.DisplayStatsEventHandler;
import shootergame.display.DisplayWindow; import shootergame.display.DisplayWindow;
import shootergame.entity.EntityEventHandler; import shootergame.entity.EntityEventHandler;
import shootergame.entity.EntityZombie;
import shootergame.entity.player.EntityPlayer; import shootergame.entity.player.EntityPlayer;
import shootergame.init.Entities;
import shootergame.init.Resources; import shootergame.init.Resources;
import shootergame.init.Sounds; import shootergame.init.Sounds;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.input.JoystickCallback; import shootergame.input.JoystickCallback;
import shootergame.mainloop.MainloopEventHandler; 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.World;
import shootergame.world.chunk.ChunkEventHandler; import shootergame.world.chunk.ChunkEventHandler;
import shootergame.world.layer.layergen.LayerGenCaves; import shootergame.world.layer.layergen.LayerGenCaves;

View File

@ -1,15 +1,25 @@
package shootergame; package shootergame;
import org.lwjgl.openal.*; import static org.lwjgl.openal.AL10.AL_BUFFER;
import org.lwjgl.system.*; 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 org.lwjgl.system.MemoryStack;
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.*;
public class Test public class Test
{ {
@ -22,9 +32,6 @@ public class Test
long context = alcCreateContext(device, attributes); long context = alcCreateContext(device, attributes);
alcMakeContextCurrent(context); alcMakeContextCurrent(context);
ALCCapabilities alcCapabilities = ALC.createCapabilities(device);
ALCapabilities alCapabilities = AL.createCapabilities(alcCapabilities);
ShortBuffer rawAudioBuffer; ShortBuffer rawAudioBuffer;
int channels; int channels;

View File

@ -1,15 +1,12 @@
package shootergame.audio; package shootergame.audio;
import static org.lwjgl.openal.ALC11.*; import static org.lwjgl.openal.ALC11.*;
import static org.lwjgl.openal.AL11.*;
import org.lwjgl.openal.AL; import org.lwjgl.openal.AL;
import org.lwjgl.openal.ALC; import org.lwjgl.openal.ALC;
import org.lwjgl.openal.ALCCapabilities; import org.lwjgl.openal.ALCCapabilities;
import org.lwjgl.openal.ALCapabilities; import org.lwjgl.openal.ALCapabilities;
import shootergame.util.math.vec.Vec3d;
public class AudioEngine public class AudioEngine
{ {
String deviceName; String deviceName;

View File

@ -1,27 +1,26 @@
package shootergame.audio; 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.ByteBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.nio.ShortBuffer; 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.stb.STBVorbis;
import org.lwjgl.system.MemoryStack; 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.Main;
import shootergame.display.Camera;
import shootergame.resources.Resource; import shootergame.resources.Resource;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;

View File

@ -2,7 +2,6 @@ package shootergame.audio;
import java.util.Random; import java.util.Random;
import shootergame.resources.Resource;
import shootergame.util.math.vec.Vec3d; import shootergame.util.math.vec.Vec3d;
public class AudioRandom extends AudioObject public class AudioRandom extends AudioObject

View File

@ -1,9 +1,8 @@
package shootergame.audio; package shootergame.audio;
import java.nio.IntBuffer; import static org.lwjgl.openal.AL10.alGenSources;
import java.util.ArrayList;
import static org.lwjgl.openal.AL11.*; import java.util.ArrayList;
public class AudioSources public class AudioSources
{ {

View File

@ -1,6 +1,15 @@
package shootergame.display; 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.joml.Matrix4f;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
@ -10,7 +19,6 @@ import shootergame.Main;
import shootergame.display.transparent.TransparentObjects; import shootergame.display.transparent.TransparentObjects;
import shootergame.entity.player.EntityPlayer; import shootergame.entity.player.EntityPlayer;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.text.Text;
import shootergame.util.gl.GlHelpers; import shootergame.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import shootergame.util.math.vec.Vec3d;

View File

@ -1,11 +1,9 @@
package shootergame.display; package shootergame.display;
import shootergame.Main; import shootergame.Main;
import shootergame.audio.AudioSources;
import shootergame.entity.EntityInventory; import shootergame.entity.EntityInventory;
import shootergame.entity.player.EntityPlayer; import shootergame.entity.player.EntityPlayer;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.inventory.IInventory;
import shootergame.inventory.Inventory; import shootergame.inventory.Inventory;
import shootergame.items.ItemStack; import shootergame.items.ItemStack;
import shootergame.text.Text; import shootergame.text.Text;

View File

@ -1,6 +1,5 @@
package shootergame.entity; package shootergame.entity;
import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import shootergame.Main; import shootergame.Main;
@ -13,8 +12,6 @@ import shootergame.util.math.MathHelpers;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d;
import shootergame.world.World;
import shootergame.world.chunk.Chunk; import shootergame.world.chunk.Chunk;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;

View File

@ -1,16 +1,11 @@
package shootergame.entity; package shootergame.entity;
import java.util.Random;
import shootergame.Main;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.particle.ParticleBlood; import shootergame.entity.particle.ParticleBlood;
import shootergame.init.Sounds; import shootergame.init.Sounds;
import shootergame.init.Tiles;
import shootergame.tiles.Tile; import shootergame.tiles.Tile;
import shootergame.util.gl.GlHelpers; import shootergame.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;
import shootergame.util.math.TileState;
import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;

View File

@ -1,23 +1,12 @@
package shootergame.entity; package shootergame.entity;
import java.util.ArrayList;
import java.util.Random;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main; 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 class EntityEventHandler implements IMainloopTask
{ {
public static final EntityEventHandler ENTITY_EVENT_HANDLER = new EntityEventHandler(); public static final EntityEventHandler ENTITY_EVENT_HANDLER = new EntityEventHandler();
private Random rand = new Random();
@Override @Override
public boolean MainLoopDelay(long millis) { public boolean MainLoopDelay(long millis) {
return millis > 10; return millis > 10;

View File

@ -1,7 +1,6 @@
package shootergame.entity; package shootergame.entity;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.inventory.Inventory;
import shootergame.items.ItemStack; import shootergame.items.ItemStack;
import shootergame.util.gl.GlHelpers; import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReference;

View File

@ -1,7 +1,5 @@
package shootergame.entity; package shootergame.entity;
import java.util.Random;
import shootergame.Main; import shootergame.Main;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.particle.ParticleBlood; import shootergame.entity.particle.ParticleBlood;
@ -11,7 +9,6 @@ import shootergame.entity.particle.ParticleSpark;
import shootergame.init.Sounds; import shootergame.init.Sounds;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.init.Tiles; import shootergame.init.Tiles;
import shootergame.tiles.TileStone;
import shootergame.util.gl.GlHelpers; import shootergame.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;

View File

@ -1,13 +1,9 @@
package shootergame.entity; package shootergame.entity;
import java.util.Random;
import shootergame.Main; import shootergame.Main;
import shootergame.init.Sounds;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.random.OpenSimplexNoise;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import shootergame.world.chunk.Chunk;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;

View File

@ -2,7 +2,6 @@ package shootergame.entity.particle;
import shootergame.Main; import shootergame.Main;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.EntityParticle;
import shootergame.entity.EntityVertical; import shootergame.entity.EntityVertical;
import shootergame.util.gl.GlHelpers; import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.texture.IHasTexture; import shootergame.util.gl.texture.IHasTexture;

View File

@ -1,7 +1,5 @@
package shootergame.entity.player; package shootergame.entity.player;
import java.util.Random;
import shootergame.Main; import shootergame.Main;
import shootergame.cheats.Cheats; import shootergame.cheats.Cheats;
import shootergame.display.Camera; import shootergame.display.Camera;
@ -10,10 +8,7 @@ import shootergame.entity.EntityAlive;
import shootergame.entity.EntityBullet; import shootergame.entity.EntityBullet;
import shootergame.entity.EntityInventory; import shootergame.entity.EntityInventory;
import shootergame.entity.EntityItem; import shootergame.entity.EntityItem;
import shootergame.entity.EntityTnt;
import shootergame.entity.EntityVertical; import shootergame.entity.EntityVertical;
import shootergame.init.Items;
import shootergame.init.Sounds;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.inventory.Inventory; import shootergame.inventory.Inventory;
import shootergame.items.ItemStack; import shootergame.items.ItemStack;
@ -21,8 +16,6 @@ import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; 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.chunk.Chunk;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;
@ -38,7 +31,6 @@ public class EntityPlayer extends EntityVertical implements EntityAlive, EntityI
public double height = 0; public double height = 0;
private int bullet_frequency = 0; private int bullet_frequency = 0;
private Random rand;
private double health_max = 1000; private double health_max = 1000;
private double health = health_max; private double health = health_max;
public boolean dead = false; public boolean dead = false;
@ -55,7 +47,6 @@ public class EntityPlayer extends EntityVertical implements EntityAlive, EntityI
super(TextureReference.EMPTY, size); super(TextureReference.EMPTY, size);
this.angle = 45; this.angle = 45;
rand = new Random();
// Set some settings // Set some settings
hitbox = 0.5; hitbox = 0.5;

View File

@ -5,10 +5,10 @@ import java.util.ArrayList;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import shootergame.display.DisplayWindow; import shootergame.display.DisplayWindow;
import shootergame.util.gl.texture.AnimationReference;
import shootergame.util.gl.texture.TextureMap; import shootergame.util.gl.texture.TextureMap;
import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReference;
import shootergame.util.gl.texture.TextureReferenceRandom; import shootergame.util.gl.texture.TextureReferenceRandom;
import shootergame.util.gl.texture.AnimationReference;
public class Textures public class Textures
{ {

View File

@ -1,6 +1,11 @@
package shootergame.input; 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; import org.lwjgl.glfw.GLFWKeyCallbackI;

View File

@ -1,14 +1,11 @@
package shootergame.resources; package shootergame.resources;
import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -17,7 +14,7 @@ public class Resource
String path; String path;
byte[] data; byte[] data;
private InputStream fileURLStream(String path, int tries) /*private InputStream fileURLStream(String path, int tries)
{ {
System.err.println("Getting \""+fileURL(path)+"\". Try "+ tries); System.err.println("Getting \""+fileURL(path)+"\". Try "+ tries);
@ -52,11 +49,11 @@ public class Resource
return this.fileURLStream(path, tries+1); return this.fileURLStream(path, tries+1);
} }
} }
} }*/
private InputStream fileURLStream(String path) { /*private InputStream fileURLStream(String path) {
return this.fileURLStream(path, 0); return this.fileURLStream(path, 0);
} }*/
private String fileURL(String path) { private String fileURL(String path) {
return "https://www.onewaycoding.ml/files/game_resources/ShooterGame/"+path; return "https://www.onewaycoding.ml/files/game_resources/ShooterGame/"+path;

View File

@ -1,6 +1,5 @@
package shootergame.resources; package shootergame.resources;
import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;

View File

@ -4,11 +4,9 @@ import shootergame.display.Camera;
import shootergame.display.transparent.ITransparentObject; import shootergame.display.transparent.ITransparentObject;
import shootergame.display.transparent.TransparentObjects; import shootergame.display.transparent.TransparentObjects;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.entity.player.EntityPlayer;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import shootergame.world.chunk.Chunk;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;

View File

@ -7,9 +7,7 @@ import shootergame.entity.Entity;
import shootergame.entity.EntityItem; import shootergame.entity.EntityItem;
import shootergame.init.Items; import shootergame.init.Items;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.items.Item;
import shootergame.items.ItemStack; import shootergame.items.ItemStack;
import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;

View File

@ -1,13 +1,10 @@
package shootergame.tiles; package shootergame.tiles;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.player.EntityPlayer;
import shootergame.util.gl.GlHelpers; import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.texture.IHasTexture; import shootergame.util.gl.texture.IHasTexture;
import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; 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 public class TileFlat extends Tile implements IHasTexture
{ {

View File

@ -1,7 +1,6 @@
package shootergame.tiles; package shootergame.tiles;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
public class TileLadder extends TileVertical public class TileLadder extends TileVertical

View File

@ -5,10 +5,8 @@ import shootergame.Main;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.entity.player.EntityPlayer; import shootergame.entity.player.EntityPlayer;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;
public class TileLadderUp extends TileVertical public class TileLadderUp extends TileVertical

View File

@ -5,12 +5,8 @@ import shootergame.Main;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.entity.player.EntityPlayer; import shootergame.entity.player.EntityPlayer;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.init.Tiles;
import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk;
import shootergame.world.chunk.ChunkEventHandler; import shootergame.world.chunk.ChunkEventHandler;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;

View File

@ -1,14 +1,10 @@
package shootergame.tiles; package shootergame.tiles;
import shootergame.Main;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.player.EntityPlayer;
import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.VerticalRender; import shootergame.util.gl.VerticalRender;
import shootergame.util.gl.texture.IHasTexture; import shootergame.util.gl.texture.IHasTexture;
import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i;
public class TileVertical extends Tile implements IHasTexture public class TileVertical extends Tile implements IHasTexture
{ {

View File

@ -1,7 +1,6 @@
package shootergame.tiles; package shootergame.tiles;
import shootergame.init.Textures; import shootergame.init.Textures;
import shootergame.util.gl.texture.TextureReference;
public class TileWall extends TileFlat public class TileWall extends TileFlat
{ {

View File

@ -1,9 +1,23 @@
package shootergame.util.gl; package shootergame.util.gl;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.GL_ALPHA;
import static org.lwjgl.opengl.GL11.GL_BLEND;
import shootergame.Main; import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
import shootergame.display.DisplayRender; 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 public class GlHelpers
{ {

View File

@ -1,7 +1,6 @@
package shootergame.util.gl; package shootergame.util.gl;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.player.EntityPlayer;
import shootergame.util.gl.texture.TextureReference; import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;

View File

@ -1,7 +1,6 @@
package shootergame.util.gl.texture; package shootergame.util.gl.texture;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import mainloop.task.MainloopTask;
import shootergame.init.Textures; import shootergame.init.Textures;
public class AnimationEventHandler implements IMainloopTask public class AnimationEventHandler implements IMainloopTask

View File

@ -1,15 +1,6 @@
package shootergame.util.gl.texture; 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.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.MappedByteBuffer;
import java.nio.charset.StandardCharsets;
import javax.swing.plaf.SliderUI;
import org.lwjgl.stb.STBImage; import org.lwjgl.stb.STBImage;

View File

@ -1,6 +1,15 @@
package shootergame.util.gl.texture; 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; import shootergame.resources.Resource;

View File

@ -1,6 +1,6 @@
package shootergame.util.gl.texture; package shootergame.util.gl.texture;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.glTexCoord2f;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;

View File

@ -1,6 +1,5 @@
package shootergame.util.gl.texture; package shootergame.util.gl.texture;
import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.random.RandomHelpers;

View File

@ -6,13 +6,11 @@ import java.util.Random;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.entity.EntityAlive; import shootergame.entity.EntityAlive;
import shootergame.entity.EntityTnt;
import shootergame.entity.particle.ParticleBreak; import shootergame.entity.particle.ParticleBreak;
import shootergame.init.Tiles; import shootergame.init.Tiles;
import shootergame.tiles.Tile; import shootergame.tiles.Tile;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.random.RandomHelpers;
import shootergame.util.math.range.Range2i; import shootergame.util.math.range.Range2i;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; 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_front_meta[] = new short[CHUNK_INDEX];
private short tiles_back_meta[] = new short[CHUNK_INDEX]; private short tiles_back_meta[] = new short[CHUNK_INDEX];
public ArrayList<Entity> entities = new ArrayList<Entity>(); public ArrayList<Entity> entities = new ArrayList<Entity>();
private Random rand;
private Layer layer; private Layer layer;
private Vec2i c_pos; private Vec2i c_pos;
public Chunk(Layer layer, Vec2i c_pos, Random rand) public Chunk(Layer layer, Vec2i c_pos, Random rand)
{ {
// Set some specified values // Set some specified values
this.rand = rand;
this.layer = layer; this.layer = layer;
this.c_pos = c_pos; this.c_pos = c_pos;

View File

@ -4,8 +4,6 @@ import java.util.ArrayList;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.init.Tiles;
import shootergame.tiles.Tile;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;

View File

@ -1,12 +1,8 @@
package shootergame.world.chunk; package shootergame.world.chunk;
import java.util.Random;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main; import shootergame.Main;
import shootergame.util.math.map.Map2DElement; 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.util.math.vec.Vec2i;
import shootergame.world.layer.Layer; import shootergame.world.layer.Layer;

View File

@ -6,15 +6,12 @@ import java.util.Random;
import shootergame.Main; import shootergame.Main;
import shootergame.display.Camera; import shootergame.display.Camera;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.init.Tiles;
import shootergame.tiles.Tile;
import shootergame.util.math.MathHelpers; import shootergame.util.math.MathHelpers;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.map.Map2D; import shootergame.util.math.map.Map2D;
import shootergame.util.math.map.Map2DElement; import shootergame.util.math.map.Map2DElement;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;
import shootergame.world.World;
import shootergame.world.chunk.Chunk; import shootergame.world.chunk.Chunk;
import shootergame.world.layer.layergen.LayerGen; import shootergame.world.layer.layergen.LayerGen;

View File

@ -2,15 +2,10 @@ package shootergame.world.layer.layergen;
import java.util.Random; import java.util.Random;
import org.lwjgl.stb.STBPerlin;
import shootergame.Main; import shootergame.Main;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.entity.EntityItem;
import shootergame.entity.EntityZombie; import shootergame.entity.EntityZombie;
import shootergame.init.Items;
import shootergame.init.Tiles; import shootergame.init.Tiles;
import shootergame.items.ItemStack;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.random.OpenSimplexNoise;
import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.random.RandomHelpers;

View File

@ -4,14 +4,11 @@ import java.util.Random;
import shootergame.Main; import shootergame.Main;
import shootergame.entity.Entity; import shootergame.entity.Entity;
import shootergame.entity.EntityBullet;
import shootergame.entity.EntityZombie; import shootergame.entity.EntityZombie;
import shootergame.init.Tiles; import shootergame.init.Tiles;
import shootergame.tiles.Tile;
import shootergame.util.math.TileState; import shootergame.util.math.TileState;
import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.random.OpenSimplexNoise;
import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.random.RandomHelpers;
import shootergame.util.math.range.Range2i;
import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import shootergame.world.chunk.Chunk;