Changed name (again) from "Catalyst Survival" to "Project Zombie", added

basic tickrate changing functionality
This commit is contained in:
josua 2019-11-18 08:52:04 +11:00
parent 25e4123d7a
commit f26416a6d5
150 changed files with 887 additions and 886 deletions

View File

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

View File

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

View File

@ -1,8 +0,0 @@
package catalystsurvival.util.math.map;
import catalystsurvival.util.math.vec.Vec2i;
public interface IMap2D<T>
{
public T getEmpty(Vec2i pos);
}

View File

@ -1,10 +0,0 @@
package catalystsurvival.world.layer.layergen;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.util.math.vec.Vec2d;
public interface LayerGenRememberPlayerPos
{
public Vec2d getPlayerPos();
public void spawnPlayer(EntityPlayer player);
}

View File

@ -1,29 +1,29 @@
package catalystsurvival;
package projectzombie;
import java.util.Random;
import catalystsurvival.audio.AudioEngine;
import catalystsurvival.audio.AudioSources;
import catalystsurvival.cheats.Cheats;
import catalystsurvival.display.DisplayStatsEventHandler;
import catalystsurvival.display.DisplayWindow;
import catalystsurvival.entity.EntityEventHandler;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.init.Layers;
import catalystsurvival.init.Resources;
import catalystsurvival.init.Sounds;
import catalystsurvival.init.Textures;
import catalystsurvival.input.JoystickCallback;
import catalystsurvival.input.KeyCallback;
import catalystsurvival.mainloop.MainloopEventHandler;
import catalystsurvival.menu.Menu;
import catalystsurvival.menu.MenuGame;
import catalystsurvival.tiles.LightLevelNoise;
import catalystsurvival.time.GameTimer;
import catalystsurvival.time.NoSleep;
import catalystsurvival.world.World;
import catalystsurvival.world.chunk.ChunkEventHandler;
import mainloop.manager.MainloopManager;
import projectzombie.audio.AudioEngine;
import projectzombie.audio.AudioSources;
import projectzombie.cheats.Cheats;
import projectzombie.display.DisplayStatsEventHandler;
import projectzombie.display.DisplayWindow;
import projectzombie.entity.EntityEventHandler;
import projectzombie.entity.player.EntityPlayer;
import projectzombie.init.Layers;
import projectzombie.init.Resources;
import projectzombie.init.Sounds;
import projectzombie.init.Textures;
import projectzombie.input.JoystickCallback;
import projectzombie.input.KeyCallback;
import projectzombie.mainloop.MainloopEventHandler;
import projectzombie.menu.Menu;
import projectzombie.menu.MenuGame;
import projectzombie.tiles.LightLevelNoise;
import projectzombie.time.GameTimer;
import projectzombie.time.NoSleep;
import projectzombie.world.World;
import projectzombie.world.chunk.ChunkEventHandler;
public class Main
{
@ -35,6 +35,7 @@ public class Main
public static Random rand = new Random();
public static Menu menu;
public static boolean game_paused = false;
public static int tickrate = 10;
public static void main(String[] args)
{
@ -64,7 +65,7 @@ public class Main
mainloop.register(new NoSleep());
// Create the display
window = new DisplayWindow("ShooterGame");
window = new DisplayWindow("Catalyst Survival");
window.init();
// Initialise the textures

View File

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

View File

@ -1,4 +1,4 @@
package catalystsurvival.audio;
package projectzombie.audio;
import static org.lwjgl.openal.AL10.AL_BUFFER;
import static org.lwjgl.openal.AL10.AL_FORMAT_MONO16;
@ -20,11 +20,11 @@ import java.nio.ShortBuffer;
import org.lwjgl.stb.STBVorbis;
import org.lwjgl.system.MemoryStack;
import catalystsurvival.Main;
import catalystsurvival.resources.Resource;
import catalystsurvival.util.math.MathHelpers;
import catalystsurvival.util.math.vec.Vec2d;
import catalystsurvival.util.math.vec.Vec3d;
import projectzombie.Main;
import projectzombie.resources.Resource;
import projectzombie.util.math.MathHelpers;
import projectzombie.util.math.vec.Vec2d;
import projectzombie.util.math.vec.Vec3d;
public class AudioObject
{

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,15 +1,15 @@
package catalystsurvival.display;
package projectzombie.display;
import catalystsurvival.Main;
import catalystsurvival.display.bossbar.BossBars;
import catalystsurvival.entity.player.EntityPlayer;
import catalystsurvival.init.Textures;
import catalystsurvival.inventory.Inventory;
import catalystsurvival.text.Text;
import catalystsurvival.util.gl.GlHelpers;
import catalystsurvival.util.gl.texture.TextureReference;
import catalystsurvival.util.math.ItemStack;
import catalystsurvival.util.math.vec.Vec2d;
import projectzombie.Main;
import projectzombie.display.bossbar.BossBars;
import projectzombie.entity.player.EntityPlayer;
import projectzombie.init.Textures;
import projectzombie.inventory.Inventory;
import projectzombie.text.Text;
import projectzombie.util.gl.GlHelpers;
import projectzombie.util.gl.texture.TextureReference;
import projectzombie.util.math.ItemStack;
import projectzombie.util.math.vec.Vec2d;
public class DisplayRenderUI
{
@ -32,22 +32,22 @@ public class DisplayRenderUI
// Get some text settings
Vec2d text_size = new Vec2d(0.45, 0.45);
// Render the fps
/*// Render the fps
GlHelpers.pushMatrix();
GlHelpers.translate2(-9.5, 9.5);
GlHelpers.color3(1, 1, 0);
Text.render("FPS: " + DisplayStatsEventHandler.fps, text_size);
GlHelpers.popMatrix();
GlHelpers.popMatrix();*/
if(Main.menu.doGameRender)
{
// Render the fps and the position
/*// Render the fps and the position
GlHelpers.pushMatrix();
GlHelpers.translate2(-9.5, 9);
GlHelpers.color3(1, 1, 0);
Text.render("x: " + (int) player.pos.x + ", y: " + (int) player.pos.y, text_size);
GlHelpers.color3(1, 1, 1);
GlHelpers.popMatrix();
GlHelpers.popMatrix();*/
// Render the healthbar
double max_health = player.maxHealth();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,23 +1,23 @@
package catalystsurvival.entity;
package projectzombie.entity;
import catalystsurvival.Main;
import catalystsurvival.display.Camera;
import catalystsurvival.display.bossbar.BossBars;
import catalystsurvival.display.bossbar.IBossBar;
import catalystsurvival.init.Items;
import catalystsurvival.init.Textures;
import catalystsurvival.init.Tiles;
import catalystsurvival.time.GameTimer;
import catalystsurvival.util.gl.texture.TextureReference;
import catalystsurvival.util.math.ItemStack;
import catalystsurvival.util.math.MathHelpers;
import catalystsurvival.util.math.random.OpenSimplexNoise;
import catalystsurvival.util.math.random.RandomHelpers;
import catalystsurvival.util.math.vec.Vec2d;
import catalystsurvival.util.math.vec.Vec2i;
import catalystsurvival.util.math.vec.Vec3d;
import catalystsurvival.world.chunk.Chunk;
import catalystsurvival.world.layer.Layer;
import projectzombie.Main;
import projectzombie.display.Camera;
import projectzombie.display.bossbar.BossBars;
import projectzombie.display.bossbar.IBossBar;
import projectzombie.init.Items;
import projectzombie.init.Textures;
import projectzombie.init.Tiles;
import projectzombie.time.GameTimer;
import projectzombie.util.gl.texture.TextureReference;
import projectzombie.util.math.ItemStack;
import projectzombie.util.math.MathHelpers;
import projectzombie.util.math.random.OpenSimplexNoise;
import projectzombie.util.math.random.RandomHelpers;
import projectzombie.util.math.vec.Vec2d;
import projectzombie.util.math.vec.Vec2i;
import projectzombie.util.math.vec.Vec3d;
import projectzombie.world.chunk.Chunk;
import projectzombie.world.layer.Layer;
public class EntityBoss extends EntityVertical implements IBossBar
{
@ -54,7 +54,7 @@ public class EntityBoss extends EntityVertical implements IBossBar
double angle = Math.atan2(pos.x - Main.player.pos.x, pos.y - Main.player.pos.y);
this.angle = Math.toDegrees(angle) + 180;
if(this.noise_spawn.eval(GameTimer.getTime() / 5000.0, 0) > 0.2) {
if(this.noise_spawn.eval(GameTimer.getTime() / 500.0, 0) > 0.2) {
if(spawn_frequency == 0) {
int r = 2, m = 1000;
Vec2d zombie_pos = new Vec2d(
@ -73,7 +73,7 @@ public class EntityBoss extends EntityVertical implements IBossBar
spawn_frequency -= 1;
}
if(this.noise_gun.eval(GameTimer.getTime() / 5000.0, 0) > 0 && !Main.player.dead && !Main.player.in_animation) {
if(this.noise_gun.eval(GameTimer.getTime() / 500.0, 0) > 0 && !Main.player.dead && !Main.player.in_animation) {
if(bullet_frequency == 0)
{
@ -100,7 +100,7 @@ public class EntityBoss extends EntityVertical implements IBossBar
bullet_frequency -= 1;
}
if(this.noise_gun.eval(GameTimer.getTime() / 5000.0, 0) > -0.2) {
if(this.noise_gun.eval(GameTimer.getTime() / 500.0, 0) > -0.2) {
this.firing = true;
}
@ -108,7 +108,7 @@ public class EntityBoss extends EntityVertical implements IBossBar
this.firing = false;
}
if(this.noise_walk.eval(GameTimer.getTime() / 5000.0, 0) > -0.4) {
if(this.noise_walk.eval(GameTimer.getTime() / 500.0, 0) > -0.4) {
this.moveForward();
this.moving = true;
}

View File

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

View File

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

View File

@ -1,7 +1,7 @@
package catalystsurvival.entity;
package projectzombie.entity;
import catalystsurvival.Main;
import mainloop.task.IMainloopTask;
import projectzombie.Main;
public class EntityEventHandler implements IMainloopTask
{
@ -9,7 +9,7 @@ public class EntityEventHandler implements IMainloopTask
@Override
public boolean MainLoopDelay(long millis) {
return millis > 10;
return millis > Main.tickrate;
}
@Override

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,15 +1,15 @@
package catalystsurvival.input;
package projectzombie.input;
import static catalystsurvival.input.GameInput.activateItem_last;
import static catalystsurvival.input.GameInput.activateTile_last;
import static catalystsurvival.input.GameInput.dropItem_last;
import static catalystsurvival.input.GameInput.fireGun;
import static catalystsurvival.input.GameInput.hotbar_l;
import static catalystsurvival.input.GameInput.hotbar_r;
import static catalystsurvival.input.GameInput.moveDown;
import static catalystsurvival.input.GameInput.moveUp;
import static catalystsurvival.input.GameInput.move_last;
import static catalystsurvival.input.GameInput.startButton_last;
import static projectzombie.input.GameInput.activateItem_last;
import static projectzombie.input.GameInput.activateTile_last;
import static projectzombie.input.GameInput.dropItem_last;
import static projectzombie.input.GameInput.fireGun;
import static projectzombie.input.GameInput.hotbar_l;
import static projectzombie.input.GameInput.hotbar_r;
import static projectzombie.input.GameInput.moveDown;
import static projectzombie.input.GameInput.moveUp;
import static projectzombie.input.GameInput.move_last;
import static projectzombie.input.GameInput.startButton_last;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
@ -18,9 +18,9 @@ import java.util.ArrayList;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWJoystickCallbackI;
import catalystsurvival.Main;
import catalystsurvival.input.types.Input;
import mainloop.task.IMainloopTask;
import projectzombie.Main;
import projectzombie.input.types.Input;
public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask
{
@ -64,7 +64,7 @@ public class JoystickCallback implements GLFWJoystickCallbackI, IMainloopTask
@Override
public boolean MainLoopDelay(long millis) {
return millis > 10;
return millis > Main.tickrate;
}
@Override

View File

@ -1,11 +1,5 @@
package catalystsurvival.input;
package projectzombie.input;
import static catalystsurvival.input.GameInput.fireGun;
import static catalystsurvival.input.GameInput.moveDown;
import static catalystsurvival.input.GameInput.moveLeft;
import static catalystsurvival.input.GameInput.moveRight;
import static catalystsurvival.input.GameInput.moveUp;
import static catalystsurvival.input.GameInput.move_last;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_1;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_2;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_3;
@ -21,13 +15,19 @@ import static org.lwjgl.glfw.GLFW.GLFW_KEY_Q;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_S;
import static org.lwjgl.glfw.GLFW.GLFW_KEY_W;
import static org.lwjgl.glfw.GLFW.GLFW_RELEASE;
import static projectzombie.input.GameInput.fireGun;
import static projectzombie.input.GameInput.moveDown;
import static projectzombie.input.GameInput.moveLeft;
import static projectzombie.input.GameInput.moveRight;
import static projectzombie.input.GameInput.moveUp;
import static projectzombie.input.GameInput.move_last;
import org.lwjgl.glfw.GLFWKeyCallbackI;
import catalystsurvival.Main;
import catalystsurvival.input.types.Input;
import catalystsurvival.util.math.vec.Vec2d;
import mainloop.task.IMainloopTask;
import projectzombie.Main;
import projectzombie.input.types.Input;
import projectzombie.util.math.vec.Vec2d;
public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask
{
@ -127,7 +127,7 @@ public class KeyCallback implements GLFWKeyCallbackI, IMainloopTask
@Override
public boolean MainLoopDelay(long millis) {
return millis > 10;
return millis > Main.tickrate;
}
@Override

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,11 +1,11 @@
package catalystsurvival.tiles;
package projectzombie.tiles;
import java.util.Random;
import catalystsurvival.time.GameTimer;
import catalystsurvival.util.math.MathHelpers;
import catalystsurvival.util.math.random.OpenSimplexNoise;
import mainloop.task.IMainloopTask;
import projectzombie.time.GameTimer;
import projectzombie.util.math.MathHelpers;
import projectzombie.util.math.random.OpenSimplexNoise;
public class LightLevelNoise implements IMainloopTask
{
@ -17,7 +17,7 @@ public class LightLevelNoise implements IMainloopTask
private static double lantern_noise = 0;
static double getLightLevel(OpenSimplexNoise noise) {
return noise.eval(GameTimer.getTime() / 512.0, 0);
return noise.eval(GameTimer.getTime() / 50.0, 0);
}
static double getLavaLightLevel() {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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