From 25e4123d7a855a9287b095fca4a656d0019763f6 Mon Sep 17 00:00:00 2001 From: josua Date: Sat, 16 Nov 2019 16:16:14 +1100 Subject: [PATCH] Changed the games name from "ShooterGame" to "Catalyst Survival" --- .project | 2 +- .../Main.java | 44 +++++++++---------- .../audio/AudioEngine.java | 2 +- .../audio/AudioObject.java | 12 ++--- .../audio/AudioRandom.java | 4 +- .../audio/AudioSources.java | 2 +- .../cheats/Cheats.java | 2 +- .../display/Camera.java | 8 ++-- .../display/DisplayRender.java | 18 ++++---- .../display/DisplayRenderUI.java | 22 +++++----- .../display/DisplayStatsEventHandler.java | 4 +- .../display/DisplayWindow.java | 24 +++++----- .../display/bossbar/BossBars.java | 8 ++-- .../display/bossbar/IBossBar.java | 4 +- .../display/lighting/LightingManager.java | 22 +++++----- .../transparent/ITransparentObject.java | 8 ++-- .../transparent/TransparentObject.java | 10 ++--- .../transparent/TransparentObjects.java | 8 ++-- .../entity/Entity.java | 26 +++++------ .../entity/EntityAlive.java | 4 +- .../entity/EntityBoss.java | 38 ++++++++-------- .../entity/EntityBullet.java | 26 +++++------ .../entity/EntityDummy.java | 6 +-- .../entity/EntityEventHandler.java | 4 +- .../entity/EntityExplosion.java | 28 ++++++------ .../entity/EntityFlare.java | 12 ++--- .../entity/EntityGrapplingHook.java | 22 +++++----- .../entity/EntityHeight.java | 2 +- .../entity/EntityInventory.java | 8 ++++ .../entity/EntityItem.java | 18 ++++---- .../entity/EntityParticle.java | 14 +++--- .../entity/EntityTnt.java | 20 ++++----- .../entity/EntityVertical.java | 16 +++---- .../entity/EntityZombie.java | 14 +++--- .../entity/EntityZombieArmored.java | 10 ++--- .../entity/particle/ParticleBlood.java | 22 +++++----- .../entity/particle/ParticleBreak.java | 30 ++++++------- .../entity/particle/ParticleLava.java | 20 ++++----- .../entity/particle/ParticleSmoke.java | 20 ++++----- .../entity/particle/ParticleSpark.java | 14 +++--- .../entity/particle/ParticleWater.java | 22 +++++----- .../entity/player/EntityPlayer.java | 44 +++++++++---------- .../init/Entities.java | 4 +- .../init/Items.java | 22 +++++----- .../init/Layers.java | 14 +++--- .../init/Resources.java | 4 +- .../init/Sounds.java | 6 +-- .../init/Textures.java | 12 ++--- .../init/Tiles.java | 44 +++++++++---------- .../input/CursorEnterCallback.java | 2 +- .../input/CursorPosCallback.java | 4 +- .../input/GameInput.java | 2 +- .../input/JoystickCallback.java | 26 +++++------ .../input/KeyCallback.java | 20 ++++----- .../input/KeyCharCallback.java | 2 +- .../input/MouseButtonCallback.java | 4 +- .../input/ScrollWheelCallback.java | 4 +- .../input/types/Input.java | 2 +- .../input/types/InputDeath.java | 8 ++-- .../input/types/InputGame.java | 8 ++-- .../input/types/InputGamePause.java | 10 ++--- .../input/types/InputMenu.java | 2 +- .../inventory/IInventory.java | 4 +- .../inventory/Inventory.java | 4 +- .../items/Item.java | 20 ++++----- .../items/ItemAmmo.java | 14 +++--- .../items/ItemDefenceUpgrade.java | 14 +++--- .../items/ItemEmpty.java | 12 ++--- .../items/ItemFlare.java | 14 +++--- .../items/ItemGrapplingHook.java | 18 ++++---- .../items/ItemGunUpgrade.java | 14 +++--- .../items/ItemHealthPotion.java | 14 +++--- .../items/ItemLantern.java | 18 ++++---- .../items/ItemTnt.java | 14 +++--- .../mainloop/MainloopEventHandler.java | 4 +- .../menu/Menu.java | 4 +- .../menu/MenuDeath.java | 10 ++--- .../menu/MenuGame.java | 6 +-- .../menu/MenuGamePause.java | 10 ++--- .../menu/MenuMain.java | 4 +- .../menu/MenuRespawn.java | 18 ++++---- .../resources/Resource.java | 2 +- .../resources/ResourceDownload.java | 2 +- .../text/Text.java | 12 ++--- .../tiles/LightLevelNoise.java | 8 ++-- .../tiles/Tile.java | 20 ++++----- .../tiles/TileBossPortal.java | 24 +++++----- .../tiles/TileChest.java | 26 +++++------ .../tiles/TileDirt.java | 4 +- .../tiles/TileFire.java | 6 +-- .../tiles/TileFlat.java | 16 +++---- .../tiles/TileFlatFaded.java | 12 ++--- .../tiles/TileGrass.java | 4 +- .../tiles/TileLadder.java | 10 ++--- .../tiles/TileLadderUp.java | 24 +++++----- .../tiles/TileLantern.java | 20 ++++----- .../tiles/TileLava.java | 22 +++++----- .../tiles/TileLavaFlow.java | 22 +++++----- .../tiles/TilePortalDown.java | 22 +++++----- .../tiles/TileRock.java | 8 ++-- .../tiles/TileSand.java | 4 +- .../tiles/TileStone.java | 4 +- .../tiles/TileTree.java | 8 ++-- .../tiles/TileVertical.java | 16 +++---- .../tiles/TileVoid.java | 2 +- .../tiles/TileWall.java | 4 +- .../tiles/TileWallUnbreakable.java | 2 +- .../tiles/TileWater.java | 22 +++++----- .../tiles/TileWaterFlow.java | 12 ++--- .../time/GameTimer.java | 4 +- .../time/NoSleep.java | 2 +- .../util/gl/GlHelpers.java | 4 +- .../util/gl/VerticalRender.java | 8 ++-- .../gl/texture/AnimationEventHandler.java | 4 +- .../util/gl/texture/AnimationReference.java | 6 +-- .../util/gl/texture/IHasTexture.java | 2 +- .../util/gl/texture/Texture.java | 4 +- .../util/gl/texture/TextureMap.java | 4 +- .../util/gl/texture/TextureReference.java | 4 +- .../gl/texture/TextureReferenceEmpty.java | 2 +- .../gl/texture/TextureReferenceRandom.java | 4 +- .../util/math/ItemStack.java | 6 +-- .../util/math/MathHelpers.java | 6 +-- .../util/math/TileState.java | 6 +-- .../util/math/map/IMap2D.java | 8 ++++ .../util/math/map/Map2D.java | 4 +- .../util/math/map/Map2DElement.java | 4 +- .../util/math/random/OpenSimplexNoise.java | 2 +- .../util/math/random/RandomHelpers.java | 2 +- .../util/math/range/Range2i.java | 2 +- .../util/math/range/Range3i.java | 2 +- .../util/math/vec/Vec2d.java | 4 +- .../util/math/vec/Vec2i.java | 6 +-- .../util/math/vec/Vec3d.java | 4 +- .../util/math/vec/Vec3i.java | 6 +-- .../world/World.java | 8 ++-- .../world/chunk/Chunk.java | 28 ++++++------ .../world/chunk/ChunkEmpty.java | 12 ++--- .../world/chunk/ChunkEventHandler.java | 10 ++--- .../world/layer/Layer.java | 24 +++++----- .../world/layer/layergen/LayerGen.java | 12 ++--- .../layer/layergen/LayerGenBossArena.java | 22 +++++----- .../world/layer/layergen/LayerGenCaves.java | 26 +++++------ .../world/layer/layergen/LayerGenEarth.java | 28 ++++++------ .../layer/layergen/LayerGenLavaCaves.java | 24 +++++----- .../layergen/LayerGenRememberPlayerPos.java | 10 +++++ .../layer/layergen/PortalSpawnrates.java | 4 +- src/shootergame/entity/EntityInventory.java | 8 ---- src/shootergame/util/math/map/IMap2D.java | 8 ---- .../layergen/LayerGenRememberPlayerPos.java | 10 ----- 150 files changed, 871 insertions(+), 871 deletions(-) rename src/{shootergame => catalystsurvival}/Main.java (63%) rename src/{shootergame => catalystsurvival}/audio/AudioEngine.java (98%) rename src/{shootergame => catalystsurvival}/audio/AudioObject.java (91%) rename src/{shootergame => catalystsurvival}/audio/AudioRandom.java (86%) rename src/{shootergame => catalystsurvival}/audio/AudioSources.java (95%) rename src/{shootergame => catalystsurvival}/cheats/Cheats.java (87%) rename src/{shootergame => catalystsurvival}/display/Camera.java (74%) rename src/{shootergame => catalystsurvival}/display/DisplayRender.java (87%) rename src/{shootergame => catalystsurvival}/display/DisplayRenderUI.java (91%) rename src/{shootergame => catalystsurvival}/display/DisplayStatsEventHandler.java (86%) rename src/{shootergame => catalystsurvival}/display/DisplayWindow.java (86%) rename src/{shootergame => catalystsurvival}/display/bossbar/BossBars.java (88%) rename src/{shootergame => catalystsurvival}/display/bossbar/IBossBar.java (56%) rename src/{shootergame => catalystsurvival}/display/lighting/LightingManager.java (89%) rename src/{shootergame => catalystsurvival}/display/transparent/ITransparentObject.java (51%) rename src/{shootergame => catalystsurvival}/display/transparent/TransparentObject.java (64%) rename src/{shootergame => catalystsurvival}/display/transparent/TransparentObjects.java (87%) rename src/{shootergame => catalystsurvival}/entity/Entity.java (90%) rename src/{shootergame => catalystsurvival}/entity/EntityAlive.java (81%) rename src/{shootergame => catalystsurvival}/entity/EntityBoss.java (86%) rename src/{shootergame => catalystsurvival}/entity/EntityBullet.java (86%) rename src/{shootergame => catalystsurvival}/entity/EntityDummy.java (86%) rename src/{shootergame => catalystsurvival}/entity/EntityEventHandler.java (90%) rename src/{shootergame => catalystsurvival}/entity/EntityExplosion.java (79%) rename src/{shootergame => catalystsurvival}/entity/EntityFlare.java (66%) rename src/{shootergame => catalystsurvival}/entity/EntityGrapplingHook.java (76%) rename src/{shootergame => catalystsurvival}/entity/EntityHeight.java (75%) create mode 100644 src/catalystsurvival/entity/EntityInventory.java rename src/{shootergame => catalystsurvival}/entity/EntityItem.java (76%) rename src/{shootergame => catalystsurvival}/entity/EntityParticle.java (84%) rename src/{shootergame => catalystsurvival}/entity/EntityTnt.java (82%) rename src/{shootergame => catalystsurvival}/entity/EntityVertical.java (69%) rename src/{shootergame => catalystsurvival}/entity/EntityZombie.java (89%) rename src/{shootergame => catalystsurvival}/entity/EntityZombieArmored.java (68%) rename src/{shootergame => catalystsurvival}/entity/particle/ParticleBlood.java (76%) rename src/{shootergame => catalystsurvival}/entity/particle/ParticleBreak.java (71%) rename src/{shootergame => catalystsurvival}/entity/particle/ParticleLava.java (67%) rename src/{shootergame => catalystsurvival}/entity/particle/ParticleSmoke.java (70%) rename src/{shootergame => catalystsurvival}/entity/particle/ParticleSpark.java (69%) rename src/{shootergame => catalystsurvival}/entity/particle/ParticleWater.java (67%) rename src/{shootergame => catalystsurvival}/entity/player/EntityPlayer.java (84%) rename src/{shootergame => catalystsurvival}/init/Entities.java (65%) rename src/{shootergame => catalystsurvival}/init/Items.java (57%) rename src/{shootergame => catalystsurvival}/init/Layers.java (72%) rename src/{shootergame => catalystsurvival}/init/Resources.java (95%) rename src/{shootergame => catalystsurvival}/init/Sounds.java (93%) rename src/{shootergame => catalystsurvival}/init/Textures.java (96%) rename src/{shootergame => catalystsurvival}/init/Tiles.java (58%) rename src/{shootergame => catalystsurvival}/input/CursorEnterCallback.java (87%) rename src/{shootergame => catalystsurvival}/input/CursorPosCallback.java (91%) rename src/{shootergame => catalystsurvival}/input/GameInput.java (93%) rename src/{shootergame => catalystsurvival}/input/JoystickCallback.java (88%) rename src/{shootergame => catalystsurvival}/input/KeyCallback.java (87%) rename src/{shootergame => catalystsurvival}/input/KeyCharCallback.java (86%) rename src/{shootergame => catalystsurvival}/input/MouseButtonCallback.java (88%) rename src/{shootergame => catalystsurvival}/input/ScrollWheelCallback.java (83%) rename src/{shootergame => catalystsurvival}/input/types/Input.java (91%) rename src/{shootergame => catalystsurvival}/input/types/InputDeath.java (83%) rename src/{shootergame => catalystsurvival}/input/types/InputGame.java (87%) rename src/{shootergame => catalystsurvival}/input/types/InputGamePause.java (80%) rename src/{shootergame => catalystsurvival}/input/types/InputMenu.java (96%) rename src/{shootergame => catalystsurvival}/inventory/IInventory.java (69%) rename src/{shootergame => catalystsurvival}/inventory/Inventory.java (89%) rename src/{shootergame => catalystsurvival}/items/Item.java (79%) rename src/{shootergame => catalystsurvival}/items/ItemAmmo.java (63%) rename src/{shootergame => catalystsurvival}/items/ItemDefenceUpgrade.java (64%) rename src/{shootergame => catalystsurvival}/items/ItemEmpty.java (58%) rename src/{shootergame => catalystsurvival}/items/ItemFlare.java (59%) rename src/{shootergame => catalystsurvival}/items/ItemGrapplingHook.java (58%) rename src/{shootergame => catalystsurvival}/items/ItemGunUpgrade.java (63%) rename src/{shootergame => catalystsurvival}/items/ItemHealthPotion.java (67%) rename src/{shootergame => catalystsurvival}/items/ItemLantern.java (60%) rename src/{shootergame => catalystsurvival}/items/ItemTnt.java (60%) rename src/{shootergame => catalystsurvival}/mainloop/MainloopEventHandler.java (94%) rename src/{shootergame => catalystsurvival}/menu/Menu.java (73%) rename src/{shootergame => catalystsurvival}/menu/MenuDeath.java (83%) rename src/{shootergame => catalystsurvival}/menu/MenuGame.java (68%) rename src/{shootergame => catalystsurvival}/menu/MenuGamePause.java (82%) rename src/{shootergame => catalystsurvival}/menu/MenuMain.java (71%) rename src/{shootergame => catalystsurvival}/menu/MenuRespawn.java (74%) rename src/{shootergame => catalystsurvival}/resources/Resource.java (98%) rename src/{shootergame => catalystsurvival}/resources/ResourceDownload.java (97%) rename src/{shootergame => catalystsurvival}/text/Text.java (97%) rename src/{shootergame => catalystsurvival}/tiles/LightLevelNoise.java (85%) rename src/{shootergame => catalystsurvival}/tiles/Tile.java (75%) rename src/{shootergame => catalystsurvival}/tiles/TileBossPortal.java (75%) rename src/{shootergame => catalystsurvival}/tiles/TileChest.java (85%) rename src/{shootergame => catalystsurvival}/tiles/TileDirt.java (62%) rename src/{shootergame => catalystsurvival}/tiles/TileFire.java (61%) rename src/{shootergame => catalystsurvival}/tiles/TileFlat.java (74%) rename src/{shootergame => catalystsurvival}/tiles/TileFlatFaded.java (58%) rename src/{shootergame => catalystsurvival}/tiles/TileGrass.java (62%) rename src/{shootergame => catalystsurvival}/tiles/TileLadder.java (63%) rename src/{shootergame => catalystsurvival}/tiles/TileLadderUp.java (77%) rename src/{shootergame => catalystsurvival}/tiles/TileLantern.java (60%) rename src/{shootergame => catalystsurvival}/tiles/TileLava.java (69%) rename src/{shootergame => catalystsurvival}/tiles/TileLavaFlow.java (63%) rename src/{shootergame => catalystsurvival}/tiles/TilePortalDown.java (84%) rename src/{shootergame => catalystsurvival}/tiles/TileRock.java (66%) rename src/{shootergame => catalystsurvival}/tiles/TileSand.java (61%) rename src/{shootergame => catalystsurvival}/tiles/TileStone.java (63%) rename src/{shootergame => catalystsurvival}/tiles/TileTree.java (66%) rename src/{shootergame => catalystsurvival}/tiles/TileVertical.java (60%) rename src/{shootergame => catalystsurvival}/tiles/TileVoid.java (84%) rename src/{shootergame => catalystsurvival}/tiles/TileWall.java (76%) rename src/{shootergame => catalystsurvival}/tiles/TileWallUnbreakable.java (81%) rename src/{shootergame => catalystsurvival}/tiles/TileWater.java (58%) rename src/{shootergame => catalystsurvival}/tiles/TileWaterFlow.java (57%) rename src/{shootergame => catalystsurvival}/time/GameTimer.java (88%) rename src/{shootergame => catalystsurvival}/time/NoSleep.java (94%) rename src/{shootergame => catalystsurvival}/util/gl/GlHelpers.java (97%) rename src/{shootergame => catalystsurvival}/util/gl/VerticalRender.java (82%) rename src/{shootergame => catalystsurvival}/util/gl/texture/AnimationEventHandler.java (86%) rename src/{shootergame => catalystsurvival}/util/gl/texture/AnimationReference.java (86%) rename src/{shootergame => catalystsurvival}/util/gl/texture/IHasTexture.java (63%) rename src/{shootergame => catalystsurvival}/util/gl/texture/Texture.java (92%) rename src/{shootergame => catalystsurvival}/util/gl/texture/TextureMap.java (95%) rename src/{shootergame => catalystsurvival}/util/gl/texture/TextureReference.java (93%) rename src/{shootergame => catalystsurvival}/util/gl/texture/TextureReferenceEmpty.java (87%) rename src/{shootergame => catalystsurvival}/util/gl/texture/TextureReferenceRandom.java (78%) rename src/{shootergame => catalystsurvival}/util/math/ItemStack.java (85%) rename src/{shootergame => catalystsurvival}/util/math/MathHelpers.java (95%) rename src/{shootergame => catalystsurvival}/util/math/TileState.java (85%) create mode 100644 src/catalystsurvival/util/math/map/IMap2D.java rename src/{shootergame => catalystsurvival}/util/math/map/Map2D.java (96%) rename src/{shootergame => catalystsurvival}/util/math/map/Map2DElement.java (67%) rename src/{shootergame => catalystsurvival}/util/math/random/OpenSimplexNoise.java (99%) rename src/{shootergame => catalystsurvival}/util/math/random/RandomHelpers.java (86%) rename src/{shootergame => catalystsurvival}/util/math/range/Range2i.java (75%) rename src/{shootergame => catalystsurvival}/util/math/range/Range3i.java (80%) rename src/{shootergame => catalystsurvival}/util/math/vec/Vec2d.java (92%) rename src/{shootergame => catalystsurvival}/util/math/vec/Vec2i.java (91%) rename src/{shootergame => catalystsurvival}/util/math/vec/Vec3d.java (93%) rename src/{shootergame => catalystsurvival}/util/math/vec/Vec3i.java (92%) rename src/{shootergame => catalystsurvival}/world/World.java (69%) rename src/{shootergame => catalystsurvival}/world/chunk/Chunk.java (92%) rename src/{shootergame => catalystsurvival}/world/chunk/ChunkEmpty.java (85%) rename src/{shootergame => catalystsurvival}/world/chunk/ChunkEventHandler.java (88%) rename src/{shootergame => catalystsurvival}/world/layer/Layer.java (90%) rename src/{shootergame => catalystsurvival}/world/layer/layergen/LayerGen.java (63%) rename src/{shootergame => catalystsurvival}/world/layer/layergen/LayerGenBossArena.java (82%) rename src/{shootergame => catalystsurvival}/world/layer/layergen/LayerGenCaves.java (83%) rename src/{shootergame => catalystsurvival}/world/layer/layergen/LayerGenEarth.java (81%) rename src/{shootergame => catalystsurvival}/world/layer/layergen/LayerGenLavaCaves.java (88%) create mode 100644 src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java rename src/{shootergame => catalystsurvival}/world/layer/layergen/PortalSpawnrates.java (78%) delete mode 100644 src/shootergame/entity/EntityInventory.java delete mode 100644 src/shootergame/util/math/map/IMap2D.java delete mode 100644 src/shootergame/world/layer/layergen/LayerGenRememberPlayerPos.java diff --git a/.project b/.project index b64f5ea..b266648 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - ShooterGame + CatalystSurvival diff --git a/src/shootergame/Main.java b/src/catalystsurvival/Main.java similarity index 63% rename from src/shootergame/Main.java rename to src/catalystsurvival/Main.java index 91b8b1c..b7fc08a 100644 --- a/src/shootergame/Main.java +++ b/src/catalystsurvival/Main.java @@ -1,29 +1,29 @@ -package shootergame; +package catalystsurvival; 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 shootergame.audio.AudioEngine; -import shootergame.audio.AudioSources; -import shootergame.cheats.Cheats; -import shootergame.display.DisplayStatsEventHandler; -import shootergame.display.DisplayWindow; -import shootergame.entity.EntityEventHandler; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Layers; -import shootergame.init.Resources; -import shootergame.init.Sounds; -import shootergame.init.Textures; -import shootergame.input.JoystickCallback; -import shootergame.input.KeyCallback; -import shootergame.mainloop.MainloopEventHandler; -import shootergame.menu.Menu; -import shootergame.menu.MenuGame; -import shootergame.tiles.LightLevelNoise; -import shootergame.time.GameTimer; -import shootergame.time.NoSleep; -import shootergame.world.World; -import shootergame.world.chunk.ChunkEventHandler; public class Main { diff --git a/src/shootergame/audio/AudioEngine.java b/src/catalystsurvival/audio/AudioEngine.java similarity index 98% rename from src/shootergame/audio/AudioEngine.java rename to src/catalystsurvival/audio/AudioEngine.java index 33ced5b..74de252 100644 --- a/src/shootergame/audio/AudioEngine.java +++ b/src/catalystsurvival/audio/AudioEngine.java @@ -1,4 +1,4 @@ -package shootergame.audio; +package catalystsurvival.audio; import static org.lwjgl.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER; import static org.lwjgl.openal.ALC10.alcCloseDevice; diff --git a/src/shootergame/audio/AudioObject.java b/src/catalystsurvival/audio/AudioObject.java similarity index 91% rename from src/shootergame/audio/AudioObject.java rename to src/catalystsurvival/audio/AudioObject.java index 9c953cb..f03af40 100644 --- a/src/shootergame/audio/AudioObject.java +++ b/src/catalystsurvival/audio/AudioObject.java @@ -1,4 +1,4 @@ -package shootergame.audio; +package catalystsurvival.audio; import static org.lwjgl.openal.AL10.AL_BUFFER; import static org.lwjgl.openal.AL10.AL_FORMAT_MONO16; @@ -20,11 +20,11 @@ import java.nio.ShortBuffer; import org.lwjgl.stb.STBVorbis; import org.lwjgl.system.MemoryStack; -import shootergame.Main; -import shootergame.resources.Resource; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +import catalystsurvival.Main; +import catalystsurvival.resources.Resource; +import catalystsurvival.util.math.MathHelpers; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec3d; public class AudioObject { diff --git a/src/shootergame/audio/AudioRandom.java b/src/catalystsurvival/audio/AudioRandom.java similarity index 86% rename from src/shootergame/audio/AudioRandom.java rename to src/catalystsurvival/audio/AudioRandom.java index c12dae1..4997a0a 100644 --- a/src/shootergame/audio/AudioRandom.java +++ b/src/catalystsurvival/audio/AudioRandom.java @@ -1,8 +1,8 @@ -package shootergame.audio; +package catalystsurvival.audio; import java.util.Random; -import shootergame.util.math.vec.Vec3d; +import catalystsurvival.util.math.vec.Vec3d; public class AudioRandom extends AudioObject { diff --git a/src/shootergame/audio/AudioSources.java b/src/catalystsurvival/audio/AudioSources.java similarity index 95% rename from src/shootergame/audio/AudioSources.java rename to src/catalystsurvival/audio/AudioSources.java index 14ab16f..62254f1 100644 --- a/src/shootergame/audio/AudioSources.java +++ b/src/catalystsurvival/audio/AudioSources.java @@ -1,4 +1,4 @@ -package shootergame.audio; +package catalystsurvival.audio; import static org.lwjgl.openal.AL10.alGenSources; diff --git a/src/shootergame/cheats/Cheats.java b/src/catalystsurvival/cheats/Cheats.java similarity index 87% rename from src/shootergame/cheats/Cheats.java rename to src/catalystsurvival/cheats/Cheats.java index 01ea41f..6389eb6 100644 --- a/src/shootergame/cheats/Cheats.java +++ b/src/catalystsurvival/cheats/Cheats.java @@ -1,4 +1,4 @@ -package shootergame.cheats; +package catalystsurvival.cheats; public class Cheats { diff --git a/src/shootergame/display/Camera.java b/src/catalystsurvival/display/Camera.java similarity index 74% rename from src/shootergame/display/Camera.java rename to src/catalystsurvival/display/Camera.java index 590d9ad..b2b8648 100644 --- a/src/shootergame/display/Camera.java +++ b/src/catalystsurvival/display/Camera.java @@ -1,8 +1,8 @@ -package shootergame.display; +package catalystsurvival.display; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +import catalystsurvival.util.math.MathHelpers; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec3d; public class Camera { diff --git a/src/shootergame/display/DisplayRender.java b/src/catalystsurvival/display/DisplayRender.java similarity index 87% rename from src/shootergame/display/DisplayRender.java rename to src/catalystsurvival/display/DisplayRender.java index 7c38cae..8cdd7c8 100644 --- a/src/shootergame/display/DisplayRender.java +++ b/src/catalystsurvival/display/DisplayRender.java @@ -1,4 +1,4 @@ -package shootergame.display; +package catalystsurvival.display; import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; @@ -15,14 +15,14 @@ import org.joml.Matrix4f; import org.lwjgl.opengl.GL; import org.lwjgl.system.MemoryStack; -import shootergame.Main; -import shootergame.display.lighting.LightingManager; -import shootergame.display.transparent.TransparentObjects; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +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; public class DisplayRender { diff --git a/src/shootergame/display/DisplayRenderUI.java b/src/catalystsurvival/display/DisplayRenderUI.java similarity index 91% rename from src/shootergame/display/DisplayRenderUI.java rename to src/catalystsurvival/display/DisplayRenderUI.java index 14bf590..47e1c21 100644 --- a/src/shootergame/display/DisplayRenderUI.java +++ b/src/catalystsurvival/display/DisplayRenderUI.java @@ -1,15 +1,15 @@ -package shootergame.display; +package catalystsurvival.display; -import shootergame.Main; -import shootergame.display.bossbar.BossBars; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Textures; -import shootergame.inventory.Inventory; -import shootergame.text.Text; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.ItemStack; -import shootergame.util.math.vec.Vec2d; +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; public class DisplayRenderUI { diff --git a/src/shootergame/display/DisplayStatsEventHandler.java b/src/catalystsurvival/display/DisplayStatsEventHandler.java similarity index 86% rename from src/shootergame/display/DisplayStatsEventHandler.java rename to src/catalystsurvival/display/DisplayStatsEventHandler.java index b361d52..413dd0b 100644 --- a/src/shootergame/display/DisplayStatsEventHandler.java +++ b/src/catalystsurvival/display/DisplayStatsEventHandler.java @@ -1,7 +1,7 @@ -package shootergame.display; +package catalystsurvival.display; +import catalystsurvival.mainloop.MainloopEventHandler; import mainloop.task.IMainloopTask; -import shootergame.mainloop.MainloopEventHandler; public class DisplayStatsEventHandler implements IMainloopTask { diff --git a/src/shootergame/display/DisplayWindow.java b/src/catalystsurvival/display/DisplayWindow.java similarity index 86% rename from src/shootergame/display/DisplayWindow.java rename to src/catalystsurvival/display/DisplayWindow.java index 019d3e5..f98663c 100644 --- a/src/shootergame/display/DisplayWindow.java +++ b/src/catalystsurvival/display/DisplayWindow.java @@ -1,22 +1,22 @@ -package shootergame.display; +package catalystsurvival.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 shootergame.Main; -import shootergame.input.CursorEnterCallback; -import shootergame.input.CursorPosCallback; -import shootergame.input.JoystickCallback; -import shootergame.input.KeyCallback; -import shootergame.input.KeyCharCallback; -import shootergame.input.MouseButtonCallback; -import shootergame.input.ScrollWheelCallback; -import shootergame.mainloop.MainloopEventHandler; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.AnimationEventHandler; public class DisplayWindow implements IMainloopTask { diff --git a/src/shootergame/display/bossbar/BossBars.java b/src/catalystsurvival/display/bossbar/BossBars.java similarity index 88% rename from src/shootergame/display/bossbar/BossBars.java rename to src/catalystsurvival/display/bossbar/BossBars.java index 5698e2e..9b330ae 100644 --- a/src/shootergame/display/bossbar/BossBars.java +++ b/src/catalystsurvival/display/bossbar/BossBars.java @@ -1,10 +1,10 @@ -package shootergame.display.bossbar; +package catalystsurvival.display.bossbar; import java.util.ArrayList; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.TextureReference; +import catalystsurvival.init.Textures; +import catalystsurvival.util.gl.GlHelpers; +import catalystsurvival.util.gl.texture.TextureReference; public class BossBars { diff --git a/src/shootergame/display/bossbar/IBossBar.java b/src/catalystsurvival/display/bossbar/IBossBar.java similarity index 56% rename from src/shootergame/display/bossbar/IBossBar.java rename to src/catalystsurvival/display/bossbar/IBossBar.java index f61d8ca..29f53d5 100644 --- a/src/shootergame/display/bossbar/IBossBar.java +++ b/src/catalystsurvival/display/bossbar/IBossBar.java @@ -1,6 +1,6 @@ -package shootergame.display.bossbar; +package catalystsurvival.display.bossbar; -import shootergame.entity.EntityAlive; +import catalystsurvival.entity.EntityAlive; public interface IBossBar extends EntityAlive { diff --git a/src/shootergame/display/lighting/LightingManager.java b/src/catalystsurvival/display/lighting/LightingManager.java similarity index 89% rename from src/shootergame/display/lighting/LightingManager.java rename to src/catalystsurvival/display/lighting/LightingManager.java index d9e51f1..ea8bda6 100644 --- a/src/shootergame/display/lighting/LightingManager.java +++ b/src/catalystsurvival/display/lighting/LightingManager.java @@ -1,15 +1,15 @@ -package shootergame.display.lighting; +package catalystsurvival.display.lighting; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.entity.player.EntityPlayer; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.chunk.ChunkEventHandler; -import shootergame.world.layer.Layer; +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; public class LightingManager { diff --git a/src/shootergame/display/transparent/ITransparentObject.java b/src/catalystsurvival/display/transparent/ITransparentObject.java similarity index 51% rename from src/shootergame/display/transparent/ITransparentObject.java rename to src/catalystsurvival/display/transparent/ITransparentObject.java index 439f9f1..005348c 100644 --- a/src/shootergame/display/transparent/ITransparentObject.java +++ b/src/catalystsurvival/display/transparent/ITransparentObject.java @@ -1,8 +1,8 @@ -package shootergame.display.transparent; +package catalystsurvival.display.transparent; -import shootergame.display.Camera; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.display.Camera; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; public interface ITransparentObject { diff --git a/src/shootergame/display/transparent/TransparentObject.java b/src/catalystsurvival/display/transparent/TransparentObject.java similarity index 64% rename from src/shootergame/display/transparent/TransparentObject.java rename to src/catalystsurvival/display/transparent/TransparentObject.java index c845dd2..1f2d648 100644 --- a/src/shootergame/display/transparent/TransparentObject.java +++ b/src/catalystsurvival/display/transparent/TransparentObject.java @@ -1,9 +1,9 @@ -package shootergame.display.transparent; +package catalystsurvival.display.transparent; -import shootergame.display.Camera; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +import catalystsurvival.display.Camera; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec3d; class TransparentObject { diff --git a/src/shootergame/display/transparent/TransparentObjects.java b/src/catalystsurvival/display/transparent/TransparentObjects.java similarity index 87% rename from src/shootergame/display/transparent/TransparentObjects.java rename to src/catalystsurvival/display/transparent/TransparentObjects.java index c4a9e88..df1e89a 100644 --- a/src/shootergame/display/transparent/TransparentObjects.java +++ b/src/catalystsurvival/display/transparent/TransparentObjects.java @@ -1,8 +1,8 @@ -package shootergame.display.transparent; +package catalystsurvival.display.transparent; -import shootergame.display.Camera; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.display.Camera; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; public class TransparentObjects { diff --git a/src/shootergame/entity/Entity.java b/src/catalystsurvival/entity/Entity.java similarity index 90% rename from src/shootergame/entity/Entity.java rename to src/catalystsurvival/entity/Entity.java index 2fee3ee..cf2353a 100644 --- a/src/shootergame/entity/Entity.java +++ b/src/catalystsurvival/entity/Entity.java @@ -1,20 +1,20 @@ -package shootergame.entity; +package catalystsurvival.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 shootergame.Main; -import shootergame.display.Camera; -import shootergame.display.transparent.ITransparentObject; -import shootergame.display.transparent.TransparentObjects; -import shootergame.init.Entities; -import shootergame.tiles.Tile; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; public class Entity implements ITransparentObject { diff --git a/src/shootergame/entity/EntityAlive.java b/src/catalystsurvival/entity/EntityAlive.java similarity index 81% rename from src/shootergame/entity/EntityAlive.java rename to src/catalystsurvival/entity/EntityAlive.java index 4ec531d..e76f7a7 100644 --- a/src/shootergame/entity/EntityAlive.java +++ b/src/catalystsurvival/entity/EntityAlive.java @@ -1,6 +1,6 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.world.layer.Layer; +import catalystsurvival.world.layer.Layer; public interface EntityAlive { diff --git a/src/shootergame/entity/EntityBoss.java b/src/catalystsurvival/entity/EntityBoss.java similarity index 86% rename from src/shootergame/entity/EntityBoss.java rename to src/catalystsurvival/entity/EntityBoss.java index fd3a43b..94c0ff6 100644 --- a/src/shootergame/entity/EntityBoss.java +++ b/src/catalystsurvival/entity/EntityBoss.java @@ -1,23 +1,23 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.display.bossbar.BossBars; -import shootergame.display.bossbar.IBossBar; -import shootergame.init.Items; -import shootergame.init.Textures; -import shootergame.init.Tiles; -import shootergame.time.GameTimer; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.ItemStack; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.random.OpenSimplexNoise; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityBoss extends EntityVertical implements IBossBar { diff --git a/src/shootergame/entity/EntityBullet.java b/src/catalystsurvival/entity/EntityBullet.java similarity index 86% rename from src/shootergame/entity/EntityBullet.java rename to src/catalystsurvival/entity/EntityBullet.java index 45a0e51..a1389f2 100644 --- a/src/shootergame/entity/EntityBullet.java +++ b/src/catalystsurvival/entity/EntityBullet.java @@ -1,17 +1,17 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.display.Camera; -import shootergame.entity.particle.ParticleBlood; -import shootergame.init.Sounds; -import shootergame.tiles.Tile; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityBullet extends EntityParticle { diff --git a/src/shootergame/entity/EntityDummy.java b/src/catalystsurvival/entity/EntityDummy.java similarity index 86% rename from src/shootergame/entity/EntityDummy.java rename to src/catalystsurvival/entity/EntityDummy.java index 00c6fb3..d776e2e 100644 --- a/src/shootergame/entity/EntityDummy.java +++ b/src/catalystsurvival/entity/EntityDummy.java @@ -1,7 +1,7 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.init.Textures; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.init.Textures; +import catalystsurvival.util.math.vec.Vec2d; public class EntityDummy extends EntityVertical implements EntityAlive { diff --git a/src/shootergame/entity/EntityEventHandler.java b/src/catalystsurvival/entity/EntityEventHandler.java similarity index 90% rename from src/shootergame/entity/EntityEventHandler.java rename to src/catalystsurvival/entity/EntityEventHandler.java index 31c096d..28cf6cb 100644 --- a/src/shootergame/entity/EntityEventHandler.java +++ b/src/catalystsurvival/entity/EntityEventHandler.java @@ -1,7 +1,7 @@ -package shootergame.entity; +package catalystsurvival.entity; +import catalystsurvival.Main; import mainloop.task.IMainloopTask; -import shootergame.Main; public class EntityEventHandler implements IMainloopTask { diff --git a/src/shootergame/entity/EntityExplosion.java b/src/catalystsurvival/entity/EntityExplosion.java similarity index 79% rename from src/shootergame/entity/EntityExplosion.java rename to src/catalystsurvival/entity/EntityExplosion.java index 47ac652..ce7ef0b 100644 --- a/src/shootergame/entity/EntityExplosion.java +++ b/src/catalystsurvival/entity/EntityExplosion.java @@ -1,18 +1,18 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.Main; -import shootergame.entity.particle.ParticleBlood; -import shootergame.entity.particle.ParticleBreak; -import shootergame.entity.particle.ParticleSmoke; -import shootergame.init.Sounds; -import shootergame.init.Tiles; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityExplosion extends Entity { diff --git a/src/shootergame/entity/EntityFlare.java b/src/catalystsurvival/entity/EntityFlare.java similarity index 66% rename from src/shootergame/entity/EntityFlare.java rename to src/catalystsurvival/entity/EntityFlare.java index 4236e5d..dd2538f 100644 --- a/src/shootergame/entity/EntityFlare.java +++ b/src/catalystsurvival/entity/EntityFlare.java @@ -1,10 +1,10 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.display.Camera; -import shootergame.init.Textures; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.layer.Layer; +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; public class EntityFlare extends EntityTnt { diff --git a/src/shootergame/entity/EntityGrapplingHook.java b/src/catalystsurvival/entity/EntityGrapplingHook.java similarity index 76% rename from src/shootergame/entity/EntityGrapplingHook.java rename to src/catalystsurvival/entity/EntityGrapplingHook.java index 1a2e2f1..145eeb0 100644 --- a/src/shootergame/entity/EntityGrapplingHook.java +++ b/src/catalystsurvival/entity/EntityGrapplingHook.java @@ -1,15 +1,15 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Layers; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; -import shootergame.world.layer.layergen.LayerGenRememberPlayerPos; +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; public class EntityGrapplingHook extends EntityVertical { diff --git a/src/shootergame/entity/EntityHeight.java b/src/catalystsurvival/entity/EntityHeight.java similarity index 75% rename from src/shootergame/entity/EntityHeight.java rename to src/catalystsurvival/entity/EntityHeight.java index 5cfa23b..b6a6d4d 100644 --- a/src/shootergame/entity/EntityHeight.java +++ b/src/catalystsurvival/entity/EntityHeight.java @@ -1,4 +1,4 @@ -package shootergame.entity; +package catalystsurvival.entity; public interface EntityHeight { diff --git a/src/catalystsurvival/entity/EntityInventory.java b/src/catalystsurvival/entity/EntityInventory.java new file mode 100644 index 0000000..4061356 --- /dev/null +++ b/src/catalystsurvival/entity/EntityInventory.java @@ -0,0 +1,8 @@ +package catalystsurvival.entity; + +import catalystsurvival.inventory.Inventory; + +public interface EntityInventory +{ + public Inventory getInventory(); +} diff --git a/src/shootergame/entity/EntityItem.java b/src/catalystsurvival/entity/EntityItem.java similarity index 76% rename from src/shootergame/entity/EntityItem.java rename to src/catalystsurvival/entity/EntityItem.java index cb67d19..89505ea 100644 --- a/src/shootergame/entity/EntityItem.java +++ b/src/catalystsurvival/entity/EntityItem.java @@ -1,13 +1,13 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.display.Camera; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.ItemStack; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityItem extends EntityVertical { diff --git a/src/shootergame/entity/EntityParticle.java b/src/catalystsurvival/entity/EntityParticle.java similarity index 84% rename from src/shootergame/entity/EntityParticle.java rename to src/catalystsurvival/entity/EntityParticle.java index 934ec8a..a374824 100644 --- a/src/shootergame/entity/EntityParticle.java +++ b/src/catalystsurvival/entity/EntityParticle.java @@ -1,11 +1,11 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityParticle extends Entity { diff --git a/src/shootergame/entity/EntityTnt.java b/src/catalystsurvival/entity/EntityTnt.java similarity index 82% rename from src/shootergame/entity/EntityTnt.java rename to src/catalystsurvival/entity/EntityTnt.java index 2d40678..77de24e 100644 --- a/src/shootergame/entity/EntityTnt.java +++ b/src/catalystsurvival/entity/EntityTnt.java @@ -1,14 +1,14 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.display.Camera; -import shootergame.entity.particle.ParticleSpark; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityTnt extends EntityVertical { diff --git a/src/shootergame/entity/EntityVertical.java b/src/catalystsurvival/entity/EntityVertical.java similarity index 69% rename from src/shootergame/entity/EntityVertical.java rename to src/catalystsurvival/entity/EntityVertical.java index 60c81ab..a3bc7be 100644 --- a/src/shootergame/entity/EntityVertical.java +++ b/src/catalystsurvival/entity/EntityVertical.java @@ -1,12 +1,12 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.display.Camera; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.VerticalRender; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; +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; public class EntityVertical extends Entity { diff --git a/src/shootergame/entity/EntityZombie.java b/src/catalystsurvival/entity/EntityZombie.java similarity index 89% rename from src/shootergame/entity/EntityZombie.java rename to src/catalystsurvival/entity/EntityZombie.java index a703c2f..9a28ab5 100644 --- a/src/shootergame/entity/EntityZombie.java +++ b/src/catalystsurvival/entity/EntityZombie.java @@ -1,11 +1,11 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.Main; -import shootergame.init.Textures; -import shootergame.util.math.random.OpenSimplexNoise; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class EntityZombie extends EntityVertical implements EntityAlive { diff --git a/src/shootergame/entity/EntityZombieArmored.java b/src/catalystsurvival/entity/EntityZombieArmored.java similarity index 68% rename from src/shootergame/entity/EntityZombieArmored.java rename to src/catalystsurvival/entity/EntityZombieArmored.java index 889b077..a577c72 100644 --- a/src/shootergame/entity/EntityZombieArmored.java +++ b/src/catalystsurvival/entity/EntityZombieArmored.java @@ -1,9 +1,9 @@ -package shootergame.entity; +package catalystsurvival.entity; -import shootergame.display.Camera; -import shootergame.init.Textures; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.display.Camera; +import catalystsurvival.init.Textures; +import catalystsurvival.util.gl.texture.TextureReference; +import catalystsurvival.util.math.vec.Vec2d; public class EntityZombieArmored extends EntityZombie { diff --git a/src/shootergame/entity/particle/ParticleBlood.java b/src/catalystsurvival/entity/particle/ParticleBlood.java similarity index 76% rename from src/shootergame/entity/particle/ParticleBlood.java rename to src/catalystsurvival/entity/particle/ParticleBlood.java index b56a6ca..a9e5373 100644 --- a/src/shootergame/entity/particle/ParticleBlood.java +++ b/src/catalystsurvival/entity/particle/ParticleBlood.java @@ -1,17 +1,17 @@ -package shootergame.entity.particle; +package catalystsurvival.entity.particle; import java.util.Random; -import shootergame.display.Camera; -import shootergame.entity.EntityParticle; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ParticleBlood extends EntityParticle { diff --git a/src/shootergame/entity/particle/ParticleBreak.java b/src/catalystsurvival/entity/particle/ParticleBreak.java similarity index 71% rename from src/shootergame/entity/particle/ParticleBreak.java rename to src/catalystsurvival/entity/particle/ParticleBreak.java index d6595cd..961a1de 100644 --- a/src/shootergame/entity/particle/ParticleBreak.java +++ b/src/catalystsurvival/entity/particle/ParticleBreak.java @@ -1,19 +1,19 @@ -package shootergame.entity.particle; +package catalystsurvival.entity.particle; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.entity.EntityVertical; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.IHasTexture; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ParticleBreak extends EntityVertical { diff --git a/src/shootergame/entity/particle/ParticleLava.java b/src/catalystsurvival/entity/particle/ParticleLava.java similarity index 67% rename from src/shootergame/entity/particle/ParticleLava.java rename to src/catalystsurvival/entity/particle/ParticleLava.java index 43ad26e..e7c791a 100644 --- a/src/shootergame/entity/particle/ParticleLava.java +++ b/src/catalystsurvival/entity/particle/ParticleLava.java @@ -1,16 +1,16 @@ -package shootergame.entity.particle; +package catalystsurvival.entity.particle; import java.util.Random; -import shootergame.display.Camera; -import shootergame.entity.EntityParticle; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ParticleLava extends EntityParticle { diff --git a/src/shootergame/entity/particle/ParticleSmoke.java b/src/catalystsurvival/entity/particle/ParticleSmoke.java similarity index 70% rename from src/shootergame/entity/particle/ParticleSmoke.java rename to src/catalystsurvival/entity/particle/ParticleSmoke.java index 34ae793..bd48327 100644 --- a/src/shootergame/entity/particle/ParticleSmoke.java +++ b/src/catalystsurvival/entity/particle/ParticleSmoke.java @@ -1,14 +1,14 @@ -package shootergame.entity.particle; +package catalystsurvival.entity.particle; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.entity.EntityVertical; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ParticleSmoke extends EntityVertical { diff --git a/src/shootergame/entity/particle/ParticleSpark.java b/src/catalystsurvival/entity/particle/ParticleSpark.java similarity index 69% rename from src/shootergame/entity/particle/ParticleSpark.java rename to src/catalystsurvival/entity/particle/ParticleSpark.java index e8c1991..4904c26 100644 --- a/src/shootergame/entity/particle/ParticleSpark.java +++ b/src/catalystsurvival/entity/particle/ParticleSpark.java @@ -1,11 +1,11 @@ -package shootergame.entity.particle; +package catalystsurvival.entity.particle; -import shootergame.display.Camera; -import shootergame.entity.EntityParticle; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ParticleSpark extends EntityParticle { diff --git a/src/shootergame/entity/particle/ParticleWater.java b/src/catalystsurvival/entity/particle/ParticleWater.java similarity index 67% rename from src/shootergame/entity/particle/ParticleWater.java rename to src/catalystsurvival/entity/particle/ParticleWater.java index 2da5908..51ce492 100644 --- a/src/shootergame/entity/particle/ParticleWater.java +++ b/src/catalystsurvival/entity/particle/ParticleWater.java @@ -1,15 +1,15 @@ -package shootergame.entity.particle; +package catalystsurvival.entity.particle; -import shootergame.display.Camera; -import shootergame.entity.EntityParticle; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.util.math.vec.Vec3d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ParticleWater extends EntityParticle { diff --git a/src/shootergame/entity/player/EntityPlayer.java b/src/catalystsurvival/entity/player/EntityPlayer.java similarity index 84% rename from src/shootergame/entity/player/EntityPlayer.java rename to src/catalystsurvival/entity/player/EntityPlayer.java index 2406fc6..fae5e52 100644 --- a/src/shootergame/entity/player/EntityPlayer.java +++ b/src/catalystsurvival/entity/player/EntityPlayer.java @@ -1,27 +1,27 @@ -package shootergame.entity.player; +package catalystsurvival.entity.player; +import catalystsurvival.Main; +import catalystsurvival.cheats.Cheats; +import catalystsurvival.display.Camera; +import catalystsurvival.entity.Entity; +import catalystsurvival.entity.EntityAlive; +import catalystsurvival.entity.EntityBullet; +import catalystsurvival.entity.EntityHeight; +import catalystsurvival.entity.EntityInventory; +import catalystsurvival.entity.EntityItem; +import catalystsurvival.entity.EntityVertical; +import catalystsurvival.init.Textures; +import catalystsurvival.inventory.Inventory; +import catalystsurvival.menu.MenuDeath; +import catalystsurvival.util.gl.GlHelpers; +import catalystsurvival.util.gl.texture.TextureReference; +import catalystsurvival.util.math.ItemStack; +import catalystsurvival.util.math.MathHelpers; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec2i; +import catalystsurvival.world.chunk.Chunk; +import catalystsurvival.world.layer.Layer; import mainloop.task.IMainloopTask; -import shootergame.Main; -import shootergame.cheats.Cheats; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.entity.EntityAlive; -import shootergame.entity.EntityBullet; -import shootergame.entity.EntityHeight; -import shootergame.entity.EntityInventory; -import shootergame.entity.EntityItem; -import shootergame.entity.EntityVertical; -import shootergame.init.Textures; -import shootergame.inventory.Inventory; -import shootergame.menu.MenuDeath; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.ItemStack; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; public class EntityPlayer extends EntityVertical implements EntityAlive, EntityInventory, EntityHeight { diff --git a/src/shootergame/init/Entities.java b/src/catalystsurvival/init/Entities.java similarity index 65% rename from src/shootergame/init/Entities.java rename to src/catalystsurvival/init/Entities.java index 68b11d4..889f232 100644 --- a/src/shootergame/init/Entities.java +++ b/src/catalystsurvival/init/Entities.java @@ -1,8 +1,8 @@ -package shootergame.init; +package catalystsurvival.init; import java.util.ArrayList; -import shootergame.entity.Entity; +import catalystsurvival.entity.Entity; public class Entities { diff --git a/src/shootergame/init/Items.java b/src/catalystsurvival/init/Items.java similarity index 57% rename from src/shootergame/init/Items.java rename to src/catalystsurvival/init/Items.java index f852aa0..02aef31 100644 --- a/src/shootergame/init/Items.java +++ b/src/catalystsurvival/init/Items.java @@ -1,15 +1,15 @@ -package shootergame.init; +package catalystsurvival.init; -import shootergame.items.Item; -import shootergame.items.ItemAmmo; -import shootergame.items.ItemDefenceUpgrade; -import shootergame.items.ItemEmpty; -import shootergame.items.ItemFlare; -import shootergame.items.ItemGrapplingHook; -import shootergame.items.ItemGunUpgrade; -import shootergame.items.ItemHealthPotion; -import shootergame.items.ItemLantern; -import shootergame.items.ItemTnt; +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; public class Items { diff --git a/src/shootergame/init/Layers.java b/src/catalystsurvival/init/Layers.java similarity index 72% rename from src/shootergame/init/Layers.java rename to src/catalystsurvival/init/Layers.java index 589e9e5..36e67e3 100644 --- a/src/shootergame/init/Layers.java +++ b/src/catalystsurvival/init/Layers.java @@ -1,14 +1,14 @@ -package shootergame.init; +package catalystsurvival.init; import java.util.ArrayList; import java.util.Random; -import shootergame.Main; -import shootergame.world.World; -import shootergame.world.layer.Layer; -import shootergame.world.layer.layergen.LayerGenCaves; -import shootergame.world.layer.layergen.LayerGenEarth; -import shootergame.world.layer.layergen.LayerGenLavaCaves; +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; public class Layers { diff --git a/src/shootergame/init/Resources.java b/src/catalystsurvival/init/Resources.java similarity index 95% rename from src/shootergame/init/Resources.java rename to src/catalystsurvival/init/Resources.java index 5c2d252..5ce92ea 100644 --- a/src/shootergame/init/Resources.java +++ b/src/catalystsurvival/init/Resources.java @@ -1,6 +1,6 @@ -package shootergame.init; +package catalystsurvival.init; -import shootergame.resources.Resource; +import catalystsurvival.resources.Resource; public class Resources { diff --git a/src/shootergame/init/Sounds.java b/src/catalystsurvival/init/Sounds.java similarity index 93% rename from src/shootergame/init/Sounds.java rename to src/catalystsurvival/init/Sounds.java index db55160..35fa3f2 100644 --- a/src/shootergame/init/Sounds.java +++ b/src/catalystsurvival/init/Sounds.java @@ -1,7 +1,7 @@ -package shootergame.init; +package catalystsurvival.init; -import shootergame.audio.AudioObject; -import shootergame.audio.AudioRandom; +import catalystsurvival.audio.AudioObject; +import catalystsurvival.audio.AudioRandom; public class Sounds { diff --git a/src/shootergame/init/Textures.java b/src/catalystsurvival/init/Textures.java similarity index 96% rename from src/shootergame/init/Textures.java rename to src/catalystsurvival/init/Textures.java index dc0a630..386b645 100644 --- a/src/shootergame/init/Textures.java +++ b/src/catalystsurvival/init/Textures.java @@ -1,14 +1,14 @@ -package shootergame.init; +package catalystsurvival.init; import java.util.ArrayList; import org.lwjgl.opengl.GL; -import shootergame.display.DisplayWindow; -import shootergame.util.gl.texture.AnimationReference; -import shootergame.util.gl.texture.TextureMap; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.gl.texture.TextureReferenceRandom; +import 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; public class Textures { diff --git a/src/shootergame/init/Tiles.java b/src/catalystsurvival/init/Tiles.java similarity index 58% rename from src/shootergame/init/Tiles.java rename to src/catalystsurvival/init/Tiles.java index 0e2313d..93ea79f 100644 --- a/src/shootergame/init/Tiles.java +++ b/src/catalystsurvival/init/Tiles.java @@ -1,26 +1,26 @@ -package shootergame.init; +package catalystsurvival.init; -import shootergame.tiles.Tile; -import shootergame.tiles.TileBossPortal; -import shootergame.tiles.TileChest; -import shootergame.tiles.TileDirt; -import shootergame.tiles.TileFire; -import shootergame.tiles.TileGrass; -import shootergame.tiles.TileLadder; -import shootergame.tiles.TileLadderUp; -import shootergame.tiles.TileLantern; -import shootergame.tiles.TileLava; -import shootergame.tiles.TileLavaFlow; -import shootergame.tiles.TilePortalDown; -import shootergame.tiles.TileRock; -import shootergame.tiles.TileSand; -import shootergame.tiles.TileStone; -import shootergame.tiles.TileTree; -import shootergame.tiles.TileVoid; -import shootergame.tiles.TileWall; -import shootergame.tiles.TileWallUnbreakable; -import shootergame.tiles.TileWater; -import shootergame.tiles.TileWaterFlow; +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; public class Tiles { diff --git a/src/shootergame/input/CursorEnterCallback.java b/src/catalystsurvival/input/CursorEnterCallback.java similarity index 87% rename from src/shootergame/input/CursorEnterCallback.java rename to src/catalystsurvival/input/CursorEnterCallback.java index e8449b3..7a3ee54 100644 --- a/src/shootergame/input/CursorEnterCallback.java +++ b/src/catalystsurvival/input/CursorEnterCallback.java @@ -1,4 +1,4 @@ -package shootergame.input; +package catalystsurvival.input; import org.lwjgl.glfw.GLFWCursorEnterCallbackI; diff --git a/src/shootergame/input/CursorPosCallback.java b/src/catalystsurvival/input/CursorPosCallback.java similarity index 91% rename from src/shootergame/input/CursorPosCallback.java rename to src/catalystsurvival/input/CursorPosCallback.java index 9e0257e..09f726f 100644 --- a/src/shootergame/input/CursorPosCallback.java +++ b/src/catalystsurvival/input/CursorPosCallback.java @@ -1,9 +1,9 @@ -package shootergame.input; +package catalystsurvival.input; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWCursorPosCallbackI; -import shootergame.Main; +import catalystsurvival.Main; public class CursorPosCallback implements GLFWCursorPosCallbackI { diff --git a/src/shootergame/input/GameInput.java b/src/catalystsurvival/input/GameInput.java similarity index 93% rename from src/shootergame/input/GameInput.java rename to src/catalystsurvival/input/GameInput.java index cc75fe6..66415e7 100644 --- a/src/shootergame/input/GameInput.java +++ b/src/catalystsurvival/input/GameInput.java @@ -1,4 +1,4 @@ -package shootergame.input; +package catalystsurvival.input; class GameInput { diff --git a/src/shootergame/input/JoystickCallback.java b/src/catalystsurvival/input/JoystickCallback.java similarity index 88% rename from src/shootergame/input/JoystickCallback.java rename to src/catalystsurvival/input/JoystickCallback.java index da26255..2b1e82f 100644 --- a/src/shootergame/input/JoystickCallback.java +++ b/src/catalystsurvival/input/JoystickCallback.java @@ -1,15 +1,15 @@ -package shootergame.input; +package catalystsurvival.input; -import static shootergame.input.GameInput.activateItem_last; -import static shootergame.input.GameInput.activateTile_last; -import static shootergame.input.GameInput.dropItem_last; -import static shootergame.input.GameInput.fireGun; -import static shootergame.input.GameInput.hotbar_l; -import static shootergame.input.GameInput.hotbar_r; -import static shootergame.input.GameInput.moveDown; -import static shootergame.input.GameInput.moveUp; -import static shootergame.input.GameInput.move_last; -import static shootergame.input.GameInput.startButton_last; +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 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 shootergame.Main; -import shootergame.input.types.Input; public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask { diff --git a/src/shootergame/input/KeyCallback.java b/src/catalystsurvival/input/KeyCallback.java similarity index 87% rename from src/shootergame/input/KeyCallback.java rename to src/catalystsurvival/input/KeyCallback.java index aa8b69c..4253ded 100644 --- a/src/shootergame/input/KeyCallback.java +++ b/src/catalystsurvival/input/KeyCallback.java @@ -1,5 +1,11 @@ -package shootergame.input; +package catalystsurvival.input; +import static catalystsurvival.input.GameInput.fireGun; +import static catalystsurvival.input.GameInput.moveDown; +import static catalystsurvival.input.GameInput.moveLeft; +import static catalystsurvival.input.GameInput.moveRight; +import static catalystsurvival.input.GameInput.moveUp; +import static catalystsurvival.input.GameInput.move_last; import static org.lwjgl.glfw.GLFW.GLFW_KEY_1; import static org.lwjgl.glfw.GLFW.GLFW_KEY_2; import static org.lwjgl.glfw.GLFW.GLFW_KEY_3; @@ -15,19 +21,13 @@ import static org.lwjgl.glfw.GLFW.GLFW_KEY_Q; import static org.lwjgl.glfw.GLFW.GLFW_KEY_S; import static org.lwjgl.glfw.GLFW.GLFW_KEY_W; import static org.lwjgl.glfw.GLFW.GLFW_RELEASE; -import static shootergame.input.GameInput.fireGun; -import static shootergame.input.GameInput.moveDown; -import static shootergame.input.GameInput.moveLeft; -import static shootergame.input.GameInput.moveRight; -import static shootergame.input.GameInput.moveUp; -import static shootergame.input.GameInput.move_last; import org.lwjgl.glfw.GLFWKeyCallbackI; +import catalystsurvival.Main; +import catalystsurvival.input.types.Input; +import catalystsurvival.util.math.vec.Vec2d; import mainloop.task.IMainloopTask; -import shootergame.Main; -import shootergame.input.types.Input; -import shootergame.util.math.vec.Vec2d; public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask { diff --git a/src/shootergame/input/KeyCharCallback.java b/src/catalystsurvival/input/KeyCharCallback.java similarity index 86% rename from src/shootergame/input/KeyCharCallback.java rename to src/catalystsurvival/input/KeyCharCallback.java index a4b7f9a..9b95ea6 100644 --- a/src/shootergame/input/KeyCharCallback.java +++ b/src/catalystsurvival/input/KeyCharCallback.java @@ -1,4 +1,4 @@ -package shootergame.input; +package catalystsurvival.input; import org.lwjgl.glfw.GLFWCharCallbackI; diff --git a/src/shootergame/input/MouseButtonCallback.java b/src/catalystsurvival/input/MouseButtonCallback.java similarity index 88% rename from src/shootergame/input/MouseButtonCallback.java rename to src/catalystsurvival/input/MouseButtonCallback.java index 453ba25..d007c0f 100644 --- a/src/shootergame/input/MouseButtonCallback.java +++ b/src/catalystsurvival/input/MouseButtonCallback.java @@ -1,9 +1,9 @@ -package shootergame.input; +package catalystsurvival.input; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWMouseButtonCallbackI; -import shootergame.Main; +import catalystsurvival.Main; public class MouseButtonCallback implements GLFWMouseButtonCallbackI { diff --git a/src/shootergame/input/ScrollWheelCallback.java b/src/catalystsurvival/input/ScrollWheelCallback.java similarity index 83% rename from src/shootergame/input/ScrollWheelCallback.java rename to src/catalystsurvival/input/ScrollWheelCallback.java index c88e5e2..3749529 100644 --- a/src/shootergame/input/ScrollWheelCallback.java +++ b/src/catalystsurvival/input/ScrollWheelCallback.java @@ -1,8 +1,8 @@ -package shootergame.input; +package catalystsurvival.input; import org.lwjgl.glfw.GLFWScrollCallbackI; -import shootergame.Main; +import catalystsurvival.Main; public class ScrollWheelCallback implements GLFWScrollCallbackI { diff --git a/src/shootergame/input/types/Input.java b/src/catalystsurvival/input/types/Input.java similarity index 91% rename from src/shootergame/input/types/Input.java rename to src/catalystsurvival/input/types/Input.java index 10e14dd..44754fc 100644 --- a/src/shootergame/input/types/Input.java +++ b/src/catalystsurvival/input/types/Input.java @@ -1,4 +1,4 @@ -package shootergame.input.types; +package catalystsurvival.input.types; public interface Input { diff --git a/src/shootergame/input/types/InputDeath.java b/src/catalystsurvival/input/types/InputDeath.java similarity index 83% rename from src/shootergame/input/types/InputDeath.java rename to src/catalystsurvival/input/types/InputDeath.java index 9afd4dd..c966c8f 100644 --- a/src/shootergame/input/types/InputDeath.java +++ b/src/catalystsurvival/input/types/InputDeath.java @@ -1,8 +1,8 @@ -package shootergame.input.types; +package catalystsurvival.input.types; -import shootergame.Main; -import shootergame.menu.Menu; -import shootergame.menu.MenuDeath; +import catalystsurvival.Main; +import catalystsurvival.menu.Menu; +import catalystsurvival.menu.MenuDeath; public class InputDeath implements Input { diff --git a/src/shootergame/input/types/InputGame.java b/src/catalystsurvival/input/types/InputGame.java similarity index 87% rename from src/shootergame/input/types/InputGame.java rename to src/catalystsurvival/input/types/InputGame.java index 0c68d2a..fa167a5 100644 --- a/src/shootergame/input/types/InputGame.java +++ b/src/catalystsurvival/input/types/InputGame.java @@ -1,8 +1,8 @@ -package shootergame.input.types; +package catalystsurvival.input.types; -import shootergame.Main; -import shootergame.menu.MenuGamePause; -import shootergame.util.math.MathHelpers; +import catalystsurvival.Main; +import catalystsurvival.menu.MenuGamePause; +import catalystsurvival.util.math.MathHelpers; public class InputGame implements Input { diff --git a/src/shootergame/input/types/InputGamePause.java b/src/catalystsurvival/input/types/InputGamePause.java similarity index 80% rename from src/shootergame/input/types/InputGamePause.java rename to src/catalystsurvival/input/types/InputGamePause.java index c77d4f2..5b891b0 100644 --- a/src/shootergame/input/types/InputGamePause.java +++ b/src/catalystsurvival/input/types/InputGamePause.java @@ -1,9 +1,9 @@ -package shootergame.input.types; +package catalystsurvival.input.types; -import shootergame.Main; -import shootergame.menu.Menu; -import shootergame.menu.MenuGame; -import shootergame.menu.MenuGamePause; +import catalystsurvival.Main; +import catalystsurvival.menu.Menu; +import catalystsurvival.menu.MenuGame; +import catalystsurvival.menu.MenuGamePause; public class InputGamePause implements Input { diff --git a/src/shootergame/input/types/InputMenu.java b/src/catalystsurvival/input/types/InputMenu.java similarity index 96% rename from src/shootergame/input/types/InputMenu.java rename to src/catalystsurvival/input/types/InputMenu.java index 2ff0725..caef23c 100644 --- a/src/shootergame/input/types/InputMenu.java +++ b/src/catalystsurvival/input/types/InputMenu.java @@ -1,4 +1,4 @@ -package shootergame.input.types; +package catalystsurvival.input.types; public class InputMenu implements Input { diff --git a/src/shootergame/inventory/IInventory.java b/src/catalystsurvival/inventory/IInventory.java similarity index 69% rename from src/shootergame/inventory/IInventory.java rename to src/catalystsurvival/inventory/IInventory.java index fa7eb33..6ed3694 100644 --- a/src/shootergame/inventory/IInventory.java +++ b/src/catalystsurvival/inventory/IInventory.java @@ -1,6 +1,6 @@ -package shootergame.inventory; +package catalystsurvival.inventory; -import shootergame.util.math.ItemStack; +import catalystsurvival.util.math.ItemStack; public interface IInventory { diff --git a/src/shootergame/inventory/Inventory.java b/src/catalystsurvival/inventory/Inventory.java similarity index 89% rename from src/shootergame/inventory/Inventory.java rename to src/catalystsurvival/inventory/Inventory.java index 0e9c0c0..b0bbf61 100644 --- a/src/shootergame/inventory/Inventory.java +++ b/src/catalystsurvival/inventory/Inventory.java @@ -1,6 +1,6 @@ -package shootergame.inventory; +package catalystsurvival.inventory; -import shootergame.util.math.ItemStack; +import catalystsurvival.util.math.ItemStack; public class Inventory implements IInventory { diff --git a/src/shootergame/items/Item.java b/src/catalystsurvival/items/Item.java similarity index 79% rename from src/shootergame/items/Item.java rename to src/catalystsurvival/items/Item.java index 7cbbc99..62e85d4 100644 --- a/src/shootergame/items/Item.java +++ b/src/catalystsurvival/items/Item.java @@ -1,14 +1,14 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.entity.EntityInventory; -import shootergame.inventory.Inventory; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.ItemStack; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class Item { diff --git a/src/shootergame/items/ItemAmmo.java b/src/catalystsurvival/items/ItemAmmo.java similarity index 63% rename from src/shootergame/items/ItemAmmo.java rename to src/catalystsurvival/items/ItemAmmo.java index 453c2bb..8ad1191 100644 --- a/src/shootergame/items/ItemAmmo.java +++ b/src/catalystsurvival/items/ItemAmmo.java @@ -1,11 +1,11 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemAmmo extends Item { diff --git a/src/shootergame/items/ItemDefenceUpgrade.java b/src/catalystsurvival/items/ItemDefenceUpgrade.java similarity index 64% rename from src/shootergame/items/ItemDefenceUpgrade.java rename to src/catalystsurvival/items/ItemDefenceUpgrade.java index 4ac23bf..136b84f 100644 --- a/src/shootergame/items/ItemDefenceUpgrade.java +++ b/src/catalystsurvival/items/ItemDefenceUpgrade.java @@ -1,11 +1,11 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemDefenceUpgrade extends Item { diff --git a/src/shootergame/items/ItemEmpty.java b/src/catalystsurvival/items/ItemEmpty.java similarity index 58% rename from src/shootergame/items/ItemEmpty.java rename to src/catalystsurvival/items/ItemEmpty.java index 11790b1..bd5e04f 100644 --- a/src/shootergame/items/ItemEmpty.java +++ b/src/catalystsurvival/items/ItemEmpty.java @@ -1,10 +1,10 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.util.math.ItemStack; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemEmpty extends Item { diff --git a/src/shootergame/items/ItemFlare.java b/src/catalystsurvival/items/ItemFlare.java similarity index 59% rename from src/shootergame/items/ItemFlare.java rename to src/catalystsurvival/items/ItemFlare.java index 1d75255..565932a 100644 --- a/src/shootergame/items/ItemFlare.java +++ b/src/catalystsurvival/items/ItemFlare.java @@ -1,11 +1,11 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.entity.EntityFlare; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemFlare extends Item { diff --git a/src/shootergame/items/ItemGrapplingHook.java b/src/catalystsurvival/items/ItemGrapplingHook.java similarity index 58% rename from src/shootergame/items/ItemGrapplingHook.java rename to src/catalystsurvival/items/ItemGrapplingHook.java index cad3fc4..19d2f7a 100644 --- a/src/shootergame/items/ItemGrapplingHook.java +++ b/src/catalystsurvival/items/ItemGrapplingHook.java @@ -1,13 +1,13 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.entity.EntityGrapplingHook; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemGrapplingHook extends Item { diff --git a/src/shootergame/items/ItemGunUpgrade.java b/src/catalystsurvival/items/ItemGunUpgrade.java similarity index 63% rename from src/shootergame/items/ItemGunUpgrade.java rename to src/catalystsurvival/items/ItemGunUpgrade.java index 84d8808..cf9c94f 100644 --- a/src/shootergame/items/ItemGunUpgrade.java +++ b/src/catalystsurvival/items/ItemGunUpgrade.java @@ -1,11 +1,11 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemGunUpgrade extends Item { diff --git a/src/shootergame/items/ItemHealthPotion.java b/src/catalystsurvival/items/ItemHealthPotion.java similarity index 67% rename from src/shootergame/items/ItemHealthPotion.java rename to src/catalystsurvival/items/ItemHealthPotion.java index 9ada670..25a7f0b 100644 --- a/src/shootergame/items/ItemHealthPotion.java +++ b/src/catalystsurvival/items/ItemHealthPotion.java @@ -1,11 +1,11 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.entity.EntityAlive; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemHealthPotion extends Item { diff --git a/src/shootergame/items/ItemLantern.java b/src/catalystsurvival/items/ItemLantern.java similarity index 60% rename from src/shootergame/items/ItemLantern.java rename to src/catalystsurvival/items/ItemLantern.java index 5e9b7ba..9bd9f26 100644 --- a/src/shootergame/items/ItemLantern.java +++ b/src/catalystsurvival/items/ItemLantern.java @@ -1,13 +1,13 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.init.Textures; -import shootergame.init.Tiles; -import shootergame.util.math.ItemStack; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemLantern extends Item { diff --git a/src/shootergame/items/ItemTnt.java b/src/catalystsurvival/items/ItemTnt.java similarity index 60% rename from src/shootergame/items/ItemTnt.java rename to src/catalystsurvival/items/ItemTnt.java index 7d4cbf7..2b1ad0d 100644 --- a/src/shootergame/items/ItemTnt.java +++ b/src/catalystsurvival/items/ItemTnt.java @@ -1,11 +1,11 @@ -package shootergame.items; +package catalystsurvival.items; -import shootergame.entity.Entity; -import shootergame.entity.EntityTnt; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class ItemTnt extends Item { diff --git a/src/shootergame/mainloop/MainloopEventHandler.java b/src/catalystsurvival/mainloop/MainloopEventHandler.java similarity index 94% rename from src/shootergame/mainloop/MainloopEventHandler.java rename to src/catalystsurvival/mainloop/MainloopEventHandler.java index fec8ba8..1cfa17e 100644 --- a/src/shootergame/mainloop/MainloopEventHandler.java +++ b/src/catalystsurvival/mainloop/MainloopEventHandler.java @@ -1,8 +1,8 @@ -package shootergame.mainloop; +package catalystsurvival.mainloop; +import catalystsurvival.Main; import mainloop.event.IMainloopEvent; import mainloop.task.IMainloopTask; -import shootergame.Main; public class MainloopEventHandler implements IMainloopEvent, IMainloopTask { diff --git a/src/shootergame/menu/Menu.java b/src/catalystsurvival/menu/Menu.java similarity index 73% rename from src/shootergame/menu/Menu.java rename to src/catalystsurvival/menu/Menu.java index fe5d978..1832f8c 100644 --- a/src/shootergame/menu/Menu.java +++ b/src/catalystsurvival/menu/Menu.java @@ -1,6 +1,6 @@ -package shootergame.menu; +package catalystsurvival.menu; -import shootergame.input.types.Input; +import catalystsurvival.input.types.Input; public abstract class Menu { diff --git a/src/shootergame/menu/MenuDeath.java b/src/catalystsurvival/menu/MenuDeath.java similarity index 83% rename from src/shootergame/menu/MenuDeath.java rename to src/catalystsurvival/menu/MenuDeath.java index ff1a5b2..8d30fbc 100644 --- a/src/shootergame/menu/MenuDeath.java +++ b/src/catalystsurvival/menu/MenuDeath.java @@ -1,9 +1,9 @@ -package shootergame.menu; +package catalystsurvival.menu; -import shootergame.input.types.InputDeath; -import shootergame.text.Text; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.input.types.InputDeath; +import catalystsurvival.text.Text; +import catalystsurvival.util.gl.GlHelpers; +import catalystsurvival.util.math.vec.Vec2d; public class MenuDeath extends Menu { diff --git a/src/shootergame/menu/MenuGame.java b/src/catalystsurvival/menu/MenuGame.java similarity index 68% rename from src/shootergame/menu/MenuGame.java rename to src/catalystsurvival/menu/MenuGame.java index ca1278e..b2ccbb5 100644 --- a/src/shootergame/menu/MenuGame.java +++ b/src/catalystsurvival/menu/MenuGame.java @@ -1,7 +1,7 @@ -package shootergame.menu; +package catalystsurvival.menu; -import shootergame.Main; -import shootergame.input.types.InputGame; +import catalystsurvival.Main; +import catalystsurvival.input.types.InputGame; public class MenuGame extends Menu { diff --git a/src/shootergame/menu/MenuGamePause.java b/src/catalystsurvival/menu/MenuGamePause.java similarity index 82% rename from src/shootergame/menu/MenuGamePause.java rename to src/catalystsurvival/menu/MenuGamePause.java index 7228312..ab86e2a 100644 --- a/src/shootergame/menu/MenuGamePause.java +++ b/src/catalystsurvival/menu/MenuGamePause.java @@ -1,9 +1,9 @@ -package shootergame.menu; +package catalystsurvival.menu; -import shootergame.input.types.InputGamePause; -import shootergame.text.Text; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.input.types.InputGamePause; +import catalystsurvival.text.Text; +import catalystsurvival.util.gl.GlHelpers; +import catalystsurvival.util.math.vec.Vec2d; public class MenuGamePause extends Menu { diff --git a/src/shootergame/menu/MenuMain.java b/src/catalystsurvival/menu/MenuMain.java similarity index 71% rename from src/shootergame/menu/MenuMain.java rename to src/catalystsurvival/menu/MenuMain.java index 0290d9f..3dc3ab8 100644 --- a/src/shootergame/menu/MenuMain.java +++ b/src/catalystsurvival/menu/MenuMain.java @@ -1,6 +1,6 @@ -package shootergame.menu; +package catalystsurvival.menu; -import shootergame.input.types.InputMenu; +import catalystsurvival.input.types.InputMenu; public class MenuMain extends Menu { diff --git a/src/shootergame/menu/MenuRespawn.java b/src/catalystsurvival/menu/MenuRespawn.java similarity index 74% rename from src/shootergame/menu/MenuRespawn.java rename to src/catalystsurvival/menu/MenuRespawn.java index 3c8bcd8..c2bc938 100644 --- a/src/shootergame/menu/MenuRespawn.java +++ b/src/catalystsurvival/menu/MenuRespawn.java @@ -1,15 +1,15 @@ -package shootergame.menu; +package catalystsurvival.menu; import java.util.Random; -import shootergame.Main; -import shootergame.display.bossbar.BossBars; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Layers; -import shootergame.text.Text; -import shootergame.time.GameTimer; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.vec.Vec2d; +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; class MenuRespawn { diff --git a/src/shootergame/resources/Resource.java b/src/catalystsurvival/resources/Resource.java similarity index 98% rename from src/shootergame/resources/Resource.java rename to src/catalystsurvival/resources/Resource.java index 7823209..7a96dcf 100644 --- a/src/shootergame/resources/Resource.java +++ b/src/catalystsurvival/resources/Resource.java @@ -1,4 +1,4 @@ -package shootergame.resources; +package catalystsurvival.resources; import java.io.File; import java.io.FileInputStream; diff --git a/src/shootergame/resources/ResourceDownload.java b/src/catalystsurvival/resources/ResourceDownload.java similarity index 97% rename from src/shootergame/resources/ResourceDownload.java rename to src/catalystsurvival/resources/ResourceDownload.java index f785c93..d1c502e 100644 --- a/src/shootergame/resources/ResourceDownload.java +++ b/src/catalystsurvival/resources/ResourceDownload.java @@ -1,4 +1,4 @@ -package shootergame.resources; +package catalystsurvival.resources; import java.io.IOException; import java.io.InputStream; diff --git a/src/shootergame/text/Text.java b/src/catalystsurvival/text/Text.java similarity index 97% rename from src/shootergame/text/Text.java rename to src/catalystsurvival/text/Text.java index dce2247..f250cab 100644 --- a/src/shootergame/text/Text.java +++ b/src/catalystsurvival/text/Text.java @@ -1,10 +1,10 @@ -package shootergame.text; +package catalystsurvival.text; -import shootergame.Main; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.Main; +import catalystsurvival.init.Textures; +import catalystsurvival.util.gl.GlHelpers; +import catalystsurvival.util.gl.texture.TextureReference; +import catalystsurvival.util.math.vec.Vec2d; public class Text { diff --git a/src/shootergame/tiles/LightLevelNoise.java b/src/catalystsurvival/tiles/LightLevelNoise.java similarity index 85% rename from src/shootergame/tiles/LightLevelNoise.java rename to src/catalystsurvival/tiles/LightLevelNoise.java index 6b3a9fc..2f86952 100644 --- a/src/shootergame/tiles/LightLevelNoise.java +++ b/src/catalystsurvival/tiles/LightLevelNoise.java @@ -1,11 +1,11 @@ -package shootergame.tiles; +package catalystsurvival.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 shootergame.time.GameTimer; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.random.OpenSimplexNoise; public class LightLevelNoise implements IMainloopTask { diff --git a/src/shootergame/tiles/Tile.java b/src/catalystsurvival/tiles/Tile.java similarity index 75% rename from src/shootergame/tiles/Tile.java rename to src/catalystsurvival/tiles/Tile.java index 44274f9..0f17f51 100644 --- a/src/shootergame/tiles/Tile.java +++ b/src/catalystsurvival/tiles/Tile.java @@ -1,14 +1,14 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.display.Camera; -import shootergame.display.transparent.ITransparentObject; -import shootergame.display.transparent.TransparentObjects; -import shootergame.entity.Entity; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class Tile implements ITransparentObject { diff --git a/src/shootergame/tiles/TileBossPortal.java b/src/catalystsurvival/tiles/TileBossPortal.java similarity index 75% rename from src/shootergame/tiles/TileBossPortal.java rename to src/catalystsurvival/tiles/TileBossPortal.java index 62ea4a2..38c7bfb 100644 --- a/src/shootergame/tiles/TileBossPortal.java +++ b/src/catalystsurvival/tiles/TileBossPortal.java @@ -1,19 +1,19 @@ -package shootergame.tiles; +package catalystsurvival.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 shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.particle.ParticleBreak; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Textures; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.ChunkEventHandler; -import shootergame.world.layer.Layer; -import shootergame.world.layer.layergen.LayerGenBossArena; public class TileBossPortal extends TileVertical { diff --git a/src/shootergame/tiles/TileChest.java b/src/catalystsurvival/tiles/TileChest.java similarity index 85% rename from src/shootergame/tiles/TileChest.java rename to src/catalystsurvival/tiles/TileChest.java index f95a3b5..1526ee3 100644 --- a/src/shootergame/tiles/TileChest.java +++ b/src/catalystsurvival/tiles/TileChest.java @@ -1,19 +1,19 @@ -package shootergame.tiles; +package catalystsurvival.tiles; import java.util.Random; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.EntityItem; -import shootergame.init.Items; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class TileChest extends TileVertical { diff --git a/src/shootergame/tiles/TileDirt.java b/src/catalystsurvival/tiles/TileDirt.java similarity index 62% rename from src/shootergame/tiles/TileDirt.java rename to src/catalystsurvival/tiles/TileDirt.java index c7879f5..70cc677 100644 --- a/src/shootergame/tiles/TileDirt.java +++ b/src/catalystsurvival/tiles/TileDirt.java @@ -1,6 +1,6 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; +import catalystsurvival.init.Textures; public class TileDirt extends TileFlatFaded { diff --git a/src/shootergame/tiles/TileFire.java b/src/catalystsurvival/tiles/TileFire.java similarity index 61% rename from src/shootergame/tiles/TileFire.java rename to src/catalystsurvival/tiles/TileFire.java index eec2de6..ca95205 100644 --- a/src/shootergame/tiles/TileFire.java +++ b/src/catalystsurvival/tiles/TileFire.java @@ -1,7 +1,7 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.init.Textures; +import catalystsurvival.util.math.vec.Vec2d; public class TileFire extends TileVertical { diff --git a/src/shootergame/tiles/TileFlat.java b/src/catalystsurvival/tiles/TileFlat.java similarity index 74% rename from src/shootergame/tiles/TileFlat.java rename to src/catalystsurvival/tiles/TileFlat.java index 7875f56..115c57d 100644 --- a/src/shootergame/tiles/TileFlat.java +++ b/src/catalystsurvival/tiles/TileFlat.java @@ -1,12 +1,12 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.display.Camera; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.texture.IHasTexture; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +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; public class TileFlat extends Tile implements IHasTexture { diff --git a/src/shootergame/tiles/TileFlatFaded.java b/src/catalystsurvival/tiles/TileFlatFaded.java similarity index 58% rename from src/shootergame/tiles/TileFlatFaded.java rename to src/catalystsurvival/tiles/TileFlatFaded.java index 79ec8bf..20af3f9 100644 --- a/src/shootergame/tiles/TileFlatFaded.java +++ b/src/catalystsurvival/tiles/TileFlatFaded.java @@ -1,10 +1,10 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.display.Camera; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +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; public class TileFlatFaded extends TileFlat { diff --git a/src/shootergame/tiles/TileGrass.java b/src/catalystsurvival/tiles/TileGrass.java similarity index 62% rename from src/shootergame/tiles/TileGrass.java rename to src/catalystsurvival/tiles/TileGrass.java index 00b9798..be096b6 100644 --- a/src/shootergame/tiles/TileGrass.java +++ b/src/catalystsurvival/tiles/TileGrass.java @@ -1,6 +1,6 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; +import catalystsurvival.init.Textures; public class TileGrass extends TileFlat { diff --git a/src/shootergame/tiles/TileLadder.java b/src/catalystsurvival/tiles/TileLadder.java similarity index 63% rename from src/shootergame/tiles/TileLadder.java rename to src/catalystsurvival/tiles/TileLadder.java index da6e7e3..fe317ef 100644 --- a/src/shootergame/tiles/TileLadder.java +++ b/src/catalystsurvival/tiles/TileLadder.java @@ -1,9 +1,9 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; +import catalystsurvival.init.Textures; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec2i; public class TileLadder extends TileVertical { diff --git a/src/shootergame/tiles/TileLadderUp.java b/src/catalystsurvival/tiles/TileLadderUp.java similarity index 77% rename from src/shootergame/tiles/TileLadderUp.java rename to src/catalystsurvival/tiles/TileLadderUp.java index c9dfd83..06ec5b6 100644 --- a/src/shootergame/tiles/TileLadderUp.java +++ b/src/catalystsurvival/tiles/TileLadderUp.java @@ -1,17 +1,17 @@ -package shootergame.tiles; +package catalystsurvival.tiles; +import catalystsurvival.Main; +import catalystsurvival.entity.Entity; +import catalystsurvival.entity.player.EntityPlayer; +import catalystsurvival.init.Layers; +import catalystsurvival.init.Textures; +import catalystsurvival.mainloop.MainloopEventHandler; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec2i; +import catalystsurvival.world.chunk.ChunkEventHandler; +import catalystsurvival.world.layer.Layer; import mainloop.task.IMainloopTask; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Layers; -import shootergame.init.Textures; -import shootergame.mainloop.MainloopEventHandler; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.ChunkEventHandler; -import shootergame.world.layer.Layer; public class TileLadderUp extends TileVertical { diff --git a/src/shootergame/tiles/TileLantern.java b/src/catalystsurvival/tiles/TileLantern.java similarity index 60% rename from src/shootergame/tiles/TileLantern.java rename to src/catalystsurvival/tiles/TileLantern.java index f2d7111..cfa08fe 100644 --- a/src/shootergame/tiles/TileLantern.java +++ b/src/catalystsurvival/tiles/TileLantern.java @@ -1,14 +1,14 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.entity.Entity; -import shootergame.entity.EntityItem; -import shootergame.init.Items; -import shootergame.init.Textures; -import shootergame.util.math.ItemStack; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.layer.Layer; +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; public class TileLantern extends TileVertical { diff --git a/src/shootergame/tiles/TileLava.java b/src/catalystsurvival/tiles/TileLava.java similarity index 69% rename from src/shootergame/tiles/TileLava.java rename to src/catalystsurvival/tiles/TileLava.java index d48689a..75750b5 100644 --- a/src/shootergame/tiles/TileLava.java +++ b/src/catalystsurvival/tiles/TileLava.java @@ -1,17 +1,17 @@ -package shootergame.tiles; +package catalystsurvival.tiles; import java.util.Random; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.entity.particle.ParticleLava; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class TileLava extends TileFlat { diff --git a/src/shootergame/tiles/TileLavaFlow.java b/src/catalystsurvival/tiles/TileLavaFlow.java similarity index 63% rename from src/shootergame/tiles/TileLavaFlow.java rename to src/catalystsurvival/tiles/TileLavaFlow.java index 6b7fd32..beca7e0 100644 --- a/src/shootergame/tiles/TileLavaFlow.java +++ b/src/catalystsurvival/tiles/TileLavaFlow.java @@ -1,17 +1,17 @@ -package shootergame.tiles; +package catalystsurvival.tiles; import java.util.Random; -import shootergame.display.Camera; -import shootergame.entity.particle.ParticleSmoke; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class TileLavaFlow extends TileFlat { diff --git a/src/shootergame/tiles/TilePortalDown.java b/src/catalystsurvival/tiles/TilePortalDown.java similarity index 84% rename from src/shootergame/tiles/TilePortalDown.java rename to src/catalystsurvival/tiles/TilePortalDown.java index f1dbbb2..115b14f 100644 --- a/src/shootergame/tiles/TilePortalDown.java +++ b/src/catalystsurvival/tiles/TilePortalDown.java @@ -1,16 +1,16 @@ -package shootergame.tiles; +package catalystsurvival.tiles; +import catalystsurvival.Main; +import catalystsurvival.entity.Entity; +import catalystsurvival.entity.player.EntityPlayer; +import catalystsurvival.init.Layers; +import catalystsurvival.init.Textures; +import catalystsurvival.mainloop.MainloopEventHandler; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2i; +import catalystsurvival.world.chunk.ChunkEventHandler; +import catalystsurvival.world.layer.Layer; import mainloop.task.IMainloopTask; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Layers; -import shootergame.init.Textures; -import shootergame.mainloop.MainloopEventHandler; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.ChunkEventHandler; -import shootergame.world.layer.Layer; public class TilePortalDown extends TileFlat { diff --git a/src/shootergame/tiles/TileRock.java b/src/catalystsurvival/tiles/TileRock.java similarity index 66% rename from src/shootergame/tiles/TileRock.java rename to src/catalystsurvival/tiles/TileRock.java index b427f5a..9c0dae5 100644 --- a/src/shootergame/tiles/TileRock.java +++ b/src/catalystsurvival/tiles/TileRock.java @@ -1,8 +1,8 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.init.Textures; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; public class TileRock extends TileVertical { diff --git a/src/shootergame/tiles/TileSand.java b/src/catalystsurvival/tiles/TileSand.java similarity index 61% rename from src/shootergame/tiles/TileSand.java rename to src/catalystsurvival/tiles/TileSand.java index 7793604..fc44433 100644 --- a/src/shootergame/tiles/TileSand.java +++ b/src/catalystsurvival/tiles/TileSand.java @@ -1,6 +1,6 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; +import catalystsurvival.init.Textures; public class TileSand extends TileFlat { diff --git a/src/shootergame/tiles/TileStone.java b/src/catalystsurvival/tiles/TileStone.java similarity index 63% rename from src/shootergame/tiles/TileStone.java rename to src/catalystsurvival/tiles/TileStone.java index 8a81601..c6f8de7 100644 --- a/src/shootergame/tiles/TileStone.java +++ b/src/catalystsurvival/tiles/TileStone.java @@ -1,6 +1,6 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; +import catalystsurvival.init.Textures; public class TileStone extends TileFlatFaded { diff --git a/src/shootergame/tiles/TileTree.java b/src/catalystsurvival/tiles/TileTree.java similarity index 66% rename from src/shootergame/tiles/TileTree.java rename to src/catalystsurvival/tiles/TileTree.java index 5964fba..1cf4023 100644 --- a/src/shootergame/tiles/TileTree.java +++ b/src/catalystsurvival/tiles/TileTree.java @@ -1,8 +1,8 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.init.Textures; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; public class TileTree extends TileVertical { diff --git a/src/shootergame/tiles/TileVertical.java b/src/catalystsurvival/tiles/TileVertical.java similarity index 60% rename from src/shootergame/tiles/TileVertical.java rename to src/catalystsurvival/tiles/TileVertical.java index f035754..da32dee 100644 --- a/src/shootergame/tiles/TileVertical.java +++ b/src/catalystsurvival/tiles/TileVertical.java @@ -1,12 +1,12 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.display.Camera; -import shootergame.util.gl.GlHelpers; -import shootergame.util.gl.VerticalRender; -import shootergame.util.gl.texture.IHasTexture; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; +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; public class TileVertical extends Tile implements IHasTexture { diff --git a/src/shootergame/tiles/TileVoid.java b/src/catalystsurvival/tiles/TileVoid.java similarity index 84% rename from src/shootergame/tiles/TileVoid.java rename to src/catalystsurvival/tiles/TileVoid.java index 2def488..9628235 100644 --- a/src/shootergame/tiles/TileVoid.java +++ b/src/catalystsurvival/tiles/TileVoid.java @@ -1,4 +1,4 @@ -package shootergame.tiles; +package catalystsurvival.tiles; public class TileVoid extends Tile { diff --git a/src/shootergame/tiles/TileWall.java b/src/catalystsurvival/tiles/TileWall.java similarity index 76% rename from src/shootergame/tiles/TileWall.java rename to src/catalystsurvival/tiles/TileWall.java index 1c2c283..e1470c7 100644 --- a/src/shootergame/tiles/TileWall.java +++ b/src/catalystsurvival/tiles/TileWall.java @@ -1,6 +1,6 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.init.Textures; +import catalystsurvival.init.Textures; public class TileWall extends TileFlat { diff --git a/src/shootergame/tiles/TileWallUnbreakable.java b/src/catalystsurvival/tiles/TileWallUnbreakable.java similarity index 81% rename from src/shootergame/tiles/TileWallUnbreakable.java rename to src/catalystsurvival/tiles/TileWallUnbreakable.java index ef32153..2fd0adb 100644 --- a/src/shootergame/tiles/TileWallUnbreakable.java +++ b/src/catalystsurvival/tiles/TileWallUnbreakable.java @@ -1,4 +1,4 @@ -package shootergame.tiles; +package catalystsurvival.tiles; public class TileWallUnbreakable extends TileWall { diff --git a/src/shootergame/tiles/TileWater.java b/src/catalystsurvival/tiles/TileWater.java similarity index 58% rename from src/shootergame/tiles/TileWater.java rename to src/catalystsurvival/tiles/TileWater.java index abfda3a..2120137 100644 --- a/src/shootergame/tiles/TileWater.java +++ b/src/catalystsurvival/tiles/TileWater.java @@ -1,15 +1,15 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.entity.particle.ParticleWater; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class TileWater extends TileFlat { diff --git a/src/shootergame/tiles/TileWaterFlow.java b/src/catalystsurvival/tiles/TileWaterFlow.java similarity index 57% rename from src/shootergame/tiles/TileWaterFlow.java rename to src/catalystsurvival/tiles/TileWaterFlow.java index 3f33918..bac6308 100644 --- a/src/shootergame/tiles/TileWaterFlow.java +++ b/src/catalystsurvival/tiles/TileWaterFlow.java @@ -1,10 +1,10 @@ -package shootergame.tiles; +package catalystsurvival.tiles; -import shootergame.display.Camera; -import shootergame.init.Textures; -import shootergame.util.gl.GlHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.display.Camera; +import catalystsurvival.init.Textures; +import catalystsurvival.util.gl.GlHelpers; +import catalystsurvival.util.math.TileState; +import catalystsurvival.util.math.vec.Vec2d; public class TileWaterFlow extends TileFlat { diff --git a/src/shootergame/time/GameTimer.java b/src/catalystsurvival/time/GameTimer.java similarity index 88% rename from src/shootergame/time/GameTimer.java rename to src/catalystsurvival/time/GameTimer.java index 64b2a31..4dc1a89 100644 --- a/src/shootergame/time/GameTimer.java +++ b/src/catalystsurvival/time/GameTimer.java @@ -1,7 +1,7 @@ -package shootergame.time; +package catalystsurvival.time; +import catalystsurvival.Main; import mainloop.task.IMainloopTask; -import shootergame.Main; public class GameTimer implements IMainloopTask { diff --git a/src/shootergame/time/NoSleep.java b/src/catalystsurvival/time/NoSleep.java similarity index 94% rename from src/shootergame/time/NoSleep.java rename to src/catalystsurvival/time/NoSleep.java index 11221cf..9becc6a 100644 --- a/src/shootergame/time/NoSleep.java +++ b/src/catalystsurvival/time/NoSleep.java @@ -1,4 +1,4 @@ -package shootergame.time; +package catalystsurvival.time; import java.awt.AWTException; import java.awt.Robot; diff --git a/src/shootergame/util/gl/GlHelpers.java b/src/catalystsurvival/util/gl/GlHelpers.java similarity index 97% rename from src/shootergame/util/gl/GlHelpers.java rename to src/catalystsurvival/util/gl/GlHelpers.java index c48f2a0..45a5a4c 100644 --- a/src/shootergame/util/gl/GlHelpers.java +++ b/src/catalystsurvival/util/gl/GlHelpers.java @@ -1,4 +1,4 @@ -package shootergame.util.gl; +package catalystsurvival.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 shootergame.Main; +import catalystsurvival.Main; public class GlHelpers { diff --git a/src/shootergame/util/gl/VerticalRender.java b/src/catalystsurvival/util/gl/VerticalRender.java similarity index 82% rename from src/shootergame/util/gl/VerticalRender.java rename to src/catalystsurvival/util/gl/VerticalRender.java index f7f5344..63acbf9 100644 --- a/src/shootergame/util/gl/VerticalRender.java +++ b/src/catalystsurvival/util/gl/VerticalRender.java @@ -1,8 +1,8 @@ -package shootergame.util.gl; +package catalystsurvival.util.gl; -import shootergame.display.Camera; -import shootergame.util.gl.texture.TextureReference; -import shootergame.util.math.vec.Vec2d; +import catalystsurvival.display.Camera; +import catalystsurvival.util.gl.texture.TextureReference; +import catalystsurvival.util.math.vec.Vec2d; public class VerticalRender { diff --git a/src/shootergame/util/gl/texture/AnimationEventHandler.java b/src/catalystsurvival/util/gl/texture/AnimationEventHandler.java similarity index 86% rename from src/shootergame/util/gl/texture/AnimationEventHandler.java rename to src/catalystsurvival/util/gl/texture/AnimationEventHandler.java index 9bd830f..b07786f 100644 --- a/src/shootergame/util/gl/texture/AnimationEventHandler.java +++ b/src/catalystsurvival/util/gl/texture/AnimationEventHandler.java @@ -1,7 +1,7 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; +import catalystsurvival.init.Textures; import mainloop.task.IMainloopTask; -import shootergame.init.Textures; public class AnimationEventHandler implements IMainloopTask { diff --git a/src/shootergame/util/gl/texture/AnimationReference.java b/src/catalystsurvival/util/gl/texture/AnimationReference.java similarity index 86% rename from src/shootergame/util/gl/texture/AnimationReference.java rename to src/catalystsurvival/util/gl/texture/AnimationReference.java index 5b7ce19..73f2aa3 100644 --- a/src/shootergame/util/gl/texture/AnimationReference.java +++ b/src/catalystsurvival/util/gl/texture/AnimationReference.java @@ -1,7 +1,7 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; -import shootergame.init.Textures; -import shootergame.util.math.MathHelpers; +import catalystsurvival.init.Textures; +import catalystsurvival.util.math.MathHelpers; public class AnimationReference extends TextureReference { diff --git a/src/shootergame/util/gl/texture/IHasTexture.java b/src/catalystsurvival/util/gl/texture/IHasTexture.java similarity index 63% rename from src/shootergame/util/gl/texture/IHasTexture.java rename to src/catalystsurvival/util/gl/texture/IHasTexture.java index 5f0d352..edc9e57 100644 --- a/src/shootergame/util/gl/texture/IHasTexture.java +++ b/src/catalystsurvival/util/gl/texture/IHasTexture.java @@ -1,4 +1,4 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; public interface IHasTexture { diff --git a/src/shootergame/util/gl/texture/Texture.java b/src/catalystsurvival/util/gl/texture/Texture.java similarity index 92% rename from src/shootergame/util/gl/texture/Texture.java rename to src/catalystsurvival/util/gl/texture/Texture.java index 91f4553..7a29a2f 100644 --- a/src/shootergame/util/gl/texture/Texture.java +++ b/src/catalystsurvival/util/gl/texture/Texture.java @@ -1,10 +1,10 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; import java.nio.ByteBuffer; import org.lwjgl.stb.STBImage; -import shootergame.resources.Resource; +import catalystsurvival.resources.Resource; public class Texture { diff --git a/src/shootergame/util/gl/texture/TextureMap.java b/src/catalystsurvival/util/gl/texture/TextureMap.java similarity index 95% rename from src/shootergame/util/gl/texture/TextureMap.java rename to src/catalystsurvival/util/gl/texture/TextureMap.java index fab0b03..9a0de50 100644 --- a/src/shootergame/util/gl/texture/TextureMap.java +++ b/src/catalystsurvival/util/gl/texture/TextureMap.java @@ -1,4 +1,4 @@ -package shootergame.util.gl.texture; +package catalystsurvival.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 shootergame.resources.Resource; +import catalystsurvival.resources.Resource; public class TextureMap { diff --git a/src/shootergame/util/gl/texture/TextureReference.java b/src/catalystsurvival/util/gl/texture/TextureReference.java similarity index 93% rename from src/shootergame/util/gl/texture/TextureReference.java rename to src/catalystsurvival/util/gl/texture/TextureReference.java index de09366..00ff2e1 100644 --- a/src/shootergame/util/gl/texture/TextureReference.java +++ b/src/catalystsurvival/util/gl/texture/TextureReference.java @@ -1,8 +1,8 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; import static org.lwjgl.opengl.GL11.glTexCoord2f; -import shootergame.util.math.MathHelpers; +import catalystsurvival.util.math.MathHelpers; public abstract class TextureReference { diff --git a/src/shootergame/util/gl/texture/TextureReferenceEmpty.java b/src/catalystsurvival/util/gl/texture/TextureReferenceEmpty.java similarity index 87% rename from src/shootergame/util/gl/texture/TextureReferenceEmpty.java rename to src/catalystsurvival/util/gl/texture/TextureReferenceEmpty.java index d9d87f9..5d00ed1 100644 --- a/src/shootergame/util/gl/texture/TextureReferenceEmpty.java +++ b/src/catalystsurvival/util/gl/texture/TextureReferenceEmpty.java @@ -1,4 +1,4 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; class TextureReferenceEmpty extends TextureReference { diff --git a/src/shootergame/util/gl/texture/TextureReferenceRandom.java b/src/catalystsurvival/util/gl/texture/TextureReferenceRandom.java similarity index 78% rename from src/shootergame/util/gl/texture/TextureReferenceRandom.java rename to src/catalystsurvival/util/gl/texture/TextureReferenceRandom.java index 09613aa..4ff4808 100644 --- a/src/shootergame/util/gl/texture/TextureReferenceRandom.java +++ b/src/catalystsurvival/util/gl/texture/TextureReferenceRandom.java @@ -1,8 +1,8 @@ -package shootergame.util.gl.texture; +package catalystsurvival.util.gl.texture; import java.util.Random; -import shootergame.util.math.random.RandomHelpers; +import catalystsurvival.util.math.random.RandomHelpers; public class TextureReferenceRandom { diff --git a/src/shootergame/util/math/ItemStack.java b/src/catalystsurvival/util/math/ItemStack.java similarity index 85% rename from src/shootergame/util/math/ItemStack.java rename to src/catalystsurvival/util/math/ItemStack.java index 79658bd..fd8b563 100644 --- a/src/shootergame/util/math/ItemStack.java +++ b/src/catalystsurvival/util/math/ItemStack.java @@ -1,7 +1,7 @@ -package shootergame.util.math; +package catalystsurvival.util.math; -import shootergame.init.Items; -import shootergame.items.Item; +import catalystsurvival.init.Items; +import catalystsurvival.items.Item; public class ItemStack { diff --git a/src/shootergame/util/math/MathHelpers.java b/src/catalystsurvival/util/math/MathHelpers.java similarity index 95% rename from src/shootergame/util/math/MathHelpers.java rename to src/catalystsurvival/util/math/MathHelpers.java index e3973fd..eb8e518 100644 --- a/src/shootergame/util/math/MathHelpers.java +++ b/src/catalystsurvival/util/math/MathHelpers.java @@ -1,7 +1,7 @@ -package shootergame.util.math; +package catalystsurvival.util.math; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec3d; +import catalystsurvival.util.math.vec.Vec2d; +import catalystsurvival.util.math.vec.Vec3d; public class MathHelpers { diff --git a/src/shootergame/util/math/TileState.java b/src/catalystsurvival/util/math/TileState.java similarity index 85% rename from src/shootergame/util/math/TileState.java rename to src/catalystsurvival/util/math/TileState.java index 5fb0010..e3e711c 100644 --- a/src/shootergame/util/math/TileState.java +++ b/src/catalystsurvival/util/math/TileState.java @@ -1,7 +1,7 @@ -package shootergame.util.math; +package catalystsurvival.util.math; -import shootergame.init.Tiles; -import shootergame.tiles.Tile; +import catalystsurvival.init.Tiles; +import catalystsurvival.tiles.Tile; public class TileState { diff --git a/src/catalystsurvival/util/math/map/IMap2D.java b/src/catalystsurvival/util/math/map/IMap2D.java new file mode 100644 index 0000000..f41b7f8 --- /dev/null +++ b/src/catalystsurvival/util/math/map/IMap2D.java @@ -0,0 +1,8 @@ +package catalystsurvival.util.math.map; + +import catalystsurvival.util.math.vec.Vec2i; + +public interface IMap2D +{ + public T getEmpty(Vec2i pos); +} diff --git a/src/shootergame/util/math/map/Map2D.java b/src/catalystsurvival/util/math/map/Map2D.java similarity index 96% rename from src/shootergame/util/math/map/Map2D.java rename to src/catalystsurvival/util/math/map/Map2D.java index 6b2f53e..48926eb 100644 --- a/src/shootergame/util/math/map/Map2D.java +++ b/src/catalystsurvival/util/math/map/Map2D.java @@ -1,9 +1,9 @@ -package shootergame.util.math.map; +package catalystsurvival.util.math.map; import java.util.ArrayList; import java.util.Iterator; -import shootergame.util.math.vec.Vec2i; +import catalystsurvival.util.math.vec.Vec2i; public class Map2D implements Iterable> { diff --git a/src/shootergame/util/math/map/Map2DElement.java b/src/catalystsurvival/util/math/map/Map2DElement.java similarity index 67% rename from src/shootergame/util/math/map/Map2DElement.java rename to src/catalystsurvival/util/math/map/Map2DElement.java index 593d620..4696f6e 100644 --- a/src/shootergame/util/math/map/Map2DElement.java +++ b/src/catalystsurvival/util/math/map/Map2DElement.java @@ -1,6 +1,6 @@ -package shootergame.util.math.map; +package catalystsurvival.util.math.map; -import shootergame.util.math.vec.Vec2i; +import catalystsurvival.util.math.vec.Vec2i; public class Map2DElement { diff --git a/src/shootergame/util/math/random/OpenSimplexNoise.java b/src/catalystsurvival/util/math/random/OpenSimplexNoise.java similarity index 99% rename from src/shootergame/util/math/random/OpenSimplexNoise.java rename to src/catalystsurvival/util/math/random/OpenSimplexNoise.java index 75f9221..87032e3 100644 --- a/src/shootergame/util/math/random/OpenSimplexNoise.java +++ b/src/catalystsurvival/util/math/random/OpenSimplexNoise.java @@ -1,4 +1,4 @@ -package shootergame.util.math.random; +package catalystsurvival.util.math.random; /* * OpenSimplex Noise in Java. diff --git a/src/shootergame/util/math/random/RandomHelpers.java b/src/catalystsurvival/util/math/random/RandomHelpers.java similarity index 86% rename from src/shootergame/util/math/random/RandomHelpers.java rename to src/catalystsurvival/util/math/random/RandomHelpers.java index 6e3ede6..bbc5585 100644 --- a/src/shootergame/util/math/random/RandomHelpers.java +++ b/src/catalystsurvival/util/math/random/RandomHelpers.java @@ -1,4 +1,4 @@ -package shootergame.util.math.random; +package catalystsurvival.util.math.random; import java.util.Random; diff --git a/src/shootergame/util/math/range/Range2i.java b/src/catalystsurvival/util/math/range/Range2i.java similarity index 75% rename from src/shootergame/util/math/range/Range2i.java rename to src/catalystsurvival/util/math/range/Range2i.java index a3412c1..b33887b 100644 --- a/src/shootergame/util/math/range/Range2i.java +++ b/src/catalystsurvival/util/math/range/Range2i.java @@ -1,4 +1,4 @@ -package shootergame.util.math.range; +package catalystsurvival.util.math.range; public class Range2i { diff --git a/src/shootergame/util/math/range/Range3i.java b/src/catalystsurvival/util/math/range/Range3i.java similarity index 80% rename from src/shootergame/util/math/range/Range3i.java rename to src/catalystsurvival/util/math/range/Range3i.java index 7e85358..4c4cac4 100644 --- a/src/shootergame/util/math/range/Range3i.java +++ b/src/catalystsurvival/util/math/range/Range3i.java @@ -1,4 +1,4 @@ -package shootergame.util.math.range; +package catalystsurvival.util.math.range; public class Range3i { diff --git a/src/shootergame/util/math/vec/Vec2d.java b/src/catalystsurvival/util/math/vec/Vec2d.java similarity index 92% rename from src/shootergame/util/math/vec/Vec2d.java rename to src/catalystsurvival/util/math/vec/Vec2d.java index e4995bd..4419ac6 100644 --- a/src/shootergame/util/math/vec/Vec2d.java +++ b/src/catalystsurvival/util/math/vec/Vec2d.java @@ -1,6 +1,6 @@ -package shootergame.util.math.vec; +package catalystsurvival.util.math.vec; -import shootergame.util.math.MathHelpers; +import catalystsurvival.util.math.MathHelpers; public class Vec2d { diff --git a/src/shootergame/util/math/vec/Vec2i.java b/src/catalystsurvival/util/math/vec/Vec2i.java similarity index 91% rename from src/shootergame/util/math/vec/Vec2i.java rename to src/catalystsurvival/util/math/vec/Vec2i.java index 2368584..f675479 100644 --- a/src/shootergame/util/math/vec/Vec2i.java +++ b/src/catalystsurvival/util/math/vec/Vec2i.java @@ -1,7 +1,7 @@ -package shootergame.util.math.vec; +package catalystsurvival.util.math.vec; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.range.Range2i; +import catalystsurvival.util.math.MathHelpers; +import catalystsurvival.util.math.range.Range2i; public class Vec2i { diff --git a/src/shootergame/util/math/vec/Vec3d.java b/src/catalystsurvival/util/math/vec/Vec3d.java similarity index 93% rename from src/shootergame/util/math/vec/Vec3d.java rename to src/catalystsurvival/util/math/vec/Vec3d.java index 327e16f..b94e71c 100644 --- a/src/shootergame/util/math/vec/Vec3d.java +++ b/src/catalystsurvival/util/math/vec/Vec3d.java @@ -1,6 +1,6 @@ -package shootergame.util.math.vec; +package catalystsurvival.util.math.vec; -import shootergame.util.math.MathHelpers; +import catalystsurvival.util.math.MathHelpers; public class Vec3d { diff --git a/src/shootergame/util/math/vec/Vec3i.java b/src/catalystsurvival/util/math/vec/Vec3i.java similarity index 92% rename from src/shootergame/util/math/vec/Vec3i.java rename to src/catalystsurvival/util/math/vec/Vec3i.java index eb06334..7f78cd4 100644 --- a/src/shootergame/util/math/vec/Vec3i.java +++ b/src/catalystsurvival/util/math/vec/Vec3i.java @@ -1,7 +1,7 @@ -package shootergame.util.math.vec; +package catalystsurvival.util.math.vec; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.range.Range3i; +import catalystsurvival.util.math.MathHelpers; +import catalystsurvival.util.math.range.Range3i; public class Vec3i { diff --git a/src/shootergame/world/World.java b/src/catalystsurvival/world/World.java similarity index 69% rename from src/shootergame/world/World.java rename to src/catalystsurvival/world/World.java index c2c5d4b..c6532c8 100644 --- a/src/shootergame/world/World.java +++ b/src/catalystsurvival/world/World.java @@ -1,8 +1,8 @@ -package shootergame.world; +package catalystsurvival.world; -import shootergame.display.Camera; -import shootergame.world.chunk.ChunkEventHandler; -import shootergame.world.layer.Layer; +import catalystsurvival.display.Camera; +import catalystsurvival.world.chunk.ChunkEventHandler; +import catalystsurvival.world.layer.Layer; public class World { diff --git a/src/shootergame/world/chunk/Chunk.java b/src/catalystsurvival/world/chunk/Chunk.java similarity index 92% rename from src/shootergame/world/chunk/Chunk.java rename to src/catalystsurvival/world/chunk/Chunk.java index 044ca71..f84b40a 100644 --- a/src/shootergame/world/chunk/Chunk.java +++ b/src/catalystsurvival/world/chunk/Chunk.java @@ -1,21 +1,21 @@ -package shootergame.world.chunk; +package catalystsurvival.world.chunk; import java.util.ArrayList; import java.util.Random; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.entity.EntityAlive; -import shootergame.entity.particle.ParticleBreak; -import shootergame.init.Tiles; -import shootergame.tiles.Tile; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.range.Range2i; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.layer.Layer; +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; public class Chunk { diff --git a/src/shootergame/world/chunk/ChunkEmpty.java b/src/catalystsurvival/world/chunk/ChunkEmpty.java similarity index 85% rename from src/shootergame/world/chunk/ChunkEmpty.java rename to src/catalystsurvival/world/chunk/ChunkEmpty.java index 85703d1..c78a155 100644 --- a/src/shootergame/world/chunk/ChunkEmpty.java +++ b/src/catalystsurvival/world/chunk/ChunkEmpty.java @@ -1,12 +1,12 @@ -package shootergame.world.chunk; +package catalystsurvival.world.chunk; import java.util.ArrayList; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.util.math.TileState; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; +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; public class ChunkEmpty extends Chunk { diff --git a/src/shootergame/world/chunk/ChunkEventHandler.java b/src/catalystsurvival/world/chunk/ChunkEventHandler.java similarity index 88% rename from src/shootergame/world/chunk/ChunkEventHandler.java rename to src/catalystsurvival/world/chunk/ChunkEventHandler.java index 2e8a9f4..3207c73 100644 --- a/src/shootergame/world/chunk/ChunkEventHandler.java +++ b/src/catalystsurvival/world/chunk/ChunkEventHandler.java @@ -1,10 +1,10 @@ -package shootergame.world.chunk; +package catalystsurvival.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 shootergame.Main; -import shootergame.util.math.map.Map2DElement; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.layer.Layer; public class ChunkEventHandler implements IMainloopTask { diff --git a/src/shootergame/world/layer/Layer.java b/src/catalystsurvival/world/layer/Layer.java similarity index 90% rename from src/shootergame/world/layer/Layer.java rename to src/catalystsurvival/world/layer/Layer.java index 938ecc6..6fdd165 100644 --- a/src/shootergame/world/layer/Layer.java +++ b/src/catalystsurvival/world/layer/Layer.java @@ -1,19 +1,19 @@ -package shootergame.world.layer; +package catalystsurvival.world.layer; import java.util.ArrayList; import java.util.Random; -import shootergame.Main; -import shootergame.display.Camera; -import shootergame.entity.Entity; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.map.Map2D; -import shootergame.util.math.map.Map2DElement; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.layergen.LayerGen; +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; public class Layer { diff --git a/src/shootergame/world/layer/layergen/LayerGen.java b/src/catalystsurvival/world/layer/layergen/LayerGen.java similarity index 63% rename from src/shootergame/world/layer/layergen/LayerGen.java rename to src/catalystsurvival/world/layer/layergen/LayerGen.java index 0039b3d..71692a6 100644 --- a/src/shootergame/world/layer/layergen/LayerGen.java +++ b/src/catalystsurvival/world/layer/layergen/LayerGen.java @@ -1,12 +1,12 @@ -package shootergame.world.layer.layergen; +package catalystsurvival.world.layer.layergen; import java.util.Random; -import shootergame.util.math.TileState; -import shootergame.util.math.map.IMap2D; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public abstract class LayerGen implements IMap2D { diff --git a/src/shootergame/world/layer/layergen/LayerGenBossArena.java b/src/catalystsurvival/world/layer/layergen/LayerGenBossArena.java similarity index 82% rename from src/shootergame/world/layer/layergen/LayerGenBossArena.java rename to src/catalystsurvival/world/layer/layergen/LayerGenBossArena.java index 7fd0d60..5c4b146 100644 --- a/src/shootergame/world/layer/layergen/LayerGenBossArena.java +++ b/src/catalystsurvival/world/layer/layergen/LayerGenBossArena.java @@ -1,17 +1,17 @@ -package shootergame.world.layer.layergen; +package catalystsurvival.world.layer.layergen; import java.util.Random; -import shootergame.entity.EntityBoss; -import shootergame.entity.player.EntityPlayer; -import shootergame.init.Tiles; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class LayerGenBossArena extends LayerGen implements LayerGenRememberPlayerPos { diff --git a/src/shootergame/world/layer/layergen/LayerGenCaves.java b/src/catalystsurvival/world/layer/layergen/LayerGenCaves.java similarity index 83% rename from src/shootergame/world/layer/layergen/LayerGenCaves.java rename to src/catalystsurvival/world/layer/layergen/LayerGenCaves.java index 472b02a..26046fb 100644 --- a/src/shootergame/world/layer/layergen/LayerGenCaves.java +++ b/src/catalystsurvival/world/layer/layergen/LayerGenCaves.java @@ -1,19 +1,19 @@ -package shootergame.world.layer.layergen; +package catalystsurvival.world.layer.layergen; import java.util.Random; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.EntityZombie; -import shootergame.init.Tiles; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.random.OpenSimplexNoise; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class LayerGenCaves extends LayerGen { diff --git a/src/shootergame/world/layer/layergen/LayerGenEarth.java b/src/catalystsurvival/world/layer/layergen/LayerGenEarth.java similarity index 81% rename from src/shootergame/world/layer/layergen/LayerGenEarth.java rename to src/catalystsurvival/world/layer/layergen/LayerGenEarth.java index f4f940c..f8a5f77 100644 --- a/src/shootergame/world/layer/layergen/LayerGenEarth.java +++ b/src/catalystsurvival/world/layer/layergen/LayerGenEarth.java @@ -1,20 +1,20 @@ -package shootergame.world.layer.layergen; +package catalystsurvival.world.layer.layergen; import java.util.Random; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.EntityZombie; -import shootergame.init.Tiles; -import shootergame.time.GameTimer; -import shootergame.util.math.MathHelpers; -import shootergame.util.math.TileState; -import shootergame.util.math.random.OpenSimplexNoise; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class LayerGenEarth extends LayerGen { diff --git a/src/shootergame/world/layer/layergen/LayerGenLavaCaves.java b/src/catalystsurvival/world/layer/layergen/LayerGenLavaCaves.java similarity index 88% rename from src/shootergame/world/layer/layergen/LayerGenLavaCaves.java rename to src/catalystsurvival/world/layer/layergen/LayerGenLavaCaves.java index f201554..2f036a1 100644 --- a/src/shootergame/world/layer/layergen/LayerGenLavaCaves.java +++ b/src/catalystsurvival/world/layer/layergen/LayerGenLavaCaves.java @@ -1,18 +1,18 @@ -package shootergame.world.layer.layergen; +package catalystsurvival.world.layer.layergen; import java.util.Random; -import shootergame.Main; -import shootergame.entity.Entity; -import shootergame.entity.EntityZombieArmored; -import shootergame.init.Tiles; -import shootergame.util.math.TileState; -import shootergame.util.math.random.OpenSimplexNoise; -import shootergame.util.math.random.RandomHelpers; -import shootergame.util.math.vec.Vec2d; -import shootergame.util.math.vec.Vec2i; -import shootergame.world.chunk.Chunk; -import shootergame.world.layer.Layer; +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; public class LayerGenLavaCaves extends LayerGen { diff --git a/src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java b/src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java new file mode 100644 index 0000000..1cd080b --- /dev/null +++ b/src/catalystsurvival/world/layer/layergen/LayerGenRememberPlayerPos.java @@ -0,0 +1,10 @@ +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/shootergame/world/layer/layergen/PortalSpawnrates.java b/src/catalystsurvival/world/layer/layergen/PortalSpawnrates.java similarity index 78% rename from src/shootergame/world/layer/layergen/PortalSpawnrates.java rename to src/catalystsurvival/world/layer/layergen/PortalSpawnrates.java index 67cdb9f..9836667 100644 --- a/src/shootergame/world/layer/layergen/PortalSpawnrates.java +++ b/src/catalystsurvival/world/layer/layergen/PortalSpawnrates.java @@ -1,8 +1,8 @@ -package shootergame.world.layer.layergen; +package catalystsurvival.world.layer.layergen; import java.util.Random; -import shootergame.util.math.random.RandomHelpers; +import catalystsurvival.util.math.random.RandomHelpers; class PortalSpawnrates { diff --git a/src/shootergame/entity/EntityInventory.java b/src/shootergame/entity/EntityInventory.java deleted file mode 100644 index 9798e48..0000000 --- a/src/shootergame/entity/EntityInventory.java +++ /dev/null @@ -1,8 +0,0 @@ -package shootergame.entity; - -import shootergame.inventory.Inventory; - -public interface EntityInventory -{ - public Inventory getInventory(); -} diff --git a/src/shootergame/util/math/map/IMap2D.java b/src/shootergame/util/math/map/IMap2D.java deleted file mode 100644 index 7f3defe..0000000 --- a/src/shootergame/util/math/map/IMap2D.java +++ /dev/null @@ -1,8 +0,0 @@ -package shootergame.util.math.map; - -import shootergame.util.math.vec.Vec2i; - -public interface IMap2D -{ - public T getEmpty(Vec2i pos); -} diff --git a/src/shootergame/world/layer/layergen/LayerGenRememberPlayerPos.java b/src/shootergame/world/layer/layergen/LayerGenRememberPlayerPos.java deleted file mode 100644 index ea9429c..0000000 --- a/src/shootergame/world/layer/layergen/LayerGenRememberPlayerPos.java +++ /dev/null @@ -1,10 +0,0 @@ -package shootergame.world.layer.layergen; - -import shootergame.entity.player.EntityPlayer; -import shootergame.util.math.vec.Vec2d; - -public interface LayerGenRememberPlayerPos -{ - public Vec2d getPlayerPos(); - public void spawnPlayer(EntityPlayer player); -}