Changed the games name from "ShooterGame" to "Catalyst Survival"

This commit is contained in:
josua 2019-11-16 16:16:14 +11:00
parent 1fe8670169
commit 25e4123d7a
150 changed files with 871 additions and 871 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ShooterGame</name> <name>CatalystSurvival</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

View File

@ -1,29 +1,29 @@
package shootergame; package catalystsurvival;
import java.util.Random; import java.util.Random;
import catalystsurvival.audio.AudioEngine;
import catalystsurvival.audio.AudioSources;
import catalystsurvival.cheats.Cheats;
import catalystsurvival.display.DisplayStatsEventHandler;
import catalystsurvival.display.DisplayWindow;
import catalystsurvival.entity.EntityEventHandler;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.init.Layers;
import catalystsurvival.init.Resources;
import catalystsurvival.init.Sounds;
import catalystsurvival.init.Textures;
import catalystsurvival.input.JoystickCallback;
import catalystsurvival.input.KeyCallback;
import catalystsurvival.mainloop.MainloopEventHandler;
import catalystsurvival.menu.Menu;
import catalystsurvival.menu.MenuGame;
import catalystsurvival.tiles.LightLevelNoise;
import catalystsurvival.time.GameTimer;
import catalystsurvival.time.NoSleep;
import catalystsurvival.world.World;
import catalystsurvival.world.chunk.ChunkEventHandler;
import mainloop.manager.MainloopManager; import mainloop.manager.MainloopManager;
import shootergame.audio.AudioEngine;
import shootergame.audio.AudioSources;
import shootergame.cheats.Cheats;
import shootergame.display.DisplayStatsEventHandler;
import shootergame.display.DisplayWindow;
import shootergame.entity.EntityEventHandler;
import shootergame.entity.player.EntityPlayer;
import shootergame.init.Layers;
import shootergame.init.Resources;
import shootergame.init.Sounds;
import shootergame.init.Textures;
import shootergame.input.JoystickCallback;
import shootergame.input.KeyCallback;
import shootergame.mainloop.MainloopEventHandler;
import shootergame.menu.Menu;
import shootergame.menu.MenuGame;
import shootergame.tiles.LightLevelNoise;
import shootergame.time.GameTimer;
import shootergame.time.NoSleep;
import shootergame.world.World;
import shootergame.world.chunk.ChunkEventHandler;
public class Main public class Main
{ {

View File

@ -1,4 +1,4 @@
package shootergame.audio; package catalystsurvival.audio;
import static org.lwjgl.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER; import static org.lwjgl.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER;
import static org.lwjgl.openal.ALC10.alcCloseDevice; import static org.lwjgl.openal.ALC10.alcCloseDevice;

View File

@ -1,4 +1,4 @@
package shootergame.audio; package catalystsurvival.audio;
import static org.lwjgl.openal.AL10.AL_BUFFER; 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_MONO16;
@ -20,11 +20,11 @@ import java.nio.ShortBuffer;
import org.lwjgl.stb.STBVorbis; import org.lwjgl.stb.STBVorbis;
import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryStack;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.resources.Resource; import catalystsurvival.resources.Resource;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
public class AudioObject public class AudioObject
{ {

View File

@ -1,8 +1,8 @@
package shootergame.audio; package catalystsurvival.audio;
import java.util.Random; import java.util.Random;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
public class AudioRandom extends AudioObject public class AudioRandom extends AudioObject
{ {

View File

@ -1,4 +1,4 @@
package shootergame.audio; package catalystsurvival.audio;
import static org.lwjgl.openal.AL10.alGenSources; import static org.lwjgl.openal.AL10.alGenSources;

View File

@ -1,4 +1,4 @@
package shootergame.cheats; package catalystsurvival.cheats;
public class Cheats public class Cheats
{ {

View File

@ -1,8 +1,8 @@
package shootergame.display; package catalystsurvival.display;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
public class Camera public class Camera
{ {

View File

@ -1,4 +1,4 @@
package shootergame.display; package catalystsurvival.display;
import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; 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_DEPTH_BUFFER_BIT;
@ -15,14 +15,14 @@ import org.joml.Matrix4f;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryStack;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.lighting.LightingManager; import catalystsurvival.display.lighting.LightingManager;
import shootergame.display.transparent.TransparentObjects; import catalystsurvival.display.transparent.TransparentObjects;
import shootergame.entity.player.EntityPlayer; import catalystsurvival.entity.player.EntityPlayer;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
public class DisplayRender public class DisplayRender
{ {

View File

@ -1,15 +1,15 @@
package shootergame.display; package catalystsurvival.display;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.bossbar.BossBars; import catalystsurvival.display.bossbar.BossBars;
import shootergame.entity.player.EntityPlayer; import catalystsurvival.entity.player.EntityPlayer;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.inventory.Inventory; import catalystsurvival.inventory.Inventory;
import shootergame.text.Text; import catalystsurvival.text.Text;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class DisplayRenderUI public class DisplayRenderUI
{ {

View File

@ -1,7 +1,7 @@
package shootergame.display; package catalystsurvival.display;
import catalystsurvival.mainloop.MainloopEventHandler;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.mainloop.MainloopEventHandler;
public class DisplayStatsEventHandler implements IMainloopTask public class DisplayStatsEventHandler implements IMainloopTask
{ {

View File

@ -1,22 +1,22 @@
package shootergame.display; package catalystsurvival.display;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import catalystsurvival.Main;
import catalystsurvival.input.CursorEnterCallback;
import catalystsurvival.input.CursorPosCallback;
import catalystsurvival.input.JoystickCallback;
import catalystsurvival.input.KeyCallback;
import catalystsurvival.input.KeyCharCallback;
import catalystsurvival.input.MouseButtonCallback;
import catalystsurvival.input.ScrollWheelCallback;
import catalystsurvival.mainloop.MainloopEventHandler;
import catalystsurvival.util.gl.GlHelpers;
import catalystsurvival.util.gl.texture.AnimationEventHandler;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.input.CursorEnterCallback;
import shootergame.input.CursorPosCallback;
import shootergame.input.JoystickCallback;
import shootergame.input.KeyCallback;
import shootergame.input.KeyCharCallback;
import shootergame.input.MouseButtonCallback;
import shootergame.input.ScrollWheelCallback;
import shootergame.mainloop.MainloopEventHandler;
import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.texture.AnimationEventHandler;
public class DisplayWindow implements IMainloopTask public class DisplayWindow implements IMainloopTask
{ {

View File

@ -1,10 +1,10 @@
package shootergame.display.bossbar; package catalystsurvival.display.bossbar;
import java.util.ArrayList; import java.util.ArrayList;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
public class BossBars public class BossBars
{ {

View File

@ -1,6 +1,6 @@
package shootergame.display.bossbar; package catalystsurvival.display.bossbar;
import shootergame.entity.EntityAlive; import catalystsurvival.entity.EntityAlive;
public interface IBossBar extends EntityAlive public interface IBossBar extends EntityAlive
{ {

View File

@ -1,15 +1,15 @@
package shootergame.display.lighting; package catalystsurvival.display.lighting;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.player.EntityPlayer; import catalystsurvival.entity.player.EntityPlayer;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.chunk.ChunkEventHandler; import catalystsurvival.world.chunk.ChunkEventHandler;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class LightingManager public class LightingManager
{ {

View File

@ -1,8 +1,8 @@
package shootergame.display.transparent; package catalystsurvival.display.transparent;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public interface ITransparentObject public interface ITransparentObject
{ {

View File

@ -1,9 +1,9 @@
package shootergame.display.transparent; package catalystsurvival.display.transparent;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
class TransparentObject class TransparentObject
{ {

View File

@ -1,8 +1,8 @@
package shootergame.display.transparent; package catalystsurvival.display.transparent;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class TransparentObjects public class TransparentObjects
{ {

View File

@ -1,20 +1,20 @@
package shootergame.entity; package catalystsurvival.entity;
import java.util.Random; import java.util.Random;
import catalystsurvival.Main;
import catalystsurvival.display.Camera;
import catalystsurvival.display.transparent.ITransparentObject;
import catalystsurvival.display.transparent.TransparentObjects;
import catalystsurvival.init.Entities;
import catalystsurvival.tiles.Tile;
import catalystsurvival.util.math.MathHelpers;
import catalystsurvival.util.math.TileState;
import catalystsurvival.util.math.vec.Vec2d;
import catalystsurvival.util.math.vec.Vec2i;
import catalystsurvival.world.chunk.Chunk;
import catalystsurvival.world.layer.Layer;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.display.Camera;
import shootergame.display.transparent.ITransparentObject;
import shootergame.display.transparent.TransparentObjects;
import shootergame.init.Entities;
import shootergame.tiles.Tile;
import shootergame.util.math.MathHelpers;
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.layer.Layer;
public class Entity implements ITransparentObject public class Entity implements ITransparentObject
{ {

View File

@ -1,6 +1,6 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public interface EntityAlive public interface EntityAlive
{ {

View File

@ -1,23 +1,23 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.display.bossbar.BossBars; import catalystsurvival.display.bossbar.BossBars;
import shootergame.display.bossbar.IBossBar; import catalystsurvival.display.bossbar.IBossBar;
import shootergame.init.Items; import catalystsurvival.init.Items;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.init.Tiles; import catalystsurvival.init.Tiles;
import shootergame.time.GameTimer; import catalystsurvival.time.GameTimer;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.random.OpenSimplexNoise; import catalystsurvival.util.math.random.OpenSimplexNoise;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityBoss extends EntityVertical implements IBossBar public class EntityBoss extends EntityVertical implements IBossBar
{ {

View File

@ -1,17 +1,17 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.particle.ParticleBlood; import catalystsurvival.entity.particle.ParticleBlood;
import shootergame.init.Sounds; import catalystsurvival.init.Sounds;
import shootergame.tiles.Tile; import catalystsurvival.tiles.Tile;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityBullet extends EntityParticle public class EntityBullet extends EntityParticle
{ {

View File

@ -1,7 +1,7 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class EntityDummy extends EntityVertical implements EntityAlive public class EntityDummy extends EntityVertical implements EntityAlive
{ {

View File

@ -1,7 +1,7 @@
package shootergame.entity; package catalystsurvival.entity;
import catalystsurvival.Main;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
public class EntityEventHandler implements IMainloopTask public class EntityEventHandler implements IMainloopTask
{ {

View File

@ -1,18 +1,18 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.entity.particle.ParticleBlood; import catalystsurvival.entity.particle.ParticleBlood;
import shootergame.entity.particle.ParticleBreak; import catalystsurvival.entity.particle.ParticleBreak;
import shootergame.entity.particle.ParticleSmoke; import catalystsurvival.entity.particle.ParticleSmoke;
import shootergame.init.Sounds; import catalystsurvival.init.Sounds;
import shootergame.init.Tiles; import catalystsurvival.init.Tiles;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityExplosion extends Entity public class EntityExplosion extends Entity
{ {

View File

@ -1,10 +1,10 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityFlare extends EntityTnt public class EntityFlare extends EntityTnt
{ {

View File

@ -1,15 +1,15 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.player.EntityPlayer; import catalystsurvival.entity.player.EntityPlayer;
import shootergame.init.Layers; import catalystsurvival.init.Layers;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
import shootergame.world.layer.layergen.LayerGenRememberPlayerPos; import catalystsurvival.world.layer.layergen.LayerGenRememberPlayerPos;
public class EntityGrapplingHook extends EntityVertical public class EntityGrapplingHook extends EntityVertical
{ {

View File

@ -1,4 +1,4 @@
package shootergame.entity; package catalystsurvival.entity;
public interface EntityHeight public interface EntityHeight
{ {

View File

@ -0,0 +1,8 @@
package catalystsurvival.entity;
import catalystsurvival.inventory.Inventory;
public interface EntityInventory
{
public Inventory getInventory();
}

View File

@ -1,13 +1,13 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityItem extends EntityVertical public class EntityItem extends EntityVertical
{ {

View File

@ -1,11 +1,11 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityParticle extends Entity public class EntityParticle extends Entity
{ {

View File

@ -1,14 +1,14 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.particle.ParticleSpark; import catalystsurvival.entity.particle.ParticleSpark;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityTnt extends EntityVertical public class EntityTnt extends EntityVertical
{ {

View File

@ -1,12 +1,12 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.VerticalRender; import catalystsurvival.util.gl.VerticalRender;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
public class EntityVertical extends Entity public class EntityVertical extends Entity
{ {

View File

@ -1,11 +1,11 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.random.OpenSimplexNoise; import catalystsurvival.util.math.random.OpenSimplexNoise;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class EntityZombie extends EntityVertical implements EntityAlive public class EntityZombie extends EntityVertical implements EntityAlive
{ {

View File

@ -1,9 +1,9 @@
package shootergame.entity; package catalystsurvival.entity;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class EntityZombieArmored extends EntityZombie public class EntityZombieArmored extends EntityZombie
{ {

View File

@ -1,17 +1,17 @@
package shootergame.entity.particle; package catalystsurvival.entity.particle;
import java.util.Random; import java.util.Random;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.EntityParticle; import catalystsurvival.entity.EntityParticle;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ParticleBlood extends EntityParticle public class ParticleBlood extends EntityParticle
{ {

View File

@ -1,19 +1,19 @@
package shootergame.entity.particle; package catalystsurvival.entity.particle;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.EntityVertical; import catalystsurvival.entity.EntityVertical;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.IHasTexture; import catalystsurvival.util.gl.texture.IHasTexture;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ParticleBreak extends EntityVertical public class ParticleBreak extends EntityVertical
{ {

View File

@ -1,16 +1,16 @@
package shootergame.entity.particle; package catalystsurvival.entity.particle;
import java.util.Random; import java.util.Random;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.EntityParticle; import catalystsurvival.entity.EntityParticle;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ParticleLava extends EntityParticle public class ParticleLava extends EntityParticle
{ {

View File

@ -1,14 +1,14 @@
package shootergame.entity.particle; package catalystsurvival.entity.particle;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.EntityVertical; import catalystsurvival.entity.EntityVertical;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ParticleSmoke extends EntityVertical public class ParticleSmoke extends EntityVertical
{ {

View File

@ -1,11 +1,11 @@
package shootergame.entity.particle; package catalystsurvival.entity.particle;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.EntityParticle; import catalystsurvival.entity.EntityParticle;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ParticleSpark extends EntityParticle public class ParticleSpark extends EntityParticle
{ {

View File

@ -1,15 +1,15 @@
package shootergame.entity.particle; package catalystsurvival.entity.particle;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.EntityParticle; import catalystsurvival.entity.EntityParticle;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ParticleWater extends EntityParticle public class ParticleWater extends EntityParticle
{ {

View File

@ -1,27 +1,27 @@
package shootergame.entity.player; package catalystsurvival.entity.player;
import catalystsurvival.Main;
import catalystsurvival.cheats.Cheats;
import catalystsurvival.display.Camera;
import catalystsurvival.entity.Entity;
import catalystsurvival.entity.EntityAlive;
import catalystsurvival.entity.EntityBullet;
import catalystsurvival.entity.EntityHeight;
import catalystsurvival.entity.EntityInventory;
import catalystsurvival.entity.EntityItem;
import catalystsurvival.entity.EntityVertical;
import catalystsurvival.init.Textures;
import catalystsurvival.inventory.Inventory;
import catalystsurvival.menu.MenuDeath;
import catalystsurvival.util.gl.GlHelpers;
import catalystsurvival.util.gl.texture.TextureReference;
import catalystsurvival.util.math.ItemStack;
import catalystsurvival.util.math.MathHelpers;
import catalystsurvival.util.math.vec.Vec2d;
import catalystsurvival.util.math.vec.Vec2i;
import catalystsurvival.world.chunk.Chunk;
import catalystsurvival.world.layer.Layer;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.cheats.Cheats;
import shootergame.display.Camera;
import shootergame.entity.Entity;
import shootergame.entity.EntityAlive;
import shootergame.entity.EntityBullet;
import shootergame.entity.EntityHeight;
import shootergame.entity.EntityInventory;
import shootergame.entity.EntityItem;
import shootergame.entity.EntityVertical;
import shootergame.init.Textures;
import shootergame.inventory.Inventory;
import shootergame.menu.MenuDeath;
import shootergame.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference;
import shootergame.util.math.ItemStack;
import shootergame.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk;
import shootergame.world.layer.Layer;
public class EntityPlayer extends EntityVertical implements EntityAlive, EntityInventory, EntityHeight public class EntityPlayer extends EntityVertical implements EntityAlive, EntityInventory, EntityHeight
{ {

View File

@ -1,8 +1,8 @@
package shootergame.init; package catalystsurvival.init;
import java.util.ArrayList; import java.util.ArrayList;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
public class Entities public class Entities
{ {

View File

@ -1,15 +1,15 @@
package shootergame.init; package catalystsurvival.init;
import shootergame.items.Item; import catalystsurvival.items.Item;
import shootergame.items.ItemAmmo; import catalystsurvival.items.ItemAmmo;
import shootergame.items.ItemDefenceUpgrade; import catalystsurvival.items.ItemDefenceUpgrade;
import shootergame.items.ItemEmpty; import catalystsurvival.items.ItemEmpty;
import shootergame.items.ItemFlare; import catalystsurvival.items.ItemFlare;
import shootergame.items.ItemGrapplingHook; import catalystsurvival.items.ItemGrapplingHook;
import shootergame.items.ItemGunUpgrade; import catalystsurvival.items.ItemGunUpgrade;
import shootergame.items.ItemHealthPotion; import catalystsurvival.items.ItemHealthPotion;
import shootergame.items.ItemLantern; import catalystsurvival.items.ItemLantern;
import shootergame.items.ItemTnt; import catalystsurvival.items.ItemTnt;
public class Items public class Items
{ {

View File

@ -1,14 +1,14 @@
package shootergame.init; package catalystsurvival.init;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.world.World; import catalystsurvival.world.World;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
import shootergame.world.layer.layergen.LayerGenCaves; import catalystsurvival.world.layer.layergen.LayerGenCaves;
import shootergame.world.layer.layergen.LayerGenEarth; import catalystsurvival.world.layer.layergen.LayerGenEarth;
import shootergame.world.layer.layergen.LayerGenLavaCaves; import catalystsurvival.world.layer.layergen.LayerGenLavaCaves;
public class Layers public class Layers
{ {

View File

@ -1,6 +1,6 @@
package shootergame.init; package catalystsurvival.init;
import shootergame.resources.Resource; import catalystsurvival.resources.Resource;
public class Resources public class Resources
{ {

View File

@ -1,7 +1,7 @@
package shootergame.init; package catalystsurvival.init;
import shootergame.audio.AudioObject; import catalystsurvival.audio.AudioObject;
import shootergame.audio.AudioRandom; import catalystsurvival.audio.AudioRandom;
public class Sounds public class Sounds
{ {

View File

@ -1,14 +1,14 @@
package shootergame.init; package catalystsurvival.init;
import java.util.ArrayList; import java.util.ArrayList;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import shootergame.display.DisplayWindow; import catalystsurvival.display.DisplayWindow;
import shootergame.util.gl.texture.AnimationReference; import catalystsurvival.util.gl.texture.AnimationReference;
import shootergame.util.gl.texture.TextureMap; import catalystsurvival.util.gl.texture.TextureMap;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.gl.texture.TextureReferenceRandom; import catalystsurvival.util.gl.texture.TextureReferenceRandom;
public class Textures public class Textures
{ {

View File

@ -1,26 +1,26 @@
package shootergame.init; package catalystsurvival.init;
import shootergame.tiles.Tile; import catalystsurvival.tiles.Tile;
import shootergame.tiles.TileBossPortal; import catalystsurvival.tiles.TileBossPortal;
import shootergame.tiles.TileChest; import catalystsurvival.tiles.TileChest;
import shootergame.tiles.TileDirt; import catalystsurvival.tiles.TileDirt;
import shootergame.tiles.TileFire; import catalystsurvival.tiles.TileFire;
import shootergame.tiles.TileGrass; import catalystsurvival.tiles.TileGrass;
import shootergame.tiles.TileLadder; import catalystsurvival.tiles.TileLadder;
import shootergame.tiles.TileLadderUp; import catalystsurvival.tiles.TileLadderUp;
import shootergame.tiles.TileLantern; import catalystsurvival.tiles.TileLantern;
import shootergame.tiles.TileLava; import catalystsurvival.tiles.TileLava;
import shootergame.tiles.TileLavaFlow; import catalystsurvival.tiles.TileLavaFlow;
import shootergame.tiles.TilePortalDown; import catalystsurvival.tiles.TilePortalDown;
import shootergame.tiles.TileRock; import catalystsurvival.tiles.TileRock;
import shootergame.tiles.TileSand; import catalystsurvival.tiles.TileSand;
import shootergame.tiles.TileStone; import catalystsurvival.tiles.TileStone;
import shootergame.tiles.TileTree; import catalystsurvival.tiles.TileTree;
import shootergame.tiles.TileVoid; import catalystsurvival.tiles.TileVoid;
import shootergame.tiles.TileWall; import catalystsurvival.tiles.TileWall;
import shootergame.tiles.TileWallUnbreakable; import catalystsurvival.tiles.TileWallUnbreakable;
import shootergame.tiles.TileWater; import catalystsurvival.tiles.TileWater;
import shootergame.tiles.TileWaterFlow; import catalystsurvival.tiles.TileWaterFlow;
public class Tiles public class Tiles
{ {

View File

@ -1,4 +1,4 @@
package shootergame.input; package catalystsurvival.input;
import org.lwjgl.glfw.GLFWCursorEnterCallbackI; import org.lwjgl.glfw.GLFWCursorEnterCallbackI;

View File

@ -1,9 +1,9 @@
package shootergame.input; package catalystsurvival.input;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWCursorPosCallbackI; import org.lwjgl.glfw.GLFWCursorPosCallbackI;
import shootergame.Main; import catalystsurvival.Main;
public class CursorPosCallback implements GLFWCursorPosCallbackI public class CursorPosCallback implements GLFWCursorPosCallbackI
{ {

View File

@ -1,4 +1,4 @@
package shootergame.input; package catalystsurvival.input;
class GameInput class GameInput
{ {

View File

@ -1,15 +1,15 @@
package shootergame.input; package catalystsurvival.input;
import static shootergame.input.GameInput.activateItem_last; import static catalystsurvival.input.GameInput.activateItem_last;
import static shootergame.input.GameInput.activateTile_last; import static catalystsurvival.input.GameInput.activateTile_last;
import static shootergame.input.GameInput.dropItem_last; import static catalystsurvival.input.GameInput.dropItem_last;
import static shootergame.input.GameInput.fireGun; import static catalystsurvival.input.GameInput.fireGun;
import static shootergame.input.GameInput.hotbar_l; import static catalystsurvival.input.GameInput.hotbar_l;
import static shootergame.input.GameInput.hotbar_r; import static catalystsurvival.input.GameInput.hotbar_r;
import static shootergame.input.GameInput.moveDown; import static catalystsurvival.input.GameInput.moveDown;
import static shootergame.input.GameInput.moveUp; import static catalystsurvival.input.GameInput.moveUp;
import static shootergame.input.GameInput.move_last; import static catalystsurvival.input.GameInput.move_last;
import static shootergame.input.GameInput.startButton_last; import static catalystsurvival.input.GameInput.startButton_last;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
@ -18,9 +18,9 @@ import java.util.ArrayList;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWJoystickCallbackI; import org.lwjgl.glfw.GLFWJoystickCallbackI;
import catalystsurvival.Main;
import catalystsurvival.input.types.Input;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.input.types.Input;
public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask
{ {

View File

@ -1,5 +1,11 @@
package shootergame.input; package catalystsurvival.input;
import static catalystsurvival.input.GameInput.fireGun;
import static catalystsurvival.input.GameInput.moveDown;
import static catalystsurvival.input.GameInput.moveLeft;
import static catalystsurvival.input.GameInput.moveRight;
import static catalystsurvival.input.GameInput.moveUp;
import static catalystsurvival.input.GameInput.move_last;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_1; import static org.lwjgl.glfw.GLFW.GLFW_KEY_1;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_2; import static org.lwjgl.glfw.GLFW.GLFW_KEY_2;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_3; import static org.lwjgl.glfw.GLFW.GLFW_KEY_3;
@ -15,19 +21,13 @@ import static org.lwjgl.glfw.GLFW.GLFW_KEY_Q;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_S; 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_KEY_W;
import static org.lwjgl.glfw.GLFW.GLFW_RELEASE; import static org.lwjgl.glfw.GLFW.GLFW_RELEASE;
import static shootergame.input.GameInput.fireGun;
import static shootergame.input.GameInput.moveDown;
import static shootergame.input.GameInput.moveLeft;
import static shootergame.input.GameInput.moveRight;
import static shootergame.input.GameInput.moveUp;
import static shootergame.input.GameInput.move_last;
import org.lwjgl.glfw.GLFWKeyCallbackI; import org.lwjgl.glfw.GLFWKeyCallbackI;
import catalystsurvival.Main;
import catalystsurvival.input.types.Input;
import catalystsurvival.util.math.vec.Vec2d;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.input.types.Input;
import shootergame.util.math.vec.Vec2d;
public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask
{ {

View File

@ -1,4 +1,4 @@
package shootergame.input; package catalystsurvival.input;
import org.lwjgl.glfw.GLFWCharCallbackI; import org.lwjgl.glfw.GLFWCharCallbackI;

View File

@ -1,9 +1,9 @@
package shootergame.input; package catalystsurvival.input;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWMouseButtonCallbackI; import org.lwjgl.glfw.GLFWMouseButtonCallbackI;
import shootergame.Main; import catalystsurvival.Main;
public class MouseButtonCallback implements GLFWMouseButtonCallbackI public class MouseButtonCallback implements GLFWMouseButtonCallbackI
{ {

View File

@ -1,8 +1,8 @@
package shootergame.input; package catalystsurvival.input;
import org.lwjgl.glfw.GLFWScrollCallbackI; import org.lwjgl.glfw.GLFWScrollCallbackI;
import shootergame.Main; import catalystsurvival.Main;
public class ScrollWheelCallback implements GLFWScrollCallbackI public class ScrollWheelCallback implements GLFWScrollCallbackI
{ {

View File

@ -1,4 +1,4 @@
package shootergame.input.types; package catalystsurvival.input.types;
public interface Input public interface Input
{ {

View File

@ -1,8 +1,8 @@
package shootergame.input.types; package catalystsurvival.input.types;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.menu.Menu; import catalystsurvival.menu.Menu;
import shootergame.menu.MenuDeath; import catalystsurvival.menu.MenuDeath;
public class InputDeath implements Input public class InputDeath implements Input
{ {

View File

@ -1,8 +1,8 @@
package shootergame.input.types; package catalystsurvival.input.types;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.menu.MenuGamePause; import catalystsurvival.menu.MenuGamePause;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
public class InputGame implements Input public class InputGame implements Input
{ {

View File

@ -1,9 +1,9 @@
package shootergame.input.types; package catalystsurvival.input.types;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.menu.Menu; import catalystsurvival.menu.Menu;
import shootergame.menu.MenuGame; import catalystsurvival.menu.MenuGame;
import shootergame.menu.MenuGamePause; import catalystsurvival.menu.MenuGamePause;
public class InputGamePause implements Input public class InputGamePause implements Input
{ {

View File

@ -1,4 +1,4 @@
package shootergame.input.types; package catalystsurvival.input.types;
public class InputMenu implements Input public class InputMenu implements Input
{ {

View File

@ -1,6 +1,6 @@
package shootergame.inventory; package catalystsurvival.inventory;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
public interface IInventory public interface IInventory
{ {

View File

@ -1,6 +1,6 @@
package shootergame.inventory; package catalystsurvival.inventory;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
public class Inventory implements IInventory public class Inventory implements IInventory
{ {

View File

@ -1,14 +1,14 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityInventory; import catalystsurvival.entity.EntityInventory;
import shootergame.inventory.Inventory; import catalystsurvival.inventory.Inventory;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class Item public class Item
{ {

View File

@ -1,11 +1,11 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.player.EntityPlayer; import catalystsurvival.entity.player.EntityPlayer;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemAmmo extends Item public class ItemAmmo extends Item
{ {

View File

@ -1,11 +1,11 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemDefenceUpgrade extends Item public class ItemDefenceUpgrade extends Item
{ {

View File

@ -1,10 +1,10 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemEmpty extends Item public class ItemEmpty extends Item
{ {

View File

@ -1,11 +1,11 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityFlare; import catalystsurvival.entity.EntityFlare;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemFlare extends Item public class ItemFlare extends Item
{ {

View File

@ -1,13 +1,13 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityGrapplingHook; import catalystsurvival.entity.EntityGrapplingHook;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemGrapplingHook extends Item public class ItemGrapplingHook extends Item
{ {

View File

@ -1,11 +1,11 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemGunUpgrade extends Item public class ItemGunUpgrade extends Item
{ {

View File

@ -1,11 +1,11 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityAlive; import catalystsurvival.entity.EntityAlive;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemHealthPotion extends Item public class ItemHealthPotion extends Item
{ {

View File

@ -1,13 +1,13 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.init.Tiles; import catalystsurvival.init.Tiles;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.MathHelpers; import catalystsurvival.util.math.MathHelpers;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemLantern extends Item public class ItemLantern extends Item
{ {

View File

@ -1,11 +1,11 @@
package shootergame.items; package catalystsurvival.items;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityTnt; import catalystsurvival.entity.EntityTnt;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class ItemTnt extends Item public class ItemTnt extends Item
{ {

View File

@ -1,8 +1,8 @@
package shootergame.mainloop; package catalystsurvival.mainloop;
import catalystsurvival.Main;
import mainloop.event.IMainloopEvent; import mainloop.event.IMainloopEvent;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
public class MainloopEventHandler implements IMainloopEvent, IMainloopTask public class MainloopEventHandler implements IMainloopEvent, IMainloopTask
{ {

View File

@ -1,6 +1,6 @@
package shootergame.menu; package catalystsurvival.menu;
import shootergame.input.types.Input; import catalystsurvival.input.types.Input;
public abstract class Menu public abstract class Menu
{ {

View File

@ -1,9 +1,9 @@
package shootergame.menu; package catalystsurvival.menu;
import shootergame.input.types.InputDeath; import catalystsurvival.input.types.InputDeath;
import shootergame.text.Text; import catalystsurvival.text.Text;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class MenuDeath extends Menu public class MenuDeath extends Menu
{ {

View File

@ -1,7 +1,7 @@
package shootergame.menu; package catalystsurvival.menu;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.input.types.InputGame; import catalystsurvival.input.types.InputGame;
public class MenuGame extends Menu public class MenuGame extends Menu
{ {

View File

@ -1,9 +1,9 @@
package shootergame.menu; package catalystsurvival.menu;
import shootergame.input.types.InputGamePause; import catalystsurvival.input.types.InputGamePause;
import shootergame.text.Text; import catalystsurvival.text.Text;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class MenuGamePause extends Menu public class MenuGamePause extends Menu
{ {

View File

@ -1,6 +1,6 @@
package shootergame.menu; package catalystsurvival.menu;
import shootergame.input.types.InputMenu; import catalystsurvival.input.types.InputMenu;
public class MenuMain extends Menu public class MenuMain extends Menu
{ {

View File

@ -1,15 +1,15 @@
package shootergame.menu; package catalystsurvival.menu;
import java.util.Random; import java.util.Random;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.display.bossbar.BossBars; import catalystsurvival.display.bossbar.BossBars;
import shootergame.entity.player.EntityPlayer; import catalystsurvival.entity.player.EntityPlayer;
import shootergame.init.Layers; import catalystsurvival.init.Layers;
import shootergame.text.Text; import catalystsurvival.text.Text;
import shootergame.time.GameTimer; import catalystsurvival.time.GameTimer;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
class MenuRespawn class MenuRespawn
{ {

View File

@ -1,4 +1,4 @@
package shootergame.resources; package catalystsurvival.resources;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;

View File

@ -1,4 +1,4 @@
package shootergame.resources; package catalystsurvival.resources;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

View File

@ -1,10 +1,10 @@
package shootergame.text; package catalystsurvival.text;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class Text public class Text
{ {

View File

@ -1,11 +1,11 @@
package shootergame.tiles; package catalystsurvival.tiles;
import java.util.Random; import java.util.Random;
import catalystsurvival.time.GameTimer;
import catalystsurvival.util.math.MathHelpers;
import catalystsurvival.util.math.random.OpenSimplexNoise;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.time.GameTimer;
import shootergame.util.math.MathHelpers;
import shootergame.util.math.random.OpenSimplexNoise;
public class LightLevelNoise implements IMainloopTask public class LightLevelNoise implements IMainloopTask
{ {

View File

@ -1,14 +1,14 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.display.transparent.ITransparentObject; import catalystsurvival.display.transparent.ITransparentObject;
import shootergame.display.transparent.TransparentObjects; import catalystsurvival.display.transparent.TransparentObjects;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class Tile implements ITransparentObject public class Tile implements ITransparentObject
{ {

View File

@ -1,19 +1,19 @@
package shootergame.tiles; package catalystsurvival.tiles;
import java.util.Random; import java.util.Random;
import catalystsurvival.Main;
import catalystsurvival.entity.Entity;
import catalystsurvival.entity.particle.ParticleBreak;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.init.Textures;
import catalystsurvival.util.math.TileState;
import catalystsurvival.util.math.vec.Vec2d;
import catalystsurvival.util.math.vec.Vec2i;
import catalystsurvival.world.chunk.ChunkEventHandler;
import catalystsurvival.world.layer.Layer;
import catalystsurvival.world.layer.layergen.LayerGenBossArena;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.entity.Entity;
import shootergame.entity.particle.ParticleBreak;
import shootergame.entity.player.EntityPlayer;
import shootergame.init.Textures;
import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.ChunkEventHandler;
import shootergame.world.layer.Layer;
import shootergame.world.layer.layergen.LayerGenBossArena;
public class TileBossPortal extends TileVertical public class TileBossPortal extends TileVertical
{ {

View File

@ -1,19 +1,19 @@
package shootergame.tiles; package catalystsurvival.tiles;
import java.util.Random; import java.util.Random;
import shootergame.Main; import catalystsurvival.Main;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityItem; import catalystsurvival.entity.EntityItem;
import shootergame.init.Items; import catalystsurvival.init.Items;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class TileChest extends TileVertical public class TileChest extends TileVertical
{ {

View File

@ -1,6 +1,6 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
public class TileDirt extends TileFlatFaded public class TileDirt extends TileFlatFaded
{ {

View File

@ -1,7 +1,7 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class TileFire extends TileVertical public class TileFire extends TileVertical
{ {

View File

@ -1,12 +1,12 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.gl.texture.IHasTexture; import catalystsurvival.util.gl.texture.IHasTexture;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
public class TileFlat extends Tile implements IHasTexture public class TileFlat extends Tile implements IHasTexture
{ {

View File

@ -1,10 +1,10 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.util.gl.texture.TextureReference; import catalystsurvival.util.gl.texture.TextureReference;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec3d; import catalystsurvival.util.math.vec.Vec3d;
public class TileFlatFaded extends TileFlat public class TileFlatFaded extends TileFlat
{ {

View File

@ -1,6 +1,6 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
public class TileGrass extends TileFlat public class TileGrass extends TileFlat
{ {

View File

@ -1,9 +1,9 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
public class TileLadder extends TileVertical public class TileLadder extends TileVertical
{ {

View File

@ -1,17 +1,17 @@
package shootergame.tiles; package catalystsurvival.tiles;
import catalystsurvival.Main;
import catalystsurvival.entity.Entity;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.init.Layers;
import catalystsurvival.init.Textures;
import catalystsurvival.mainloop.MainloopEventHandler;
import catalystsurvival.util.math.TileState;
import catalystsurvival.util.math.vec.Vec2d;
import catalystsurvival.util.math.vec.Vec2i;
import catalystsurvival.world.chunk.ChunkEventHandler;
import catalystsurvival.world.layer.Layer;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.entity.Entity;
import shootergame.entity.player.EntityPlayer;
import shootergame.init.Layers;
import shootergame.init.Textures;
import shootergame.mainloop.MainloopEventHandler;
import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.ChunkEventHandler;
import shootergame.world.layer.Layer;
public class TileLadderUp extends TileVertical public class TileLadderUp extends TileVertical
{ {

View File

@ -1,14 +1,14 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.EntityItem; import catalystsurvival.entity.EntityItem;
import shootergame.init.Items; import catalystsurvival.init.Items;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.ItemStack; import catalystsurvival.util.math.ItemStack;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class TileLantern extends TileVertical public class TileLantern extends TileVertical
{ {

View File

@ -1,17 +1,17 @@
package shootergame.tiles; package catalystsurvival.tiles;
import java.util.Random; import java.util.Random;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.Entity; import catalystsurvival.entity.Entity;
import shootergame.entity.particle.ParticleLava; import catalystsurvival.entity.particle.ParticleLava;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class TileLava extends TileFlat public class TileLava extends TileFlat
{ {

View File

@ -1,17 +1,17 @@
package shootergame.tiles; package catalystsurvival.tiles;
import java.util.Random; import java.util.Random;
import shootergame.display.Camera; import catalystsurvival.display.Camera;
import shootergame.entity.particle.ParticleSmoke; import catalystsurvival.entity.particle.ParticleSmoke;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.gl.GlHelpers; import catalystsurvival.util.gl.GlHelpers;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.random.RandomHelpers; import catalystsurvival.util.math.random.RandomHelpers;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
import shootergame.util.math.vec.Vec2i; import catalystsurvival.util.math.vec.Vec2i;
import shootergame.world.chunk.Chunk; import catalystsurvival.world.chunk.Chunk;
import shootergame.world.layer.Layer; import catalystsurvival.world.layer.Layer;
public class TileLavaFlow extends TileFlat public class TileLavaFlow extends TileFlat
{ {

View File

@ -1,16 +1,16 @@
package shootergame.tiles; package catalystsurvival.tiles;
import catalystsurvival.Main;
import catalystsurvival.entity.Entity;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.init.Layers;
import catalystsurvival.init.Textures;
import catalystsurvival.mainloop.MainloopEventHandler;
import catalystsurvival.util.math.TileState;
import catalystsurvival.util.math.vec.Vec2i;
import catalystsurvival.world.chunk.ChunkEventHandler;
import catalystsurvival.world.layer.Layer;
import mainloop.task.IMainloopTask; import mainloop.task.IMainloopTask;
import shootergame.Main;
import shootergame.entity.Entity;
import shootergame.entity.player.EntityPlayer;
import shootergame.init.Layers;
import shootergame.init.Textures;
import shootergame.mainloop.MainloopEventHandler;
import shootergame.util.math.TileState;
import shootergame.util.math.vec.Vec2i;
import shootergame.world.chunk.ChunkEventHandler;
import shootergame.world.layer.Layer;
public class TilePortalDown extends TileFlat public class TilePortalDown extends TileFlat
{ {

View File

@ -1,8 +1,8 @@
package shootergame.tiles; package catalystsurvival.tiles;
import shootergame.init.Textures; import catalystsurvival.init.Textures;
import shootergame.util.math.TileState; import catalystsurvival.util.math.TileState;
import shootergame.util.math.vec.Vec2d; import catalystsurvival.util.math.vec.Vec2d;
public class TileRock extends TileVertical public class TileRock extends TileVertical
{ {

Some files were not shown because too many files have changed in this diff Show More