diff --git a/.project b/.project index b266648..f19d337 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - CatalystSurvival + ProjectZombie diff --git a/src/catalystsurvival/entity/EntityInventory.java b/src/catalystsurvival/entity/EntityInventory.java deleted file mode 100644 index 4061356..0000000 --- a/src/catalystsurvival/entity/EntityInventory.java +++ /dev/null @@ -1,8 +0,0 @@ -package catalystsurvival.entity; - -import catalystsurvival.inventory.Inventory; - -public interface EntityInventory -{ - public Inventory getInventory(); -} diff --git a/src/catalystsurvival/util/math/map/IMap2D.java b/src/catalystsurvival/util/math/map/IMap2D.java deleted file mode 100644 index f41b7f8..0000000 --- a/src/catalystsurvival/util/math/map/IMap2D.java +++ /dev/null @@ -1,8 +0,0 @@ -package catalystsurvival.util.math.map; - -import catalystsurvival.util.math.vec.Vec2i; - -public interface IMap2D -{ - public T getEmpty(Vec2i pos); -} diff --git a/src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java b/src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java deleted file mode 100644 index 1cd080b..0000000 --- a/src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java +++ /dev/null @@ -1,10 +0,0 @@ -package catalystsurvival.world.layer.layergen; - -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.util.math.vec.Vec2d; - -public interface LayerGenRememberPlayerPos -{ - public Vec2d getPlayerPos(); - public void spawnPlayer(EntityPlayer player); -} diff --git a/src/catalystsurvival/Main.java b/src/projectzombie/Main.java similarity index 62% rename from src/catalystsurvival/Main.java rename to src/projectzombie/Main.java index b7fc08a..91e0a15 100644 --- a/src/catalystsurvival/Main.java +++ b/src/projectzombie/Main.java @@ -1,29 +1,29 @@ -package catalystsurvival; +package projectzombie; 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 projectzombie.audio.AudioEngine; +import projectzombie.audio.AudioSources; +import projectzombie.cheats.Cheats; +import projectzombie.display.DisplayStatsEventHandler; +import projectzombie.display.DisplayWindow; +import projectzombie.entity.EntityEventHandler; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Layers; +import projectzombie.init.Resources; +import projectzombie.init.Sounds; +import projectzombie.init.Textures; +import projectzombie.input.JoystickCallback; +import projectzombie.input.KeyCallback; +import projectzombie.mainloop.MainloopEventHandler; +import projectzombie.menu.Menu; +import projectzombie.menu.MenuGame; +import projectzombie.tiles.LightLevelNoise; +import projectzombie.time.GameTimer; +import projectzombie.time.NoSleep; +import projectzombie.world.World; +import projectzombie.world.chunk.ChunkEventHandler; public class Main { @@ -35,6 +35,7 @@ public class Main public static Random rand = new Random(); public static Menu menu; public static boolean game_paused = false; + public static int tickrate = 10; public static void main(String[] args) { @@ -64,7 +65,7 @@ public class Main mainloop.register(new NoSleep()); // Create the display - window = new DisplayWindow("ShooterGame"); + window = new DisplayWindow("Catalyst Survival"); window.init(); // Initialise the textures diff --git a/src/catalystsurvival/audio/AudioEngine.java b/src/projectzombie/audio/AudioEngine.java similarity index 98% rename from src/catalystsurvival/audio/AudioEngine.java rename to src/projectzombie/audio/AudioEngine.java index 74de252..67cb481 100644 --- a/src/catalystsurvival/audio/AudioEngine.java +++ b/src/projectzombie/audio/AudioEngine.java @@ -1,4 +1,4 @@ -package catalystsurvival.audio; +package projectzombie.audio; import static org.lwjgl.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER; import static org.lwjgl.openal.ALC10.alcCloseDevice; diff --git a/src/catalystsurvival/audio/AudioObject.java b/src/projectzombie/audio/AudioObject.java similarity index 91% rename from src/catalystsurvival/audio/AudioObject.java rename to src/projectzombie/audio/AudioObject.java index f03af40..f3a9ab1 100644 --- a/src/catalystsurvival/audio/AudioObject.java +++ b/src/projectzombie/audio/AudioObject.java @@ -1,4 +1,4 @@ -package catalystsurvival.audio; +package projectzombie.audio; import static org.lwjgl.openal.AL10.AL_BUFFER; 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.system.MemoryStack; -import catalystsurvival.Main; -import catalystsurvival.resources.Resource; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.Main; +import projectzombie.resources.Resource; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; public class AudioObject { diff --git a/src/catalystsurvival/audio/AudioRandom.java b/src/projectzombie/audio/AudioRandom.java similarity index 86% rename from src/catalystsurvival/audio/AudioRandom.java rename to src/projectzombie/audio/AudioRandom.java index 4997a0a..4b7976a 100644 --- a/src/catalystsurvival/audio/AudioRandom.java +++ b/src/projectzombie/audio/AudioRandom.java @@ -1,8 +1,8 @@ -package catalystsurvival.audio; +package projectzombie.audio; import java.util.Random; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.util.math.vec.Vec3d; public class AudioRandom extends AudioObject { diff --git a/src/catalystsurvival/audio/AudioSources.java b/src/projectzombie/audio/AudioSources.java similarity index 95% rename from src/catalystsurvival/audio/AudioSources.java rename to src/projectzombie/audio/AudioSources.java index 62254f1..8d2d07e 100644 --- a/src/catalystsurvival/audio/AudioSources.java +++ b/src/projectzombie/audio/AudioSources.java @@ -1,4 +1,4 @@ -package catalystsurvival.audio; +package projectzombie.audio; import static org.lwjgl.openal.AL10.alGenSources; diff --git a/src/catalystsurvival/cheats/Cheats.java b/src/projectzombie/cheats/Cheats.java similarity index 87% rename from src/catalystsurvival/cheats/Cheats.java rename to src/projectzombie/cheats/Cheats.java index 6389eb6..7f6c6a7 100644 --- a/src/catalystsurvival/cheats/Cheats.java +++ b/src/projectzombie/cheats/Cheats.java @@ -1,4 +1,4 @@ -package catalystsurvival.cheats; +package projectzombie.cheats; public class Cheats { diff --git a/src/catalystsurvival/display/Camera.java b/src/projectzombie/display/Camera.java similarity index 74% rename from src/catalystsurvival/display/Camera.java rename to src/projectzombie/display/Camera.java index b2b8648..c5ee36a 100644 --- a/src/catalystsurvival/display/Camera.java +++ b/src/projectzombie/display/Camera.java @@ -1,8 +1,8 @@ -package catalystsurvival.display; +package projectzombie.display; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; public class Camera { diff --git a/src/catalystsurvival/display/DisplayRender.java b/src/projectzombie/display/DisplayRender.java similarity index 87% rename from src/catalystsurvival/display/DisplayRender.java rename to src/projectzombie/display/DisplayRender.java index 8cdd7c8..3e033cf 100644 --- a/src/catalystsurvival/display/DisplayRender.java +++ b/src/projectzombie/display/DisplayRender.java @@ -1,4 +1,4 @@ -package catalystsurvival.display; +package projectzombie.display; import static org.lwjgl.opengl.GL11.GL_COLOR_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.system.MemoryStack; -import catalystsurvival.Main; -import catalystsurvival.display.lighting.LightingManager; -import catalystsurvival.display.transparent.TransparentObjects; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.Main; +import projectzombie.display.lighting.LightingManager; +import projectzombie.display.transparent.TransparentObjects; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; public class DisplayRender { diff --git a/src/catalystsurvival/display/DisplayRenderUI.java b/src/projectzombie/display/DisplayRenderUI.java similarity index 90% rename from src/catalystsurvival/display/DisplayRenderUI.java rename to src/projectzombie/display/DisplayRenderUI.java index 47e1c21..f4d6c15 100644 --- a/src/catalystsurvival/display/DisplayRenderUI.java +++ b/src/projectzombie/display/DisplayRenderUI.java @@ -1,15 +1,15 @@ -package catalystsurvival.display; +package projectzombie.display; -import catalystsurvival.Main; -import catalystsurvival.display.bossbar.BossBars; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.init.Textures; -import catalystsurvival.inventory.Inventory; -import catalystsurvival.text.Text; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.Main; +import projectzombie.display.bossbar.BossBars; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Textures; +import projectzombie.inventory.Inventory; +import projectzombie.text.Text; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.vec.Vec2d; public class DisplayRenderUI { @@ -32,22 +32,22 @@ public class DisplayRenderUI // Get some text settings Vec2d text_size = new Vec2d(0.45, 0.45); - // Render the fps + /*// Render the fps GlHelpers.pushMatrix(); GlHelpers.translate2(-9.5, 9.5); GlHelpers.color3(1, 1, 0); Text.render("FPS: " + DisplayStatsEventHandler.fps, text_size); - GlHelpers.popMatrix(); + GlHelpers.popMatrix();*/ if(Main.menu.doGameRender) { - // Render the fps and the position + /*// Render the fps and the position GlHelpers.pushMatrix(); GlHelpers.translate2(-9.5, 9); GlHelpers.color3(1, 1, 0); Text.render("x: " + (int) player.pos.x + ", y: " + (int) player.pos.y, text_size); GlHelpers.color3(1, 1, 1); - GlHelpers.popMatrix(); + GlHelpers.popMatrix();*/ // Render the healthbar double max_health = player.maxHealth(); diff --git a/src/catalystsurvival/display/DisplayStatsEventHandler.java b/src/projectzombie/display/DisplayStatsEventHandler.java similarity index 86% rename from src/catalystsurvival/display/DisplayStatsEventHandler.java rename to src/projectzombie/display/DisplayStatsEventHandler.java index 413dd0b..769ec4e 100644 --- a/src/catalystsurvival/display/DisplayStatsEventHandler.java +++ b/src/projectzombie/display/DisplayStatsEventHandler.java @@ -1,7 +1,7 @@ -package catalystsurvival.display; +package projectzombie.display; -import catalystsurvival.mainloop.MainloopEventHandler; import mainloop.task.IMainloopTask; +import projectzombie.mainloop.MainloopEventHandler; public class DisplayStatsEventHandler implements IMainloopTask { diff --git a/src/catalystsurvival/display/DisplayWindow.java b/src/projectzombie/display/DisplayWindow.java similarity index 86% rename from src/catalystsurvival/display/DisplayWindow.java rename to src/projectzombie/display/DisplayWindow.java index f98663c..1783934 100644 --- a/src/catalystsurvival/display/DisplayWindow.java +++ b/src/projectzombie/display/DisplayWindow.java @@ -1,22 +1,22 @@ -package catalystsurvival.display; +package projectzombie.display; import java.nio.IntBuffer; import org.lwjgl.BufferUtils; 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 projectzombie.Main; +import projectzombie.input.CursorEnterCallback; +import projectzombie.input.CursorPosCallback; +import projectzombie.input.JoystickCallback; +import projectzombie.input.KeyCallback; +import projectzombie.input.KeyCharCallback; +import projectzombie.input.MouseButtonCallback; +import projectzombie.input.ScrollWheelCallback; +import projectzombie.mainloop.MainloopEventHandler; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.AnimationEventHandler; public class DisplayWindow implements IMainloopTask { diff --git a/src/catalystsurvival/display/bossbar/BossBars.java b/src/projectzombie/display/bossbar/BossBars.java similarity index 88% rename from src/catalystsurvival/display/bossbar/BossBars.java rename to src/projectzombie/display/bossbar/BossBars.java index 9b330ae..38b78d5 100644 --- a/src/catalystsurvival/display/bossbar/BossBars.java +++ b/src/projectzombie/display/bossbar/BossBars.java @@ -1,10 +1,10 @@ -package catalystsurvival.display.bossbar; +package projectzombie.display.bossbar; import java.util.ArrayList; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.TextureReference; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.TextureReference; public class BossBars { diff --git a/src/catalystsurvival/display/bossbar/IBossBar.java b/src/projectzombie/display/bossbar/IBossBar.java similarity index 56% rename from src/catalystsurvival/display/bossbar/IBossBar.java rename to src/projectzombie/display/bossbar/IBossBar.java index 29f53d5..66b0198 100644 --- a/src/catalystsurvival/display/bossbar/IBossBar.java +++ b/src/projectzombie/display/bossbar/IBossBar.java @@ -1,6 +1,6 @@ -package catalystsurvival.display.bossbar; +package projectzombie.display.bossbar; -import catalystsurvival.entity.EntityAlive; +import projectzombie.entity.EntityAlive; public interface IBossBar extends EntityAlive { diff --git a/src/catalystsurvival/display/lighting/LightingManager.java b/src/projectzombie/display/lighting/LightingManager.java similarity index 89% rename from src/catalystsurvival/display/lighting/LightingManager.java rename to src/projectzombie/display/lighting/LightingManager.java index ea8bda6..ab10b1f 100644 --- a/src/catalystsurvival/display/lighting/LightingManager.java +++ b/src/projectzombie/display/lighting/LightingManager.java @@ -1,15 +1,15 @@ -package catalystsurvival.display.lighting; +package projectzombie.display.lighting; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.chunk.ChunkEventHandler; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.chunk.ChunkEventHandler; +import projectzombie.world.layer.Layer; public class LightingManager { diff --git a/src/catalystsurvival/display/transparent/ITransparentObject.java b/src/projectzombie/display/transparent/ITransparentObject.java similarity index 51% rename from src/catalystsurvival/display/transparent/ITransparentObject.java rename to src/projectzombie/display/transparent/ITransparentObject.java index 005348c..bb2e603 100644 --- a/src/catalystsurvival/display/transparent/ITransparentObject.java +++ b/src/projectzombie/display/transparent/ITransparentObject.java @@ -1,8 +1,8 @@ -package catalystsurvival.display.transparent; +package projectzombie.display.transparent; -import catalystsurvival.display.Camera; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.display.Camera; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; public interface ITransparentObject { diff --git a/src/catalystsurvival/display/transparent/TransparentObject.java b/src/projectzombie/display/transparent/TransparentObject.java similarity index 64% rename from src/catalystsurvival/display/transparent/TransparentObject.java rename to src/projectzombie/display/transparent/TransparentObject.java index 1f2d648..cb20282 100644 --- a/src/catalystsurvival/display/transparent/TransparentObject.java +++ b/src/projectzombie/display/transparent/TransparentObject.java @@ -1,9 +1,9 @@ -package catalystsurvival.display.transparent; +package projectzombie.display.transparent; -import catalystsurvival.display.Camera; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.display.Camera; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; class TransparentObject { diff --git a/src/catalystsurvival/display/transparent/TransparentObjects.java b/src/projectzombie/display/transparent/TransparentObjects.java similarity index 87% rename from src/catalystsurvival/display/transparent/TransparentObjects.java rename to src/projectzombie/display/transparent/TransparentObjects.java index df1e89a..0f26878 100644 --- a/src/catalystsurvival/display/transparent/TransparentObjects.java +++ b/src/projectzombie/display/transparent/TransparentObjects.java @@ -1,8 +1,8 @@ -package catalystsurvival.display.transparent; +package projectzombie.display.transparent; -import catalystsurvival.display.Camera; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.display.Camera; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; public class TransparentObjects { diff --git a/src/catalystsurvival/entity/Entity.java b/src/projectzombie/entity/Entity.java similarity index 90% rename from src/catalystsurvival/entity/Entity.java rename to src/projectzombie/entity/Entity.java index cf2353a..e843997 100644 --- a/src/catalystsurvival/entity/Entity.java +++ b/src/projectzombie/entity/Entity.java @@ -1,20 +1,20 @@ -package catalystsurvival.entity; +package projectzombie.entity; 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 projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.display.transparent.ITransparentObject; +import projectzombie.display.transparent.TransparentObjects; +import projectzombie.init.Entities; +import projectzombie.tiles.Tile; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class Entity implements ITransparentObject { diff --git a/src/catalystsurvival/entity/EntityAlive.java b/src/projectzombie/entity/EntityAlive.java similarity index 81% rename from src/catalystsurvival/entity/EntityAlive.java rename to src/projectzombie/entity/EntityAlive.java index e76f7a7..84dc1dd 100644 --- a/src/catalystsurvival/entity/EntityAlive.java +++ b/src/projectzombie/entity/EntityAlive.java @@ -1,6 +1,6 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.world.layer.Layer; +import projectzombie.world.layer.Layer; public interface EntityAlive { diff --git a/src/catalystsurvival/entity/EntityBoss.java b/src/projectzombie/entity/EntityBoss.java similarity index 81% rename from src/catalystsurvival/entity/EntityBoss.java rename to src/projectzombie/entity/EntityBoss.java index 94c0ff6..a6eedb6 100644 --- a/src/catalystsurvival/entity/EntityBoss.java +++ b/src/projectzombie/entity/EntityBoss.java @@ -1,23 +1,23 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.display.bossbar.BossBars; -import catalystsurvival.display.bossbar.IBossBar; -import catalystsurvival.init.Items; -import catalystsurvival.init.Textures; -import catalystsurvival.init.Tiles; -import catalystsurvival.time.GameTimer; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.random.OpenSimplexNoise; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.display.bossbar.BossBars; +import projectzombie.display.bossbar.IBossBar; +import projectzombie.init.Items; +import projectzombie.init.Textures; +import projectzombie.init.Tiles; +import projectzombie.time.GameTimer; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.random.OpenSimplexNoise; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityBoss extends EntityVertical implements IBossBar { @@ -54,7 +54,7 @@ public class EntityBoss extends EntityVertical implements IBossBar double angle = Math.atan2(pos.x - Main.player.pos.x, pos.y - Main.player.pos.y); this.angle = Math.toDegrees(angle) + 180; - if(this.noise_spawn.eval(GameTimer.getTime() / 5000.0, 0) > 0.2) { + if(this.noise_spawn.eval(GameTimer.getTime() / 500.0, 0) > 0.2) { if(spawn_frequency == 0) { int r = 2, m = 1000; Vec2d zombie_pos = new Vec2d( @@ -73,7 +73,7 @@ public class EntityBoss extends EntityVertical implements IBossBar spawn_frequency -= 1; } - if(this.noise_gun.eval(GameTimer.getTime() / 5000.0, 0) > 0 && !Main.player.dead && !Main.player.in_animation) { + if(this.noise_gun.eval(GameTimer.getTime() / 500.0, 0) > 0 && !Main.player.dead && !Main.player.in_animation) { if(bullet_frequency == 0) { @@ -100,7 +100,7 @@ public class EntityBoss extends EntityVertical implements IBossBar bullet_frequency -= 1; } - if(this.noise_gun.eval(GameTimer.getTime() / 5000.0, 0) > -0.2) { + if(this.noise_gun.eval(GameTimer.getTime() / 500.0, 0) > -0.2) { this.firing = true; } @@ -108,7 +108,7 @@ public class EntityBoss extends EntityVertical implements IBossBar this.firing = false; } - if(this.noise_walk.eval(GameTimer.getTime() / 5000.0, 0) > -0.4) { + if(this.noise_walk.eval(GameTimer.getTime() / 500.0, 0) > -0.4) { this.moveForward(); this.moving = true; } diff --git a/src/catalystsurvival/entity/EntityBullet.java b/src/projectzombie/entity/EntityBullet.java similarity index 86% rename from src/catalystsurvival/entity/EntityBullet.java rename to src/projectzombie/entity/EntityBullet.java index a1389f2..07c30ed 100644 --- a/src/catalystsurvival/entity/EntityBullet.java +++ b/src/projectzombie/entity/EntityBullet.java @@ -1,17 +1,17 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.particle.ParticleBlood; -import catalystsurvival.init.Sounds; -import catalystsurvival.tiles.Tile; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.particle.ParticleBlood; +import projectzombie.init.Sounds; +import projectzombie.tiles.Tile; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityBullet extends EntityParticle { diff --git a/src/catalystsurvival/entity/EntityDummy.java b/src/projectzombie/entity/EntityDummy.java similarity index 86% rename from src/catalystsurvival/entity/EntityDummy.java rename to src/projectzombie/entity/EntityDummy.java index d776e2e..29b46c1 100644 --- a/src/catalystsurvival/entity/EntityDummy.java +++ b/src/projectzombie/entity/EntityDummy.java @@ -1,7 +1,7 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.init.Textures; +import projectzombie.util.math.vec.Vec2d; public class EntityDummy extends EntityVertical implements EntityAlive { diff --git a/src/catalystsurvival/entity/EntityEventHandler.java b/src/projectzombie/entity/EntityEventHandler.java similarity index 86% rename from src/catalystsurvival/entity/EntityEventHandler.java rename to src/projectzombie/entity/EntityEventHandler.java index 28cf6cb..ea1c76c 100644 --- a/src/catalystsurvival/entity/EntityEventHandler.java +++ b/src/projectzombie/entity/EntityEventHandler.java @@ -1,7 +1,7 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.Main; import mainloop.task.IMainloopTask; +import projectzombie.Main; public class EntityEventHandler implements IMainloopTask { @@ -9,7 +9,7 @@ public class EntityEventHandler implements IMainloopTask @Override public boolean MainLoopDelay(long millis) { - return millis > 10; + return millis > Main.tickrate; } @Override diff --git a/src/catalystsurvival/entity/EntityExplosion.java b/src/projectzombie/entity/EntityExplosion.java similarity index 79% rename from src/catalystsurvival/entity/EntityExplosion.java rename to src/projectzombie/entity/EntityExplosion.java index ce7ef0b..c19d06f 100644 --- a/src/catalystsurvival/entity/EntityExplosion.java +++ b/src/projectzombie/entity/EntityExplosion.java @@ -1,18 +1,18 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.Main; -import catalystsurvival.entity.particle.ParticleBlood; -import catalystsurvival.entity.particle.ParticleBreak; -import catalystsurvival.entity.particle.ParticleSmoke; -import catalystsurvival.init.Sounds; -import catalystsurvival.init.Tiles; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.particle.ParticleBlood; +import projectzombie.entity.particle.ParticleBreak; +import projectzombie.entity.particle.ParticleSmoke; +import projectzombie.init.Sounds; +import projectzombie.init.Tiles; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityExplosion extends Entity { diff --git a/src/catalystsurvival/entity/EntityFlare.java b/src/projectzombie/entity/EntityFlare.java similarity index 66% rename from src/catalystsurvival/entity/EntityFlare.java rename to src/projectzombie/entity/EntityFlare.java index dd2538f..352d4ea 100644 --- a/src/catalystsurvival/entity/EntityFlare.java +++ b/src/projectzombie/entity/EntityFlare.java @@ -1,10 +1,10 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.display.Camera; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.init.Textures; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.layer.Layer; public class EntityFlare extends EntityTnt { diff --git a/src/catalystsurvival/entity/EntityGrapplingHook.java b/src/projectzombie/entity/EntityGrapplingHook.java similarity index 76% rename from src/catalystsurvival/entity/EntityGrapplingHook.java rename to src/projectzombie/entity/EntityGrapplingHook.java index 145eeb0..813c3f1 100644 --- a/src/catalystsurvival/entity/EntityGrapplingHook.java +++ b/src/projectzombie/entity/EntityGrapplingHook.java @@ -1,15 +1,15 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.init.Layers; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; -import catalystsurvival.world.layer.layergen.LayerGenRememberPlayerPos; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Layers; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; +import projectzombie.world.layer.layergen.LayerGenRememberPlayerPos; public class EntityGrapplingHook extends EntityVertical { diff --git a/src/catalystsurvival/entity/EntityHeight.java b/src/projectzombie/entity/EntityHeight.java similarity index 75% rename from src/catalystsurvival/entity/EntityHeight.java rename to src/projectzombie/entity/EntityHeight.java index b6a6d4d..58229f2 100644 --- a/src/catalystsurvival/entity/EntityHeight.java +++ b/src/projectzombie/entity/EntityHeight.java @@ -1,4 +1,4 @@ -package catalystsurvival.entity; +package projectzombie.entity; public interface EntityHeight { diff --git a/src/projectzombie/entity/EntityInventory.java b/src/projectzombie/entity/EntityInventory.java new file mode 100644 index 0000000..7e3b59f --- /dev/null +++ b/src/projectzombie/entity/EntityInventory.java @@ -0,0 +1,8 @@ +package projectzombie.entity; + +import projectzombie.inventory.Inventory; + +public interface EntityInventory +{ + public Inventory getInventory(); +} diff --git a/src/catalystsurvival/entity/EntityItem.java b/src/projectzombie/entity/EntityItem.java similarity index 76% rename from src/catalystsurvival/entity/EntityItem.java rename to src/projectzombie/entity/EntityItem.java index 89505ea..0b9c089 100644 --- a/src/catalystsurvival/entity/EntityItem.java +++ b/src/projectzombie/entity/EntityItem.java @@ -1,13 +1,13 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityItem extends EntityVertical { diff --git a/src/catalystsurvival/entity/EntityParticle.java b/src/projectzombie/entity/EntityParticle.java similarity index 84% rename from src/catalystsurvival/entity/EntityParticle.java rename to src/projectzombie/entity/EntityParticle.java index a374824..0ccfc12 100644 --- a/src/catalystsurvival/entity/EntityParticle.java +++ b/src/projectzombie/entity/EntityParticle.java @@ -1,11 +1,11 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityParticle extends Entity { diff --git a/src/catalystsurvival/entity/EntityTnt.java b/src/projectzombie/entity/EntityTnt.java similarity index 82% rename from src/catalystsurvival/entity/EntityTnt.java rename to src/projectzombie/entity/EntityTnt.java index 77de24e..94fac57 100644 --- a/src/catalystsurvival/entity/EntityTnt.java +++ b/src/projectzombie/entity/EntityTnt.java @@ -1,14 +1,14 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.particle.ParticleSpark; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.particle.ParticleSpark; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityTnt extends EntityVertical { diff --git a/src/catalystsurvival/entity/EntityVertical.java b/src/projectzombie/entity/EntityVertical.java similarity index 69% rename from src/catalystsurvival/entity/EntityVertical.java rename to src/projectzombie/entity/EntityVertical.java index a3bc7be..cc1cace 100644 --- a/src/catalystsurvival/entity/EntityVertical.java +++ b/src/projectzombie/entity/EntityVertical.java @@ -1,12 +1,12 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.VerticalRender; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; +import projectzombie.display.Camera; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.VerticalRender; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; public class EntityVertical extends Entity { diff --git a/src/catalystsurvival/entity/EntityZombie.java b/src/projectzombie/entity/EntityZombie.java similarity index 89% rename from src/catalystsurvival/entity/EntityZombie.java rename to src/projectzombie/entity/EntityZombie.java index 9a28ab5..3dc31a3 100644 --- a/src/catalystsurvival/entity/EntityZombie.java +++ b/src/projectzombie/entity/EntityZombie.java @@ -1,11 +1,11 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.Main; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.random.OpenSimplexNoise; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.init.Textures; +import projectzombie.util.math.random.OpenSimplexNoise; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityZombie extends EntityVertical implements EntityAlive { diff --git a/src/catalystsurvival/entity/EntityZombieArmored.java b/src/projectzombie/entity/EntityZombieArmored.java similarity index 68% rename from src/catalystsurvival/entity/EntityZombieArmored.java rename to src/projectzombie/entity/EntityZombieArmored.java index a577c72..66b4923 100644 --- a/src/catalystsurvival/entity/EntityZombieArmored.java +++ b/src/projectzombie/entity/EntityZombieArmored.java @@ -1,9 +1,9 @@ -package catalystsurvival.entity; +package projectzombie.entity; -import catalystsurvival.display.Camera; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.display.Camera; +import projectzombie.init.Textures; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.vec.Vec2d; public class EntityZombieArmored extends EntityZombie { diff --git a/src/catalystsurvival/entity/particle/ParticleBlood.java b/src/projectzombie/entity/particle/ParticleBlood.java similarity index 76% rename from src/catalystsurvival/entity/particle/ParticleBlood.java rename to src/projectzombie/entity/particle/ParticleBlood.java index a9e5373..99457b8 100644 --- a/src/catalystsurvival/entity/particle/ParticleBlood.java +++ b/src/projectzombie/entity/particle/ParticleBlood.java @@ -1,17 +1,17 @@ -package catalystsurvival.entity.particle; +package projectzombie.entity.particle; import java.util.Random; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.EntityParticle; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.EntityParticle; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ParticleBlood extends EntityParticle { diff --git a/src/catalystsurvival/entity/particle/ParticleBreak.java b/src/projectzombie/entity/particle/ParticleBreak.java similarity index 71% rename from src/catalystsurvival/entity/particle/ParticleBreak.java rename to src/projectzombie/entity/particle/ParticleBreak.java index 961a1de..711d7c4 100644 --- a/src/catalystsurvival/entity/particle/ParticleBreak.java +++ b/src/projectzombie/entity/particle/ParticleBreak.java @@ -1,19 +1,19 @@ -package catalystsurvival.entity.particle; +package projectzombie.entity.particle; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.EntityVertical; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.IHasTexture; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.entity.EntityVertical; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.IHasTexture; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ParticleBreak extends EntityVertical { diff --git a/src/catalystsurvival/entity/particle/ParticleLava.java b/src/projectzombie/entity/particle/ParticleLava.java similarity index 67% rename from src/catalystsurvival/entity/particle/ParticleLava.java rename to src/projectzombie/entity/particle/ParticleLava.java index e7c791a..2b461fa 100644 --- a/src/catalystsurvival/entity/particle/ParticleLava.java +++ b/src/projectzombie/entity/particle/ParticleLava.java @@ -1,16 +1,16 @@ -package catalystsurvival.entity.particle; +package projectzombie.entity.particle; import java.util.Random; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.EntityParticle; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.EntityParticle; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ParticleLava extends EntityParticle { diff --git a/src/catalystsurvival/entity/particle/ParticleSmoke.java b/src/projectzombie/entity/particle/ParticleSmoke.java similarity index 70% rename from src/catalystsurvival/entity/particle/ParticleSmoke.java rename to src/projectzombie/entity/particle/ParticleSmoke.java index bd48327..c830bf7 100644 --- a/src/catalystsurvival/entity/particle/ParticleSmoke.java +++ b/src/projectzombie/entity/particle/ParticleSmoke.java @@ -1,14 +1,14 @@ -package catalystsurvival.entity.particle; +package projectzombie.entity.particle; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.EntityVertical; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.entity.EntityVertical; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ParticleSmoke extends EntityVertical { diff --git a/src/catalystsurvival/entity/particle/ParticleSpark.java b/src/projectzombie/entity/particle/ParticleSpark.java similarity index 69% rename from src/catalystsurvival/entity/particle/ParticleSpark.java rename to src/projectzombie/entity/particle/ParticleSpark.java index 4904c26..08e0ea3 100644 --- a/src/catalystsurvival/entity/particle/ParticleSpark.java +++ b/src/projectzombie/entity/particle/ParticleSpark.java @@ -1,11 +1,11 @@ -package catalystsurvival.entity.particle; +package projectzombie.entity.particle; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.EntityParticle; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.EntityParticle; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ParticleSpark extends EntityParticle { diff --git a/src/catalystsurvival/entity/particle/ParticleWater.java b/src/projectzombie/entity/particle/ParticleWater.java similarity index 67% rename from src/catalystsurvival/entity/particle/ParticleWater.java rename to src/projectzombie/entity/particle/ParticleWater.java index 51ce492..cab54f5 100644 --- a/src/catalystsurvival/entity/particle/ParticleWater.java +++ b/src/projectzombie/entity/particle/ParticleWater.java @@ -1,15 +1,15 @@ -package catalystsurvival.entity.particle; +package projectzombie.entity.particle; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.EntityParticle; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.util.math.vec.Vec3d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.EntityParticle; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec3d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ParticleWater extends EntityParticle { diff --git a/src/catalystsurvival/entity/player/EntityPlayer.java b/src/projectzombie/entity/player/EntityPlayer.java similarity index 84% rename from src/catalystsurvival/entity/player/EntityPlayer.java rename to src/projectzombie/entity/player/EntityPlayer.java index fae5e52..ef958a6 100644 --- a/src/catalystsurvival/entity/player/EntityPlayer.java +++ b/src/projectzombie/entity/player/EntityPlayer.java @@ -1,27 +1,27 @@ -package catalystsurvival.entity.player; +package projectzombie.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 projectzombie.Main; +import projectzombie.cheats.Cheats; +import projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityAlive; +import projectzombie.entity.EntityBullet; +import projectzombie.entity.EntityHeight; +import projectzombie.entity.EntityInventory; +import projectzombie.entity.EntityItem; +import projectzombie.entity.EntityVertical; +import projectzombie.init.Textures; +import projectzombie.inventory.Inventory; +import projectzombie.menu.MenuDeath; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class EntityPlayer extends EntityVertical implements EntityAlive, EntityInventory, EntityHeight { diff --git a/src/catalystsurvival/init/Entities.java b/src/projectzombie/init/Entities.java similarity index 65% rename from src/catalystsurvival/init/Entities.java rename to src/projectzombie/init/Entities.java index 889f232..3d1ef97 100644 --- a/src/catalystsurvival/init/Entities.java +++ b/src/projectzombie/init/Entities.java @@ -1,8 +1,8 @@ -package catalystsurvival.init; +package projectzombie.init; import java.util.ArrayList; -import catalystsurvival.entity.Entity; +import projectzombie.entity.Entity; public class Entities { diff --git a/src/catalystsurvival/init/Items.java b/src/projectzombie/init/Items.java similarity index 57% rename from src/catalystsurvival/init/Items.java rename to src/projectzombie/init/Items.java index 02aef31..6c6e324 100644 --- a/src/catalystsurvival/init/Items.java +++ b/src/projectzombie/init/Items.java @@ -1,15 +1,15 @@ -package catalystsurvival.init; +package projectzombie.init; -import catalystsurvival.items.Item; -import catalystsurvival.items.ItemAmmo; -import catalystsurvival.items.ItemDefenceUpgrade; -import catalystsurvival.items.ItemEmpty; -import catalystsurvival.items.ItemFlare; -import catalystsurvival.items.ItemGrapplingHook; -import catalystsurvival.items.ItemGunUpgrade; -import catalystsurvival.items.ItemHealthPotion; -import catalystsurvival.items.ItemLantern; -import catalystsurvival.items.ItemTnt; +import projectzombie.items.Item; +import projectzombie.items.ItemAmmo; +import projectzombie.items.ItemDefenceUpgrade; +import projectzombie.items.ItemEmpty; +import projectzombie.items.ItemFlare; +import projectzombie.items.ItemGrapplingHook; +import projectzombie.items.ItemGunUpgrade; +import projectzombie.items.ItemHealthPotion; +import projectzombie.items.ItemLantern; +import projectzombie.items.ItemTnt; public class Items { diff --git a/src/catalystsurvival/init/Layers.java b/src/projectzombie/init/Layers.java similarity index 72% rename from src/catalystsurvival/init/Layers.java rename to src/projectzombie/init/Layers.java index 36e67e3..5ad9b6f 100644 --- a/src/catalystsurvival/init/Layers.java +++ b/src/projectzombie/init/Layers.java @@ -1,14 +1,14 @@ -package catalystsurvival.init; +package projectzombie.init; import java.util.ArrayList; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.world.World; -import catalystsurvival.world.layer.Layer; -import catalystsurvival.world.layer.layergen.LayerGenCaves; -import catalystsurvival.world.layer.layergen.LayerGenEarth; -import catalystsurvival.world.layer.layergen.LayerGenLavaCaves; +import projectzombie.Main; +import projectzombie.world.World; +import projectzombie.world.layer.Layer; +import projectzombie.world.layer.layergen.LayerGenCaves; +import projectzombie.world.layer.layergen.LayerGenEarth; +import projectzombie.world.layer.layergen.LayerGenLavaCaves; public class Layers { diff --git a/src/catalystsurvival/init/Resources.java b/src/projectzombie/init/Resources.java similarity index 95% rename from src/catalystsurvival/init/Resources.java rename to src/projectzombie/init/Resources.java index 5ce92ea..79b6835 100644 --- a/src/catalystsurvival/init/Resources.java +++ b/src/projectzombie/init/Resources.java @@ -1,6 +1,6 @@ -package catalystsurvival.init; +package projectzombie.init; -import catalystsurvival.resources.Resource; +import projectzombie.resources.Resource; public class Resources { diff --git a/src/catalystsurvival/init/Sounds.java b/src/projectzombie/init/Sounds.java similarity index 93% rename from src/catalystsurvival/init/Sounds.java rename to src/projectzombie/init/Sounds.java index 35fa3f2..4c7ac56 100644 --- a/src/catalystsurvival/init/Sounds.java +++ b/src/projectzombie/init/Sounds.java @@ -1,7 +1,7 @@ -package catalystsurvival.init; +package projectzombie.init; -import catalystsurvival.audio.AudioObject; -import catalystsurvival.audio.AudioRandom; +import projectzombie.audio.AudioObject; +import projectzombie.audio.AudioRandom; public class Sounds { diff --git a/src/catalystsurvival/init/Textures.java b/src/projectzombie/init/Textures.java similarity index 96% rename from src/catalystsurvival/init/Textures.java rename to src/projectzombie/init/Textures.java index 386b645..20fb7e3 100644 --- a/src/catalystsurvival/init/Textures.java +++ b/src/projectzombie/init/Textures.java @@ -1,14 +1,14 @@ -package catalystsurvival.init; +package projectzombie.init; import java.util.ArrayList; import org.lwjgl.opengl.GL; -import catalystsurvival.display.DisplayWindow; -import catalystsurvival.util.gl.texture.AnimationReference; -import catalystsurvival.util.gl.texture.TextureMap; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.gl.texture.TextureReferenceRandom; +import projectzombie.display.DisplayWindow; +import projectzombie.util.gl.texture.AnimationReference; +import projectzombie.util.gl.texture.TextureMap; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.gl.texture.TextureReferenceRandom; public class Textures { diff --git a/src/catalystsurvival/init/Tiles.java b/src/projectzombie/init/Tiles.java similarity index 58% rename from src/catalystsurvival/init/Tiles.java rename to src/projectzombie/init/Tiles.java index 93ea79f..408a640 100644 --- a/src/catalystsurvival/init/Tiles.java +++ b/src/projectzombie/init/Tiles.java @@ -1,26 +1,26 @@ -package catalystsurvival.init; +package projectzombie.init; -import catalystsurvival.tiles.Tile; -import catalystsurvival.tiles.TileBossPortal; -import catalystsurvival.tiles.TileChest; -import catalystsurvival.tiles.TileDirt; -import catalystsurvival.tiles.TileFire; -import catalystsurvival.tiles.TileGrass; -import catalystsurvival.tiles.TileLadder; -import catalystsurvival.tiles.TileLadderUp; -import catalystsurvival.tiles.TileLantern; -import catalystsurvival.tiles.TileLava; -import catalystsurvival.tiles.TileLavaFlow; -import catalystsurvival.tiles.TilePortalDown; -import catalystsurvival.tiles.TileRock; -import catalystsurvival.tiles.TileSand; -import catalystsurvival.tiles.TileStone; -import catalystsurvival.tiles.TileTree; -import catalystsurvival.tiles.TileVoid; -import catalystsurvival.tiles.TileWall; -import catalystsurvival.tiles.TileWallUnbreakable; -import catalystsurvival.tiles.TileWater; -import catalystsurvival.tiles.TileWaterFlow; +import projectzombie.tiles.Tile; +import projectzombie.tiles.TileBossPortal; +import projectzombie.tiles.TileChest; +import projectzombie.tiles.TileDirt; +import projectzombie.tiles.TileFire; +import projectzombie.tiles.TileGrass; +import projectzombie.tiles.TileLadder; +import projectzombie.tiles.TileLadderUp; +import projectzombie.tiles.TileLantern; +import projectzombie.tiles.TileLava; +import projectzombie.tiles.TileLavaFlow; +import projectzombie.tiles.TilePortalDown; +import projectzombie.tiles.TileRock; +import projectzombie.tiles.TileSand; +import projectzombie.tiles.TileStone; +import projectzombie.tiles.TileTree; +import projectzombie.tiles.TileVoid; +import projectzombie.tiles.TileWall; +import projectzombie.tiles.TileWallUnbreakable; +import projectzombie.tiles.TileWater; +import projectzombie.tiles.TileWaterFlow; public class Tiles { diff --git a/src/catalystsurvival/input/CursorEnterCallback.java b/src/projectzombie/input/CursorEnterCallback.java similarity index 87% rename from src/catalystsurvival/input/CursorEnterCallback.java rename to src/projectzombie/input/CursorEnterCallback.java index 7a3ee54..26205de 100644 --- a/src/catalystsurvival/input/CursorEnterCallback.java +++ b/src/projectzombie/input/CursorEnterCallback.java @@ -1,4 +1,4 @@ -package catalystsurvival.input; +package projectzombie.input; import org.lwjgl.glfw.GLFWCursorEnterCallbackI; diff --git a/src/catalystsurvival/input/CursorPosCallback.java b/src/projectzombie/input/CursorPosCallback.java similarity index 91% rename from src/catalystsurvival/input/CursorPosCallback.java rename to src/projectzombie/input/CursorPosCallback.java index 09f726f..91bc9ca 100644 --- a/src/catalystsurvival/input/CursorPosCallback.java +++ b/src/projectzombie/input/CursorPosCallback.java @@ -1,9 +1,9 @@ -package catalystsurvival.input; +package projectzombie.input; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWCursorPosCallbackI; -import catalystsurvival.Main; +import projectzombie.Main; public class CursorPosCallback implements GLFWCursorPosCallbackI { diff --git a/src/catalystsurvival/input/GameInput.java b/src/projectzombie/input/GameInput.java similarity index 93% rename from src/catalystsurvival/input/GameInput.java rename to src/projectzombie/input/GameInput.java index 66415e7..6c71e40 100644 --- a/src/catalystsurvival/input/GameInput.java +++ b/src/projectzombie/input/GameInput.java @@ -1,4 +1,4 @@ -package catalystsurvival.input; +package projectzombie.input; class GameInput { diff --git a/src/catalystsurvival/input/JoystickCallback.java b/src/projectzombie/input/JoystickCallback.java similarity index 88% rename from src/catalystsurvival/input/JoystickCallback.java rename to src/projectzombie/input/JoystickCallback.java index 2b1e82f..2f3b046 100644 --- a/src/catalystsurvival/input/JoystickCallback.java +++ b/src/projectzombie/input/JoystickCallback.java @@ -1,15 +1,15 @@ -package catalystsurvival.input; +package projectzombie.input; -import static catalystsurvival.input.GameInput.activateItem_last; -import static catalystsurvival.input.GameInput.activateTile_last; -import static catalystsurvival.input.GameInput.dropItem_last; -import static catalystsurvival.input.GameInput.fireGun; -import static catalystsurvival.input.GameInput.hotbar_l; -import static catalystsurvival.input.GameInput.hotbar_r; -import static catalystsurvival.input.GameInput.moveDown; -import static catalystsurvival.input.GameInput.moveUp; -import static catalystsurvival.input.GameInput.move_last; -import static catalystsurvival.input.GameInput.startButton_last; +import static projectzombie.input.GameInput.activateItem_last; +import static projectzombie.input.GameInput.activateTile_last; +import static projectzombie.input.GameInput.dropItem_last; +import static projectzombie.input.GameInput.fireGun; +import static projectzombie.input.GameInput.hotbar_l; +import static projectzombie.input.GameInput.hotbar_r; +import static projectzombie.input.GameInput.moveDown; +import static projectzombie.input.GameInput.moveUp; +import static projectzombie.input.GameInput.move_last; +import static projectzombie.input.GameInput.startButton_last; import java.nio.ByteBuffer; import java.nio.FloatBuffer; @@ -18,9 +18,9 @@ import java.util.ArrayList; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWJoystickCallbackI; -import catalystsurvival.Main; -import catalystsurvival.input.types.Input; import mainloop.task.IMainloopTask; +import projectzombie.Main; +import projectzombie.input.types.Input; public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask { @@ -64,7 +64,7 @@ public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask @Override public boolean MainLoopDelay(long millis) { - return millis > 10; + return millis > Main.tickrate; } @Override diff --git a/src/catalystsurvival/input/KeyCallback.java b/src/projectzombie/input/KeyCallback.java similarity index 86% rename from src/catalystsurvival/input/KeyCallback.java rename to src/projectzombie/input/KeyCallback.java index 4253ded..c22d1b2 100644 --- a/src/catalystsurvival/input/KeyCallback.java +++ b/src/projectzombie/input/KeyCallback.java @@ -1,11 +1,5 @@ -package catalystsurvival.input; +package projectzombie.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_2; import static org.lwjgl.glfw.GLFW.GLFW_KEY_3; @@ -21,13 +15,19 @@ 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_W; import static org.lwjgl.glfw.GLFW.GLFW_RELEASE; +import static projectzombie.input.GameInput.fireGun; +import static projectzombie.input.GameInput.moveDown; +import static projectzombie.input.GameInput.moveLeft; +import static projectzombie.input.GameInput.moveRight; +import static projectzombie.input.GameInput.moveUp; +import static projectzombie.input.GameInput.move_last; import org.lwjgl.glfw.GLFWKeyCallbackI; -import catalystsurvival.Main; -import catalystsurvival.input.types.Input; -import catalystsurvival.util.math.vec.Vec2d; import mainloop.task.IMainloopTask; +import projectzombie.Main; +import projectzombie.input.types.Input; +import projectzombie.util.math.vec.Vec2d; public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask { @@ -127,7 +127,7 @@ public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask @Override public boolean MainLoopDelay(long millis) { - return millis > 10; + return millis > Main.tickrate; } @Override diff --git a/src/catalystsurvival/input/KeyCharCallback.java b/src/projectzombie/input/KeyCharCallback.java similarity index 86% rename from src/catalystsurvival/input/KeyCharCallback.java rename to src/projectzombie/input/KeyCharCallback.java index 9b95ea6..c872bd4 100644 --- a/src/catalystsurvival/input/KeyCharCallback.java +++ b/src/projectzombie/input/KeyCharCallback.java @@ -1,4 +1,4 @@ -package catalystsurvival.input; +package projectzombie.input; import org.lwjgl.glfw.GLFWCharCallbackI; diff --git a/src/catalystsurvival/input/MouseButtonCallback.java b/src/projectzombie/input/MouseButtonCallback.java similarity index 88% rename from src/catalystsurvival/input/MouseButtonCallback.java rename to src/projectzombie/input/MouseButtonCallback.java index d007c0f..46d816e 100644 --- a/src/catalystsurvival/input/MouseButtonCallback.java +++ b/src/projectzombie/input/MouseButtonCallback.java @@ -1,9 +1,9 @@ -package catalystsurvival.input; +package projectzombie.input; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWMouseButtonCallbackI; -import catalystsurvival.Main; +import projectzombie.Main; public class MouseButtonCallback implements GLFWMouseButtonCallbackI { diff --git a/src/catalystsurvival/input/ScrollWheelCallback.java b/src/projectzombie/input/ScrollWheelCallback.java similarity index 83% rename from src/catalystsurvival/input/ScrollWheelCallback.java rename to src/projectzombie/input/ScrollWheelCallback.java index 3749529..055d45f 100644 --- a/src/catalystsurvival/input/ScrollWheelCallback.java +++ b/src/projectzombie/input/ScrollWheelCallback.java @@ -1,8 +1,8 @@ -package catalystsurvival.input; +package projectzombie.input; import org.lwjgl.glfw.GLFWScrollCallbackI; -import catalystsurvival.Main; +import projectzombie.Main; public class ScrollWheelCallback implements GLFWScrollCallbackI { diff --git a/src/catalystsurvival/input/types/Input.java b/src/projectzombie/input/types/Input.java similarity index 91% rename from src/catalystsurvival/input/types/Input.java rename to src/projectzombie/input/types/Input.java index 44754fc..66ba60d 100644 --- a/src/catalystsurvival/input/types/Input.java +++ b/src/projectzombie/input/types/Input.java @@ -1,4 +1,4 @@ -package catalystsurvival.input.types; +package projectzombie.input.types; public interface Input { diff --git a/src/catalystsurvival/input/types/InputDeath.java b/src/projectzombie/input/types/InputDeath.java similarity index 83% rename from src/catalystsurvival/input/types/InputDeath.java rename to src/projectzombie/input/types/InputDeath.java index c966c8f..811d7c6 100644 --- a/src/catalystsurvival/input/types/InputDeath.java +++ b/src/projectzombie/input/types/InputDeath.java @@ -1,8 +1,8 @@ -package catalystsurvival.input.types; +package projectzombie.input.types; -import catalystsurvival.Main; -import catalystsurvival.menu.Menu; -import catalystsurvival.menu.MenuDeath; +import projectzombie.Main; +import projectzombie.menu.Menu; +import projectzombie.menu.MenuDeath; public class InputDeath implements Input { diff --git a/src/catalystsurvival/input/types/InputGame.java b/src/projectzombie/input/types/InputGame.java similarity index 87% rename from src/catalystsurvival/input/types/InputGame.java rename to src/projectzombie/input/types/InputGame.java index fa167a5..29752e8 100644 --- a/src/catalystsurvival/input/types/InputGame.java +++ b/src/projectzombie/input/types/InputGame.java @@ -1,8 +1,8 @@ -package catalystsurvival.input.types; +package projectzombie.input.types; -import catalystsurvival.Main; -import catalystsurvival.menu.MenuGamePause; -import catalystsurvival.util.math.MathHelpers; +import projectzombie.Main; +import projectzombie.menu.MenuGamePause; +import projectzombie.util.math.MathHelpers; public class InputGame implements Input { diff --git a/src/catalystsurvival/input/types/InputGamePause.java b/src/projectzombie/input/types/InputGamePause.java similarity index 80% rename from src/catalystsurvival/input/types/InputGamePause.java rename to src/projectzombie/input/types/InputGamePause.java index 5b891b0..0a97774 100644 --- a/src/catalystsurvival/input/types/InputGamePause.java +++ b/src/projectzombie/input/types/InputGamePause.java @@ -1,9 +1,9 @@ -package catalystsurvival.input.types; +package projectzombie.input.types; -import catalystsurvival.Main; -import catalystsurvival.menu.Menu; -import catalystsurvival.menu.MenuGame; -import catalystsurvival.menu.MenuGamePause; +import projectzombie.Main; +import projectzombie.menu.Menu; +import projectzombie.menu.MenuGame; +import projectzombie.menu.MenuGamePause; public class InputGamePause implements Input { diff --git a/src/catalystsurvival/input/types/InputMenu.java b/src/projectzombie/input/types/InputMenu.java similarity index 96% rename from src/catalystsurvival/input/types/InputMenu.java rename to src/projectzombie/input/types/InputMenu.java index caef23c..2f64e84 100644 --- a/src/catalystsurvival/input/types/InputMenu.java +++ b/src/projectzombie/input/types/InputMenu.java @@ -1,4 +1,4 @@ -package catalystsurvival.input.types; +package projectzombie.input.types; public class InputMenu implements Input { diff --git a/src/catalystsurvival/inventory/IInventory.java b/src/projectzombie/inventory/IInventory.java similarity index 69% rename from src/catalystsurvival/inventory/IInventory.java rename to src/projectzombie/inventory/IInventory.java index 6ed3694..5cc9447 100644 --- a/src/catalystsurvival/inventory/IInventory.java +++ b/src/projectzombie/inventory/IInventory.java @@ -1,6 +1,6 @@ -package catalystsurvival.inventory; +package projectzombie.inventory; -import catalystsurvival.util.math.ItemStack; +import projectzombie.util.math.ItemStack; public interface IInventory { diff --git a/src/catalystsurvival/inventory/Inventory.java b/src/projectzombie/inventory/Inventory.java similarity index 89% rename from src/catalystsurvival/inventory/Inventory.java rename to src/projectzombie/inventory/Inventory.java index b0bbf61..6f53f8d 100644 --- a/src/catalystsurvival/inventory/Inventory.java +++ b/src/projectzombie/inventory/Inventory.java @@ -1,6 +1,6 @@ -package catalystsurvival.inventory; +package projectzombie.inventory; -import catalystsurvival.util.math.ItemStack; +import projectzombie.util.math.ItemStack; public class Inventory implements IInventory { diff --git a/src/catalystsurvival/items/Item.java b/src/projectzombie/items/Item.java similarity index 79% rename from src/catalystsurvival/items/Item.java rename to src/projectzombie/items/Item.java index 62e85d4..21fb102 100644 --- a/src/catalystsurvival/items/Item.java +++ b/src/projectzombie/items/Item.java @@ -1,14 +1,14 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityInventory; -import catalystsurvival.inventory.Inventory; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityInventory; +import projectzombie.inventory.Inventory; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class Item { diff --git a/src/catalystsurvival/items/ItemAmmo.java b/src/projectzombie/items/ItemAmmo.java similarity index 63% rename from src/catalystsurvival/items/ItemAmmo.java rename to src/projectzombie/items/ItemAmmo.java index 8ad1191..0106152 100644 --- a/src/catalystsurvival/items/ItemAmmo.java +++ b/src/projectzombie/items/ItemAmmo.java @@ -1,11 +1,11 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemAmmo extends Item { diff --git a/src/catalystsurvival/items/ItemDefenceUpgrade.java b/src/projectzombie/items/ItemDefenceUpgrade.java similarity index 64% rename from src/catalystsurvival/items/ItemDefenceUpgrade.java rename to src/projectzombie/items/ItemDefenceUpgrade.java index 136b84f..0ef29dc 100644 --- a/src/catalystsurvival/items/ItemDefenceUpgrade.java +++ b/src/projectzombie/items/ItemDefenceUpgrade.java @@ -1,11 +1,11 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.Main; -import catalystsurvival.entity.Entity; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemDefenceUpgrade extends Item { diff --git a/src/catalystsurvival/items/ItemEmpty.java b/src/projectzombie/items/ItemEmpty.java similarity index 58% rename from src/catalystsurvival/items/ItemEmpty.java rename to src/projectzombie/items/ItemEmpty.java index bd5e04f..1102ab5 100644 --- a/src/catalystsurvival/items/ItemEmpty.java +++ b/src/projectzombie/items/ItemEmpty.java @@ -1,10 +1,10 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemEmpty extends Item { diff --git a/src/catalystsurvival/items/ItemFlare.java b/src/projectzombie/items/ItemFlare.java similarity index 59% rename from src/catalystsurvival/items/ItemFlare.java rename to src/projectzombie/items/ItemFlare.java index 565932a..c1d7dc5 100644 --- a/src/catalystsurvival/items/ItemFlare.java +++ b/src/projectzombie/items/ItemFlare.java @@ -1,11 +1,11 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityFlare; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityFlare; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemFlare extends Item { diff --git a/src/catalystsurvival/items/ItemGrapplingHook.java b/src/projectzombie/items/ItemGrapplingHook.java similarity index 58% rename from src/catalystsurvival/items/ItemGrapplingHook.java rename to src/projectzombie/items/ItemGrapplingHook.java index 19d2f7a..4f9d614 100644 --- a/src/catalystsurvival/items/ItemGrapplingHook.java +++ b/src/projectzombie/items/ItemGrapplingHook.java @@ -1,13 +1,13 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityGrapplingHook; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityGrapplingHook; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemGrapplingHook extends Item { diff --git a/src/catalystsurvival/items/ItemGunUpgrade.java b/src/projectzombie/items/ItemGunUpgrade.java similarity index 63% rename from src/catalystsurvival/items/ItemGunUpgrade.java rename to src/projectzombie/items/ItemGunUpgrade.java index cf9c94f..bc82118 100644 --- a/src/catalystsurvival/items/ItemGunUpgrade.java +++ b/src/projectzombie/items/ItemGunUpgrade.java @@ -1,11 +1,11 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.Main; -import catalystsurvival.entity.Entity; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemGunUpgrade extends Item { diff --git a/src/catalystsurvival/items/ItemHealthPotion.java b/src/projectzombie/items/ItemHealthPotion.java similarity index 67% rename from src/catalystsurvival/items/ItemHealthPotion.java rename to src/projectzombie/items/ItemHealthPotion.java index 25a7f0b..35f5d0b 100644 --- a/src/catalystsurvival/items/ItemHealthPotion.java +++ b/src/projectzombie/items/ItemHealthPotion.java @@ -1,11 +1,11 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityAlive; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityAlive; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemHealthPotion extends Item { diff --git a/src/catalystsurvival/items/ItemLantern.java b/src/projectzombie/items/ItemLantern.java similarity index 60% rename from src/catalystsurvival/items/ItemLantern.java rename to src/projectzombie/items/ItemLantern.java index 9bd9f26..72c2c0f 100644 --- a/src/catalystsurvival/items/ItemLantern.java +++ b/src/projectzombie/items/ItemLantern.java @@ -1,13 +1,13 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.init.Textures; -import catalystsurvival.init.Tiles; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.init.Textures; +import projectzombie.init.Tiles; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemLantern extends Item { diff --git a/src/catalystsurvival/items/ItemTnt.java b/src/projectzombie/items/ItemTnt.java similarity index 60% rename from src/catalystsurvival/items/ItemTnt.java rename to src/projectzombie/items/ItemTnt.java index 2b1ad0d..c1fc269 100644 --- a/src/catalystsurvival/items/ItemTnt.java +++ b/src/projectzombie/items/ItemTnt.java @@ -1,11 +1,11 @@ -package catalystsurvival.items; +package projectzombie.items; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityTnt; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityTnt; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class ItemTnt extends Item { diff --git a/src/catalystsurvival/mainloop/MainloopEventHandler.java b/src/projectzombie/mainloop/MainloopEventHandler.java similarity index 94% rename from src/catalystsurvival/mainloop/MainloopEventHandler.java rename to src/projectzombie/mainloop/MainloopEventHandler.java index 1cfa17e..1ab201b 100644 --- a/src/catalystsurvival/mainloop/MainloopEventHandler.java +++ b/src/projectzombie/mainloop/MainloopEventHandler.java @@ -1,8 +1,8 @@ -package catalystsurvival.mainloop; +package projectzombie.mainloop; -import catalystsurvival.Main; import mainloop.event.IMainloopEvent; import mainloop.task.IMainloopTask; +import projectzombie.Main; public class MainloopEventHandler implements IMainloopEvent, IMainloopTask { diff --git a/src/catalystsurvival/menu/Menu.java b/src/projectzombie/menu/Menu.java similarity index 73% rename from src/catalystsurvival/menu/Menu.java rename to src/projectzombie/menu/Menu.java index 1832f8c..745530d 100644 --- a/src/catalystsurvival/menu/Menu.java +++ b/src/projectzombie/menu/Menu.java @@ -1,6 +1,6 @@ -package catalystsurvival.menu; +package projectzombie.menu; -import catalystsurvival.input.types.Input; +import projectzombie.input.types.Input; public abstract class Menu { diff --git a/src/catalystsurvival/menu/MenuDeath.java b/src/projectzombie/menu/MenuDeath.java similarity index 83% rename from src/catalystsurvival/menu/MenuDeath.java rename to src/projectzombie/menu/MenuDeath.java index 8d30fbc..b1cd393 100644 --- a/src/catalystsurvival/menu/MenuDeath.java +++ b/src/projectzombie/menu/MenuDeath.java @@ -1,9 +1,9 @@ -package catalystsurvival.menu; +package projectzombie.menu; -import catalystsurvival.input.types.InputDeath; -import catalystsurvival.text.Text; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.input.types.InputDeath; +import projectzombie.text.Text; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; public class MenuDeath extends Menu { diff --git a/src/catalystsurvival/menu/MenuGame.java b/src/projectzombie/menu/MenuGame.java similarity index 68% rename from src/catalystsurvival/menu/MenuGame.java rename to src/projectzombie/menu/MenuGame.java index b2ccbb5..a7beddf 100644 --- a/src/catalystsurvival/menu/MenuGame.java +++ b/src/projectzombie/menu/MenuGame.java @@ -1,7 +1,7 @@ -package catalystsurvival.menu; +package projectzombie.menu; -import catalystsurvival.Main; -import catalystsurvival.input.types.InputGame; +import projectzombie.Main; +import projectzombie.input.types.InputGame; public class MenuGame extends Menu { diff --git a/src/catalystsurvival/menu/MenuGamePause.java b/src/projectzombie/menu/MenuGamePause.java similarity index 82% rename from src/catalystsurvival/menu/MenuGamePause.java rename to src/projectzombie/menu/MenuGamePause.java index ab86e2a..c410c24 100644 --- a/src/catalystsurvival/menu/MenuGamePause.java +++ b/src/projectzombie/menu/MenuGamePause.java @@ -1,9 +1,9 @@ -package catalystsurvival.menu; +package projectzombie.menu; -import catalystsurvival.input.types.InputGamePause; -import catalystsurvival.text.Text; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.input.types.InputGamePause; +import projectzombie.text.Text; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; public class MenuGamePause extends Menu { diff --git a/src/catalystsurvival/menu/MenuMain.java b/src/projectzombie/menu/MenuMain.java similarity index 71% rename from src/catalystsurvival/menu/MenuMain.java rename to src/projectzombie/menu/MenuMain.java index 3dc3ab8..13af0e1 100644 --- a/src/catalystsurvival/menu/MenuMain.java +++ b/src/projectzombie/menu/MenuMain.java @@ -1,6 +1,6 @@ -package catalystsurvival.menu; +package projectzombie.menu; -import catalystsurvival.input.types.InputMenu; +import projectzombie.input.types.InputMenu; public class MenuMain extends Menu { diff --git a/src/catalystsurvival/menu/MenuRespawn.java b/src/projectzombie/menu/MenuRespawn.java similarity index 74% rename from src/catalystsurvival/menu/MenuRespawn.java rename to src/projectzombie/menu/MenuRespawn.java index c2bc938..eb65119 100644 --- a/src/catalystsurvival/menu/MenuRespawn.java +++ b/src/projectzombie/menu/MenuRespawn.java @@ -1,15 +1,15 @@ -package catalystsurvival.menu; +package projectzombie.menu; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.display.bossbar.BossBars; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.init.Layers; -import catalystsurvival.text.Text; -import catalystsurvival.time.GameTimer; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.Main; +import projectzombie.display.bossbar.BossBars; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Layers; +import projectzombie.text.Text; +import projectzombie.time.GameTimer; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.vec.Vec2d; class MenuRespawn { diff --git a/src/catalystsurvival/resources/Resource.java b/src/projectzombie/resources/Resource.java similarity index 98% rename from src/catalystsurvival/resources/Resource.java rename to src/projectzombie/resources/Resource.java index 7a96dcf..297b60d 100644 --- a/src/catalystsurvival/resources/Resource.java +++ b/src/projectzombie/resources/Resource.java @@ -1,4 +1,4 @@ -package catalystsurvival.resources; +package projectzombie.resources; import java.io.File; import java.io.FileInputStream; diff --git a/src/catalystsurvival/resources/ResourceDownload.java b/src/projectzombie/resources/ResourceDownload.java similarity index 97% rename from src/catalystsurvival/resources/ResourceDownload.java rename to src/projectzombie/resources/ResourceDownload.java index d1c502e..60c0814 100644 --- a/src/catalystsurvival/resources/ResourceDownload.java +++ b/src/projectzombie/resources/ResourceDownload.java @@ -1,4 +1,4 @@ -package catalystsurvival.resources; +package projectzombie.resources; import java.io.IOException; import java.io.InputStream; diff --git a/src/catalystsurvival/text/Text.java b/src/projectzombie/text/Text.java similarity index 97% rename from src/catalystsurvival/text/Text.java rename to src/projectzombie/text/Text.java index f250cab..2242d48 100644 --- a/src/catalystsurvival/text/Text.java +++ b/src/projectzombie/text/Text.java @@ -1,10 +1,10 @@ -package catalystsurvival.text; +package projectzombie.text; -import catalystsurvival.Main; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.Main; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.vec.Vec2d; public class Text { diff --git a/src/catalystsurvival/tiles/LightLevelNoise.java b/src/projectzombie/tiles/LightLevelNoise.java similarity index 81% rename from src/catalystsurvival/tiles/LightLevelNoise.java rename to src/projectzombie/tiles/LightLevelNoise.java index 2f86952..4644453 100644 --- a/src/catalystsurvival/tiles/LightLevelNoise.java +++ b/src/projectzombie/tiles/LightLevelNoise.java @@ -1,11 +1,11 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; import java.util.Random; -import catalystsurvival.time.GameTimer; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.random.OpenSimplexNoise; import mainloop.task.IMainloopTask; +import projectzombie.time.GameTimer; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.random.OpenSimplexNoise; public class LightLevelNoise implements IMainloopTask { @@ -17,7 +17,7 @@ public class LightLevelNoise implements IMainloopTask private static double lantern_noise = 0; static double getLightLevel(OpenSimplexNoise noise) { - return noise.eval(GameTimer.getTime() / 512.0, 0); + return noise.eval(GameTimer.getTime() / 50.0, 0); } static double getLavaLightLevel() { diff --git a/src/catalystsurvival/tiles/Tile.java b/src/projectzombie/tiles/Tile.java similarity index 75% rename from src/catalystsurvival/tiles/Tile.java rename to src/projectzombie/tiles/Tile.java index 0f17f51..74959e8 100644 --- a/src/catalystsurvival/tiles/Tile.java +++ b/src/projectzombie/tiles/Tile.java @@ -1,14 +1,14 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.display.Camera; -import catalystsurvival.display.transparent.ITransparentObject; -import catalystsurvival.display.transparent.TransparentObjects; -import catalystsurvival.entity.Entity; -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 projectzombie.display.Camera; +import projectzombie.display.transparent.ITransparentObject; +import projectzombie.display.transparent.TransparentObjects; +import projectzombie.entity.Entity; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class Tile implements ITransparentObject { diff --git a/src/catalystsurvival/tiles/TileBossPortal.java b/src/projectzombie/tiles/TileBossPortal.java similarity index 75% rename from src/catalystsurvival/tiles/TileBossPortal.java rename to src/projectzombie/tiles/TileBossPortal.java index 38c7bfb..2fba033 100644 --- a/src/catalystsurvival/tiles/TileBossPortal.java +++ b/src/projectzombie/tiles/TileBossPortal.java @@ -1,19 +1,19 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; 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 projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.particle.ParticleBreak; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Textures; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.ChunkEventHandler; +import projectzombie.world.layer.Layer; +import projectzombie.world.layer.layergen.LayerGenBossArena; public class TileBossPortal extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileChest.java b/src/projectzombie/tiles/TileChest.java similarity index 85% rename from src/catalystsurvival/tiles/TileChest.java rename to src/projectzombie/tiles/TileChest.java index 1526ee3..653a10d 100644 --- a/src/catalystsurvival/tiles/TileChest.java +++ b/src/projectzombie/tiles/TileChest.java @@ -1,19 +1,19 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityItem; -import catalystsurvival.init.Items; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityItem; +import projectzombie.init.Items; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class TileChest extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileDirt.java b/src/projectzombie/tiles/TileDirt.java similarity index 62% rename from src/catalystsurvival/tiles/TileDirt.java rename to src/projectzombie/tiles/TileDirt.java index 70cc677..77a18f9 100644 --- a/src/catalystsurvival/tiles/TileDirt.java +++ b/src/projectzombie/tiles/TileDirt.java @@ -1,6 +1,6 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; +import projectzombie.init.Textures; public class TileDirt extends TileFlatFaded { diff --git a/src/catalystsurvival/tiles/TileFire.java b/src/projectzombie/tiles/TileFire.java similarity index 61% rename from src/catalystsurvival/tiles/TileFire.java rename to src/projectzombie/tiles/TileFire.java index ca95205..55c4df4 100644 --- a/src/catalystsurvival/tiles/TileFire.java +++ b/src/projectzombie/tiles/TileFire.java @@ -1,7 +1,7 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.init.Textures; +import projectzombie.util.math.vec.Vec2d; public class TileFire extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileFlat.java b/src/projectzombie/tiles/TileFlat.java similarity index 74% rename from src/catalystsurvival/tiles/TileFlat.java rename to src/projectzombie/tiles/TileFlat.java index 115c57d..fd102d9 100644 --- a/src/catalystsurvival/tiles/TileFlat.java +++ b/src/projectzombie/tiles/TileFlat.java @@ -1,12 +1,12 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.texture.IHasTexture; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.display.Camera; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.texture.IHasTexture; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; public class TileFlat extends Tile implements IHasTexture { diff --git a/src/catalystsurvival/tiles/TileFlatFaded.java b/src/projectzombie/tiles/TileFlatFaded.java similarity index 58% rename from src/catalystsurvival/tiles/TileFlatFaded.java rename to src/projectzombie/tiles/TileFlatFaded.java index 20af3f9..9e2dee8 100644 --- a/src/catalystsurvival/tiles/TileFlatFaded.java +++ b/src/projectzombie/tiles/TileFlatFaded.java @@ -1,10 +1,10 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.display.Camera; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; public class TileFlatFaded extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileGrass.java b/src/projectzombie/tiles/TileGrass.java similarity index 62% rename from src/catalystsurvival/tiles/TileGrass.java rename to src/projectzombie/tiles/TileGrass.java index be096b6..b716948 100644 --- a/src/catalystsurvival/tiles/TileGrass.java +++ b/src/projectzombie/tiles/TileGrass.java @@ -1,6 +1,6 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; +import projectzombie.init.Textures; public class TileGrass extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileLadder.java b/src/projectzombie/tiles/TileLadder.java similarity index 63% rename from src/catalystsurvival/tiles/TileLadder.java rename to src/projectzombie/tiles/TileLadder.java index fe317ef..4a799a8 100644 --- a/src/catalystsurvival/tiles/TileLadder.java +++ b/src/projectzombie/tiles/TileLadder.java @@ -1,9 +1,9 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; +import projectzombie.init.Textures; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; public class TileLadder extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileLadderUp.java b/src/projectzombie/tiles/TileLadderUp.java similarity index 77% rename from src/catalystsurvival/tiles/TileLadderUp.java rename to src/projectzombie/tiles/TileLadderUp.java index 06ec5b6..e01c6ff 100644 --- a/src/catalystsurvival/tiles/TileLadderUp.java +++ b/src/projectzombie/tiles/TileLadderUp.java @@ -1,17 +1,17 @@ -package catalystsurvival.tiles; +package projectzombie.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 projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Layers; +import projectzombie.init.Textures; +import projectzombie.mainloop.MainloopEventHandler; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.ChunkEventHandler; +import projectzombie.world.layer.Layer; public class TileLadderUp extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileLantern.java b/src/projectzombie/tiles/TileLantern.java similarity index 60% rename from src/catalystsurvival/tiles/TileLantern.java rename to src/projectzombie/tiles/TileLantern.java index cfa08fe..d312806 100644 --- a/src/catalystsurvival/tiles/TileLantern.java +++ b/src/projectzombie/tiles/TileLantern.java @@ -1,14 +1,14 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityItem; -import catalystsurvival.init.Items; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.ItemStack; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityItem; +import projectzombie.init.Items; +import projectzombie.init.Textures; +import projectzombie.util.math.ItemStack; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.layer.Layer; public class TileLantern extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileLava.java b/src/projectzombie/tiles/TileLava.java similarity index 69% rename from src/catalystsurvival/tiles/TileLava.java rename to src/projectzombie/tiles/TileLava.java index 75750b5..9e200df 100644 --- a/src/catalystsurvival/tiles/TileLava.java +++ b/src/projectzombie/tiles/TileLava.java @@ -1,17 +1,17 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; import java.util.Random; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.particle.ParticleLava; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -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 projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.entity.particle.ParticleLava; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class TileLava extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileLavaFlow.java b/src/projectzombie/tiles/TileLavaFlow.java similarity index 63% rename from src/catalystsurvival/tiles/TileLavaFlow.java rename to src/projectzombie/tiles/TileLavaFlow.java index beca7e0..9d529dd 100644 --- a/src/catalystsurvival/tiles/TileLavaFlow.java +++ b/src/projectzombie/tiles/TileLavaFlow.java @@ -1,17 +1,17 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; import java.util.Random; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.particle.ParticleSmoke; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.particle.ParticleSmoke; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class TileLavaFlow extends TileFlat { diff --git a/src/catalystsurvival/tiles/TilePortalDown.java b/src/projectzombie/tiles/TilePortalDown.java similarity index 84% rename from src/catalystsurvival/tiles/TilePortalDown.java rename to src/projectzombie/tiles/TilePortalDown.java index 115b14f..f8e3d13 100644 --- a/src/catalystsurvival/tiles/TilePortalDown.java +++ b/src/projectzombie/tiles/TilePortalDown.java @@ -1,16 +1,16 @@ -package catalystsurvival.tiles; +package projectzombie.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 projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Layers; +import projectzombie.init.Textures; +import projectzombie.mainloop.MainloopEventHandler; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.ChunkEventHandler; +import projectzombie.world.layer.Layer; public class TilePortalDown extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileRock.java b/src/projectzombie/tiles/TileRock.java similarity index 66% rename from src/catalystsurvival/tiles/TileRock.java rename to src/projectzombie/tiles/TileRock.java index 9c0dae5..84234f3 100644 --- a/src/catalystsurvival/tiles/TileRock.java +++ b/src/projectzombie/tiles/TileRock.java @@ -1,8 +1,8 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.init.Textures; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; public class TileRock extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileSand.java b/src/projectzombie/tiles/TileSand.java similarity index 61% rename from src/catalystsurvival/tiles/TileSand.java rename to src/projectzombie/tiles/TileSand.java index fc44433..63e8326 100644 --- a/src/catalystsurvival/tiles/TileSand.java +++ b/src/projectzombie/tiles/TileSand.java @@ -1,6 +1,6 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; +import projectzombie.init.Textures; public class TileSand extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileStone.java b/src/projectzombie/tiles/TileStone.java similarity index 63% rename from src/catalystsurvival/tiles/TileStone.java rename to src/projectzombie/tiles/TileStone.java index c6f8de7..235170d 100644 --- a/src/catalystsurvival/tiles/TileStone.java +++ b/src/projectzombie/tiles/TileStone.java @@ -1,6 +1,6 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; +import projectzombie.init.Textures; public class TileStone extends TileFlatFaded { diff --git a/src/catalystsurvival/tiles/TileTree.java b/src/projectzombie/tiles/TileTree.java similarity index 66% rename from src/catalystsurvival/tiles/TileTree.java rename to src/projectzombie/tiles/TileTree.java index 1cf4023..f370d28 100644 --- a/src/catalystsurvival/tiles/TileTree.java +++ b/src/projectzombie/tiles/TileTree.java @@ -1,8 +1,8 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.init.Textures; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; public class TileTree extends TileVertical { diff --git a/src/catalystsurvival/tiles/TileVertical.java b/src/projectzombie/tiles/TileVertical.java similarity index 60% rename from src/catalystsurvival/tiles/TileVertical.java rename to src/projectzombie/tiles/TileVertical.java index da32dee..a8a2630 100644 --- a/src/catalystsurvival/tiles/TileVertical.java +++ b/src/projectzombie/tiles/TileVertical.java @@ -1,12 +1,12 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.gl.VerticalRender; -import catalystsurvival.util.gl.texture.IHasTexture; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.display.Camera; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.gl.VerticalRender; +import projectzombie.util.gl.texture.IHasTexture; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; public class TileVertical extends Tile implements IHasTexture { diff --git a/src/catalystsurvival/tiles/TileVoid.java b/src/projectzombie/tiles/TileVoid.java similarity index 84% rename from src/catalystsurvival/tiles/TileVoid.java rename to src/projectzombie/tiles/TileVoid.java index 9628235..6aed8a4 100644 --- a/src/catalystsurvival/tiles/TileVoid.java +++ b/src/projectzombie/tiles/TileVoid.java @@ -1,4 +1,4 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; public class TileVoid extends Tile { diff --git a/src/catalystsurvival/tiles/TileWall.java b/src/projectzombie/tiles/TileWall.java similarity index 76% rename from src/catalystsurvival/tiles/TileWall.java rename to src/projectzombie/tiles/TileWall.java index e1470c7..f41ce2e 100644 --- a/src/catalystsurvival/tiles/TileWall.java +++ b/src/projectzombie/tiles/TileWall.java @@ -1,6 +1,6 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.init.Textures; +import projectzombie.init.Textures; public class TileWall extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileWallUnbreakable.java b/src/projectzombie/tiles/TileWallUnbreakable.java similarity index 81% rename from src/catalystsurvival/tiles/TileWallUnbreakable.java rename to src/projectzombie/tiles/TileWallUnbreakable.java index 2fd0adb..550a162 100644 --- a/src/catalystsurvival/tiles/TileWallUnbreakable.java +++ b/src/projectzombie/tiles/TileWallUnbreakable.java @@ -1,4 +1,4 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; public class TileWallUnbreakable extends TileWall { diff --git a/src/catalystsurvival/tiles/TileWater.java b/src/projectzombie/tiles/TileWater.java similarity index 58% rename from src/catalystsurvival/tiles/TileWater.java rename to src/projectzombie/tiles/TileWater.java index 2120137..aa052f3 100644 --- a/src/catalystsurvival/tiles/TileWater.java +++ b/src/projectzombie/tiles/TileWater.java @@ -1,15 +1,15 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.particle.ParticleWater; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -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 projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.entity.particle.ParticleWater; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class TileWater extends TileFlat { diff --git a/src/catalystsurvival/tiles/TileWaterFlow.java b/src/projectzombie/tiles/TileWaterFlow.java similarity index 57% rename from src/catalystsurvival/tiles/TileWaterFlow.java rename to src/projectzombie/tiles/TileWaterFlow.java index bac6308..41fd180 100644 --- a/src/catalystsurvival/tiles/TileWaterFlow.java +++ b/src/projectzombie/tiles/TileWaterFlow.java @@ -1,10 +1,10 @@ -package catalystsurvival.tiles; +package projectzombie.tiles; -import catalystsurvival.display.Camera; -import catalystsurvival.init.Textures; -import catalystsurvival.util.gl.GlHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.display.Camera; +import projectzombie.init.Textures; +import projectzombie.util.gl.GlHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; public class TileWaterFlow extends TileFlat { diff --git a/src/catalystsurvival/time/GameTimer.java b/src/projectzombie/time/GameTimer.java similarity index 83% rename from src/catalystsurvival/time/GameTimer.java rename to src/projectzombie/time/GameTimer.java index 4dc1a89..f422a52 100644 --- a/src/catalystsurvival/time/GameTimer.java +++ b/src/projectzombie/time/GameTimer.java @@ -1,7 +1,7 @@ -package catalystsurvival.time; +package projectzombie.time; -import catalystsurvival.Main; import mainloop.task.IMainloopTask; +import projectzombie.Main; public class GameTimer implements IMainloopTask { @@ -14,7 +14,7 @@ public class GameTimer implements IMainloopTask @Override public boolean MainLoopDelay(long millis) { - return millis > 1; + return millis > Main.tickrate; } @Override diff --git a/src/catalystsurvival/time/NoSleep.java b/src/projectzombie/time/NoSleep.java similarity index 94% rename from src/catalystsurvival/time/NoSleep.java rename to src/projectzombie/time/NoSleep.java index 9becc6a..ca97623 100644 --- a/src/catalystsurvival/time/NoSleep.java +++ b/src/projectzombie/time/NoSleep.java @@ -1,4 +1,4 @@ -package catalystsurvival.time; +package projectzombie.time; import java.awt.AWTException; import java.awt.Robot; diff --git a/src/catalystsurvival/util/gl/GlHelpers.java b/src/projectzombie/util/gl/GlHelpers.java similarity index 97% rename from src/catalystsurvival/util/gl/GlHelpers.java rename to src/projectzombie/util/gl/GlHelpers.java index 45a5a4c..1df8890 100644 --- a/src/catalystsurvival/util/gl/GlHelpers.java +++ b/src/projectzombie/util/gl/GlHelpers.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.gl; +package projectzombie.util.gl; import static org.lwjgl.opengl.GL11.GL_ALPHA; import static org.lwjgl.opengl.GL11.GL_BLEND; @@ -19,7 +19,7 @@ import static org.lwjgl.opengl.GL11.glTranslated; import static org.lwjgl.opengl.GL11.glVertex2d; import static org.lwjgl.opengl.GL11.glVertex3d; -import catalystsurvival.Main; +import projectzombie.Main; public class GlHelpers { diff --git a/src/catalystsurvival/util/gl/VerticalRender.java b/src/projectzombie/util/gl/VerticalRender.java similarity index 82% rename from src/catalystsurvival/util/gl/VerticalRender.java rename to src/projectzombie/util/gl/VerticalRender.java index 63acbf9..e9463bf 100644 --- a/src/catalystsurvival/util/gl/VerticalRender.java +++ b/src/projectzombie/util/gl/VerticalRender.java @@ -1,8 +1,8 @@ -package catalystsurvival.util.gl; +package projectzombie.util.gl; -import catalystsurvival.display.Camera; -import catalystsurvival.util.gl.texture.TextureReference; -import catalystsurvival.util.math.vec.Vec2d; +import projectzombie.display.Camera; +import projectzombie.util.gl.texture.TextureReference; +import projectzombie.util.math.vec.Vec2d; public class VerticalRender { diff --git a/src/catalystsurvival/util/gl/texture/AnimationEventHandler.java b/src/projectzombie/util/gl/texture/AnimationEventHandler.java similarity index 86% rename from src/catalystsurvival/util/gl/texture/AnimationEventHandler.java rename to src/projectzombie/util/gl/texture/AnimationEventHandler.java index b07786f..0aed504 100644 --- a/src/catalystsurvival/util/gl/texture/AnimationEventHandler.java +++ b/src/projectzombie/util/gl/texture/AnimationEventHandler.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; -import catalystsurvival.init.Textures; import mainloop.task.IMainloopTask; +import projectzombie.init.Textures; public class AnimationEventHandler implements IMainloopTask { diff --git a/src/catalystsurvival/util/gl/texture/AnimationReference.java b/src/projectzombie/util/gl/texture/AnimationReference.java similarity index 86% rename from src/catalystsurvival/util/gl/texture/AnimationReference.java rename to src/projectzombie/util/gl/texture/AnimationReference.java index 73f2aa3..4206636 100644 --- a/src/catalystsurvival/util/gl/texture/AnimationReference.java +++ b/src/projectzombie/util/gl/texture/AnimationReference.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; -import catalystsurvival.init.Textures; -import catalystsurvival.util.math.MathHelpers; +import projectzombie.init.Textures; +import projectzombie.util.math.MathHelpers; public class AnimationReference extends TextureReference { diff --git a/src/catalystsurvival/util/gl/texture/IHasTexture.java b/src/projectzombie/util/gl/texture/IHasTexture.java similarity index 63% rename from src/catalystsurvival/util/gl/texture/IHasTexture.java rename to src/projectzombie/util/gl/texture/IHasTexture.java index edc9e57..1085213 100644 --- a/src/catalystsurvival/util/gl/texture/IHasTexture.java +++ b/src/projectzombie/util/gl/texture/IHasTexture.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; public interface IHasTexture { diff --git a/src/catalystsurvival/util/gl/texture/Texture.java b/src/projectzombie/util/gl/texture/Texture.java similarity index 92% rename from src/catalystsurvival/util/gl/texture/Texture.java rename to src/projectzombie/util/gl/texture/Texture.java index 7a29a2f..be8939b 100644 --- a/src/catalystsurvival/util/gl/texture/Texture.java +++ b/src/projectzombie/util/gl/texture/Texture.java @@ -1,10 +1,10 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; import java.nio.ByteBuffer; import org.lwjgl.stb.STBImage; -import catalystsurvival.resources.Resource; +import projectzombie.resources.Resource; public class Texture { diff --git a/src/catalystsurvival/util/gl/texture/TextureMap.java b/src/projectzombie/util/gl/texture/TextureMap.java similarity index 95% rename from src/catalystsurvival/util/gl/texture/TextureMap.java rename to src/projectzombie/util/gl/texture/TextureMap.java index 9a0de50..7f742a7 100644 --- a/src/catalystsurvival/util/gl/texture/TextureMap.java +++ b/src/projectzombie/util/gl/texture/TextureMap.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; import static org.lwjgl.opengl.GL11.GL_NEAREST; import static org.lwjgl.opengl.GL11.GL_RGBA; @@ -11,7 +11,7 @@ import static org.lwjgl.opengl.GL11.glGenTextures; import static org.lwjgl.opengl.GL11.glTexImage2D; import static org.lwjgl.opengl.GL11.glTexParameteri; -import catalystsurvival.resources.Resource; +import projectzombie.resources.Resource; public class TextureMap { diff --git a/src/catalystsurvival/util/gl/texture/TextureReference.java b/src/projectzombie/util/gl/texture/TextureReference.java similarity index 93% rename from src/catalystsurvival/util/gl/texture/TextureReference.java rename to src/projectzombie/util/gl/texture/TextureReference.java index 00ff2e1..638bc8d 100644 --- a/src/catalystsurvival/util/gl/texture/TextureReference.java +++ b/src/projectzombie/util/gl/texture/TextureReference.java @@ -1,8 +1,8 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; import static org.lwjgl.opengl.GL11.glTexCoord2f; -import catalystsurvival.util.math.MathHelpers; +import projectzombie.util.math.MathHelpers; public abstract class TextureReference { diff --git a/src/catalystsurvival/util/gl/texture/TextureReferenceEmpty.java b/src/projectzombie/util/gl/texture/TextureReferenceEmpty.java similarity index 87% rename from src/catalystsurvival/util/gl/texture/TextureReferenceEmpty.java rename to src/projectzombie/util/gl/texture/TextureReferenceEmpty.java index 5d00ed1..8506782 100644 --- a/src/catalystsurvival/util/gl/texture/TextureReferenceEmpty.java +++ b/src/projectzombie/util/gl/texture/TextureReferenceEmpty.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; class TextureReferenceEmpty extends TextureReference { diff --git a/src/catalystsurvival/util/gl/texture/TextureReferenceRandom.java b/src/projectzombie/util/gl/texture/TextureReferenceRandom.java similarity index 78% rename from src/catalystsurvival/util/gl/texture/TextureReferenceRandom.java rename to src/projectzombie/util/gl/texture/TextureReferenceRandom.java index 4ff4808..2edd139 100644 --- a/src/catalystsurvival/util/gl/texture/TextureReferenceRandom.java +++ b/src/projectzombie/util/gl/texture/TextureReferenceRandom.java @@ -1,8 +1,8 @@ -package catalystsurvival.util.gl.texture; +package projectzombie.util.gl.texture; import java.util.Random; -import catalystsurvival.util.math.random.RandomHelpers; +import projectzombie.util.math.random.RandomHelpers; public class TextureReferenceRandom { diff --git a/src/catalystsurvival/util/math/ItemStack.java b/src/projectzombie/util/math/ItemStack.java similarity index 85% rename from src/catalystsurvival/util/math/ItemStack.java rename to src/projectzombie/util/math/ItemStack.java index fd8b563..7003df9 100644 --- a/src/catalystsurvival/util/math/ItemStack.java +++ b/src/projectzombie/util/math/ItemStack.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.math; +package projectzombie.util.math; -import catalystsurvival.init.Items; -import catalystsurvival.items.Item; +import projectzombie.init.Items; +import projectzombie.items.Item; public class ItemStack { diff --git a/src/catalystsurvival/util/math/MathHelpers.java b/src/projectzombie/util/math/MathHelpers.java similarity index 95% rename from src/catalystsurvival/util/math/MathHelpers.java rename to src/projectzombie/util/math/MathHelpers.java index eb8e518..ea9a441 100644 --- a/src/catalystsurvival/util/math/MathHelpers.java +++ b/src/projectzombie/util/math/MathHelpers.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.math; +package projectzombie.util.math; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec3d; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec3d; public class MathHelpers { diff --git a/src/catalystsurvival/util/math/TileState.java b/src/projectzombie/util/math/TileState.java similarity index 85% rename from src/catalystsurvival/util/math/TileState.java rename to src/projectzombie/util/math/TileState.java index e3e711c..eb5ff89 100644 --- a/src/catalystsurvival/util/math/TileState.java +++ b/src/projectzombie/util/math/TileState.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.math; +package projectzombie.util.math; -import catalystsurvival.init.Tiles; -import catalystsurvival.tiles.Tile; +import projectzombie.init.Tiles; +import projectzombie.tiles.Tile; public class TileState { diff --git a/src/projectzombie/util/math/map/IMap2D.java b/src/projectzombie/util/math/map/IMap2D.java new file mode 100644 index 0000000..e40a07b --- /dev/null +++ b/src/projectzombie/util/math/map/IMap2D.java @@ -0,0 +1,8 @@ +package projectzombie.util.math.map; + +import projectzombie.util.math.vec.Vec2i; + +public interface IMap2D +{ + public T getEmpty(Vec2i pos); +} diff --git a/src/catalystsurvival/util/math/map/Map2D.java b/src/projectzombie/util/math/map/Map2D.java similarity index 96% rename from src/catalystsurvival/util/math/map/Map2D.java rename to src/projectzombie/util/math/map/Map2D.java index 48926eb..b8050be 100644 --- a/src/catalystsurvival/util/math/map/Map2D.java +++ b/src/projectzombie/util/math/map/Map2D.java @@ -1,9 +1,9 @@ -package catalystsurvival.util.math.map; +package projectzombie.util.math.map; import java.util.ArrayList; import java.util.Iterator; -import catalystsurvival.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec2i; public class Map2D implements Iterable> { diff --git a/src/catalystsurvival/util/math/map/Map2DElement.java b/src/projectzombie/util/math/map/Map2DElement.java similarity index 67% rename from src/catalystsurvival/util/math/map/Map2DElement.java rename to src/projectzombie/util/math/map/Map2DElement.java index 4696f6e..7ed0e03 100644 --- a/src/catalystsurvival/util/math/map/Map2DElement.java +++ b/src/projectzombie/util/math/map/Map2DElement.java @@ -1,6 +1,6 @@ -package catalystsurvival.util.math.map; +package projectzombie.util.math.map; -import catalystsurvival.util.math.vec.Vec2i; +import projectzombie.util.math.vec.Vec2i; public class Map2DElement { diff --git a/src/catalystsurvival/util/math/random/OpenSimplexNoise.java b/src/projectzombie/util/math/random/OpenSimplexNoise.java similarity index 99% rename from src/catalystsurvival/util/math/random/OpenSimplexNoise.java rename to src/projectzombie/util/math/random/OpenSimplexNoise.java index 87032e3..d2bec77 100644 --- a/src/catalystsurvival/util/math/random/OpenSimplexNoise.java +++ b/src/projectzombie/util/math/random/OpenSimplexNoise.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.math.random; +package projectzombie.util.math.random; /* * OpenSimplex Noise in Java. diff --git a/src/catalystsurvival/util/math/random/RandomHelpers.java b/src/projectzombie/util/math/random/RandomHelpers.java similarity index 86% rename from src/catalystsurvival/util/math/random/RandomHelpers.java rename to src/projectzombie/util/math/random/RandomHelpers.java index bbc5585..ec9ddcb 100644 --- a/src/catalystsurvival/util/math/random/RandomHelpers.java +++ b/src/projectzombie/util/math/random/RandomHelpers.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.math.random; +package projectzombie.util.math.random; import java.util.Random; diff --git a/src/catalystsurvival/util/math/range/Range2i.java b/src/projectzombie/util/math/range/Range2i.java similarity index 75% rename from src/catalystsurvival/util/math/range/Range2i.java rename to src/projectzombie/util/math/range/Range2i.java index b33887b..4790730 100644 --- a/src/catalystsurvival/util/math/range/Range2i.java +++ b/src/projectzombie/util/math/range/Range2i.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.math.range; +package projectzombie.util.math.range; public class Range2i { diff --git a/src/catalystsurvival/util/math/range/Range3i.java b/src/projectzombie/util/math/range/Range3i.java similarity index 80% rename from src/catalystsurvival/util/math/range/Range3i.java rename to src/projectzombie/util/math/range/Range3i.java index 4c4cac4..aea0fdc 100644 --- a/src/catalystsurvival/util/math/range/Range3i.java +++ b/src/projectzombie/util/math/range/Range3i.java @@ -1,4 +1,4 @@ -package catalystsurvival.util.math.range; +package projectzombie.util.math.range; public class Range3i { diff --git a/src/catalystsurvival/util/math/vec/Vec2d.java b/src/projectzombie/util/math/vec/Vec2d.java similarity index 92% rename from src/catalystsurvival/util/math/vec/Vec2d.java rename to src/projectzombie/util/math/vec/Vec2d.java index 4419ac6..bebdbcb 100644 --- a/src/catalystsurvival/util/math/vec/Vec2d.java +++ b/src/projectzombie/util/math/vec/Vec2d.java @@ -1,6 +1,6 @@ -package catalystsurvival.util.math.vec; +package projectzombie.util.math.vec; -import catalystsurvival.util.math.MathHelpers; +import projectzombie.util.math.MathHelpers; public class Vec2d { diff --git a/src/catalystsurvival/util/math/vec/Vec2i.java b/src/projectzombie/util/math/vec/Vec2i.java similarity index 91% rename from src/catalystsurvival/util/math/vec/Vec2i.java rename to src/projectzombie/util/math/vec/Vec2i.java index f675479..62e3ab9 100644 --- a/src/catalystsurvival/util/math/vec/Vec2i.java +++ b/src/projectzombie/util/math/vec/Vec2i.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.math.vec; +package projectzombie.util.math.vec; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.range.Range2i; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.range.Range2i; public class Vec2i { diff --git a/src/catalystsurvival/util/math/vec/Vec3d.java b/src/projectzombie/util/math/vec/Vec3d.java similarity index 93% rename from src/catalystsurvival/util/math/vec/Vec3d.java rename to src/projectzombie/util/math/vec/Vec3d.java index b94e71c..c2dd58e 100644 --- a/src/catalystsurvival/util/math/vec/Vec3d.java +++ b/src/projectzombie/util/math/vec/Vec3d.java @@ -1,6 +1,6 @@ -package catalystsurvival.util.math.vec; +package projectzombie.util.math.vec; -import catalystsurvival.util.math.MathHelpers; +import projectzombie.util.math.MathHelpers; public class Vec3d { diff --git a/src/catalystsurvival/util/math/vec/Vec3i.java b/src/projectzombie/util/math/vec/Vec3i.java similarity index 92% rename from src/catalystsurvival/util/math/vec/Vec3i.java rename to src/projectzombie/util/math/vec/Vec3i.java index 7f78cd4..b1eca5c 100644 --- a/src/catalystsurvival/util/math/vec/Vec3i.java +++ b/src/projectzombie/util/math/vec/Vec3i.java @@ -1,7 +1,7 @@ -package catalystsurvival.util.math.vec; +package projectzombie.util.math.vec; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.range.Range3i; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.range.Range3i; public class Vec3i { diff --git a/src/catalystsurvival/world/World.java b/src/projectzombie/world/World.java similarity index 69% rename from src/catalystsurvival/world/World.java rename to src/projectzombie/world/World.java index c6532c8..099a0f7 100644 --- a/src/catalystsurvival/world/World.java +++ b/src/projectzombie/world/World.java @@ -1,8 +1,8 @@ -package catalystsurvival.world; +package projectzombie.world; -import catalystsurvival.display.Camera; -import catalystsurvival.world.chunk.ChunkEventHandler; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.world.chunk.ChunkEventHandler; +import projectzombie.world.layer.Layer; public class World { diff --git a/src/catalystsurvival/world/chunk/Chunk.java b/src/projectzombie/world/chunk/Chunk.java similarity index 92% rename from src/catalystsurvival/world/chunk/Chunk.java rename to src/projectzombie/world/chunk/Chunk.java index f84b40a..2440358 100644 --- a/src/catalystsurvival/world/chunk/Chunk.java +++ b/src/projectzombie/world/chunk/Chunk.java @@ -1,21 +1,21 @@ -package catalystsurvival.world.chunk; +package projectzombie.world.chunk; import java.util.ArrayList; import java.util.Random; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityAlive; -import catalystsurvival.entity.particle.ParticleBreak; -import catalystsurvival.init.Tiles; -import catalystsurvival.tiles.Tile; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.range.Range2i; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.layer.Layer; +import projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityAlive; +import projectzombie.entity.particle.ParticleBreak; +import projectzombie.init.Tiles; +import projectzombie.tiles.Tile; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.range.Range2i; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.layer.Layer; public class Chunk { diff --git a/src/catalystsurvival/world/chunk/ChunkEmpty.java b/src/projectzombie/world/chunk/ChunkEmpty.java similarity index 85% rename from src/catalystsurvival/world/chunk/ChunkEmpty.java rename to src/projectzombie/world/chunk/ChunkEmpty.java index c78a155..12f474e 100644 --- a/src/catalystsurvival/world/chunk/ChunkEmpty.java +++ b/src/projectzombie/world/chunk/ChunkEmpty.java @@ -1,12 +1,12 @@ -package catalystsurvival.world.chunk; +package projectzombie.world.chunk; import java.util.ArrayList; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.Entity; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; +import projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.util.math.TileState; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; public class ChunkEmpty extends Chunk { diff --git a/src/catalystsurvival/world/chunk/ChunkEventHandler.java b/src/projectzombie/world/chunk/ChunkEventHandler.java similarity index 88% rename from src/catalystsurvival/world/chunk/ChunkEventHandler.java rename to src/projectzombie/world/chunk/ChunkEventHandler.java index 3207c73..0132d55 100644 --- a/src/catalystsurvival/world/chunk/ChunkEventHandler.java +++ b/src/projectzombie/world/chunk/ChunkEventHandler.java @@ -1,10 +1,10 @@ -package catalystsurvival.world.chunk; +package projectzombie.world.chunk; -import catalystsurvival.Main; -import catalystsurvival.util.math.map.Map2DElement; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.layer.Layer; import mainloop.task.IMainloopTask; +import projectzombie.Main; +import projectzombie.util.math.map.Map2DElement; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.layer.Layer; public class ChunkEventHandler implements IMainloopTask { diff --git a/src/catalystsurvival/world/layer/Layer.java b/src/projectzombie/world/layer/Layer.java similarity index 90% rename from src/catalystsurvival/world/layer/Layer.java rename to src/projectzombie/world/layer/Layer.java index 6fdd165..c89ef1e 100644 --- a/src/catalystsurvival/world/layer/Layer.java +++ b/src/projectzombie/world/layer/Layer.java @@ -1,19 +1,19 @@ -package catalystsurvival.world.layer; +package projectzombie.world.layer; import java.util.ArrayList; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.display.Camera; -import catalystsurvival.entity.Entity; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.map.Map2D; -import catalystsurvival.util.math.map.Map2DElement; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.layergen.LayerGen; +import projectzombie.Main; +import projectzombie.display.Camera; +import projectzombie.entity.Entity; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.map.Map2D; +import projectzombie.util.math.map.Map2DElement; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.layergen.LayerGen; public class Layer { diff --git a/src/catalystsurvival/world/layer/layergen/LayerGen.java b/src/projectzombie/world/layer/layergen/LayerGen.java similarity index 63% rename from src/catalystsurvival/world/layer/layergen/LayerGen.java rename to src/projectzombie/world/layer/layergen/LayerGen.java index 71692a6..cc5ad78 100644 --- a/src/catalystsurvival/world/layer/layergen/LayerGen.java +++ b/src/projectzombie/world/layer/layergen/LayerGen.java @@ -1,12 +1,12 @@ -package catalystsurvival.world.layer.layergen; +package projectzombie.world.layer.layergen; import java.util.Random; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.map.IMap2D; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.util.math.TileState; +import projectzombie.util.math.map.IMap2D; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public abstract class LayerGen implements IMap2D { diff --git a/src/catalystsurvival/world/layer/layergen/LayerGenBossArena.java b/src/projectzombie/world/layer/layergen/LayerGenBossArena.java similarity index 82% rename from src/catalystsurvival/world/layer/layergen/LayerGenBossArena.java rename to src/projectzombie/world/layer/layergen/LayerGenBossArena.java index 5c4b146..d9b85eb 100644 --- a/src/catalystsurvival/world/layer/layergen/LayerGenBossArena.java +++ b/src/projectzombie/world/layer/layergen/LayerGenBossArena.java @@ -1,17 +1,17 @@ -package catalystsurvival.world.layer.layergen; +package projectzombie.world.layer.layergen; import java.util.Random; -import catalystsurvival.entity.EntityBoss; -import catalystsurvival.entity.player.EntityPlayer; -import catalystsurvival.init.Tiles; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.entity.EntityBoss; +import projectzombie.entity.player.EntityPlayer; +import projectzombie.init.Tiles; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class LayerGenBossArena extends LayerGen implements LayerGenRememberPlayerPos { diff --git a/src/catalystsurvival/world/layer/layergen/LayerGenCaves.java b/src/projectzombie/world/layer/layergen/LayerGenCaves.java similarity index 83% rename from src/catalystsurvival/world/layer/layergen/LayerGenCaves.java rename to src/projectzombie/world/layer/layergen/LayerGenCaves.java index 26046fb..66e8ffd 100644 --- a/src/catalystsurvival/world/layer/layergen/LayerGenCaves.java +++ b/src/projectzombie/world/layer/layergen/LayerGenCaves.java @@ -1,19 +1,19 @@ -package catalystsurvival.world.layer.layergen; +package projectzombie.world.layer.layergen; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityZombie; -import catalystsurvival.init.Tiles; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.OpenSimplexNoise; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityZombie; +import projectzombie.init.Tiles; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.OpenSimplexNoise; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class LayerGenCaves extends LayerGen { diff --git a/src/catalystsurvival/world/layer/layergen/LayerGenEarth.java b/src/projectzombie/world/layer/layergen/LayerGenEarth.java similarity index 80% rename from src/catalystsurvival/world/layer/layergen/LayerGenEarth.java rename to src/projectzombie/world/layer/layergen/LayerGenEarth.java index f8a5f77..b9b21b5 100644 --- a/src/catalystsurvival/world/layer/layergen/LayerGenEarth.java +++ b/src/projectzombie/world/layer/layergen/LayerGenEarth.java @@ -1,20 +1,20 @@ -package catalystsurvival.world.layer.layergen; +package projectzombie.world.layer.layergen; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityZombie; -import catalystsurvival.init.Tiles; -import catalystsurvival.time.GameTimer; -import catalystsurvival.util.math.MathHelpers; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.OpenSimplexNoise; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityZombie; +import projectzombie.init.Tiles; +import projectzombie.time.GameTimer; +import projectzombie.util.math.MathHelpers; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.OpenSimplexNoise; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class LayerGenEarth extends LayerGen { @@ -91,7 +91,7 @@ public class LayerGenEarth extends LayerGen @Override public double getLightLevel() { return MathHelpers.map( - Math.sin(GameTimer.getTime() / 100000.0) + Math.sin(GameTimer.getTime() / 7200) , -1, 1, 0, 0.8); } } diff --git a/src/catalystsurvival/world/layer/layergen/LayerGenLavaCaves.java b/src/projectzombie/world/layer/layergen/LayerGenLavaCaves.java similarity index 88% rename from src/catalystsurvival/world/layer/layergen/LayerGenLavaCaves.java rename to src/projectzombie/world/layer/layergen/LayerGenLavaCaves.java index 2f036a1..f9759ca 100644 --- a/src/catalystsurvival/world/layer/layergen/LayerGenLavaCaves.java +++ b/src/projectzombie/world/layer/layergen/LayerGenLavaCaves.java @@ -1,18 +1,18 @@ -package catalystsurvival.world.layer.layergen; +package projectzombie.world.layer.layergen; import java.util.Random; -import catalystsurvival.Main; -import catalystsurvival.entity.Entity; -import catalystsurvival.entity.EntityZombieArmored; -import catalystsurvival.init.Tiles; -import catalystsurvival.util.math.TileState; -import catalystsurvival.util.math.random.OpenSimplexNoise; -import catalystsurvival.util.math.random.RandomHelpers; -import catalystsurvival.util.math.vec.Vec2d; -import catalystsurvival.util.math.vec.Vec2i; -import catalystsurvival.world.chunk.Chunk; -import catalystsurvival.world.layer.Layer; +import projectzombie.Main; +import projectzombie.entity.Entity; +import projectzombie.entity.EntityZombieArmored; +import projectzombie.init.Tiles; +import projectzombie.util.math.TileState; +import projectzombie.util.math.random.OpenSimplexNoise; +import projectzombie.util.math.random.RandomHelpers; +import projectzombie.util.math.vec.Vec2d; +import projectzombie.util.math.vec.Vec2i; +import projectzombie.world.chunk.Chunk; +import projectzombie.world.layer.Layer; public class LayerGenLavaCaves extends LayerGen { diff --git a/src/projectzombie/world/layer/layergen/LayerGenRememberPlayerPos.java b/src/projectzombie/world/layer/layergen/LayerGenRememberPlayerPos.java new file mode 100644 index 0000000..0554058 --- /dev/null +++ b/src/projectzombie/world/layer/layergen/LayerGenRememberPlayerPos.java @@ -0,0 +1,10 @@ +package projectzombie.world.layer.layergen; + +import projectzombie.entity.player.EntityPlayer; +import projectzombie.util.math.vec.Vec2d; + +public interface LayerGenRememberPlayerPos +{ + public Vec2d getPlayerPos(); + public void spawnPlayer(EntityPlayer player); +} diff --git a/src/catalystsurvival/world/layer/layergen/PortalSpawnrates.java b/src/projectzombie/world/layer/layergen/PortalSpawnrates.java similarity index 78% rename from src/catalystsurvival/world/layer/layergen/PortalSpawnrates.java rename to src/projectzombie/world/layer/layergen/PortalSpawnrates.java index 9836667..f912c1c 100644 --- a/src/catalystsurvival/world/layer/layergen/PortalSpawnrates.java +++ b/src/projectzombie/world/layer/layergen/PortalSpawnrates.java @@ -1,8 +1,8 @@ -package catalystsurvival.world.layer.layergen; +package projectzombie.world.layer.layergen; import java.util.Random; -import catalystsurvival.util.math.random.RandomHelpers; +import projectzombie.util.math.random.RandomHelpers; class PortalSpawnrates {