studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
austin 2024-07-13 16:00:48 -04:00
parent 0bec1386f1
commit 856e0a6b22
138 changed files with 115 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/electrosphere/client/fluid/cache/FluidChunkData.java vendored
View File

@ -1,8 +1,5 @@
package electrosphere.client.fluid.cache;
import java.util.HashSet;
import java.util.Set;
import org.joml.Vector3i;
import electrosphere.server.terrain.manager.ServerTerrainChunk;

1
src/main/java/electrosphere/client/fluid/cells/FluidCell.java
View File

@ -13,7 +13,6 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.types.fluid.FluidChunk;
import electrosphere.renderer.shader.ShaderProgram;
import electrosphere.renderer.texture.Texture;
import electrosphere.server.terrain.manager.ServerTerrainChunk;
/**

5
src/main/java/electrosphere/client/fluid/editing/FluidEditing.java
View File

@ -1,11 +1,6 @@
package electrosphere.client.fluid.editing;
import org.joml.Vector3d;
import org.joml.Vector3i;
import electrosphere.client.terrain.cache.ChunkData;
import electrosphere.engine.Globals;
import electrosphere.net.parser.net.message.TerrainMessage;
/**
* Utilities for editing fluid from client side of things

1
src/main/java/electrosphere/client/fluid/manager/ClientFluidManager.java
View File

@ -2,7 +2,6 @@ package electrosphere.client.fluid.manager;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;

3
src/main/java/electrosphere/client/foliagemanager/FoliageCell.java
View File

@ -4,7 +4,6 @@ import java.util.HashSet;
import java.util.Set;
import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Quaterniond;
import org.joml.Sphered;
import org.joml.Vector3d;
@ -14,11 +13,9 @@ import org.joml.Vector3i;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.state.foliage.AmbientFoliage;
import electrosphere.entity.types.camera.CameraEntityUtils;
import electrosphere.renderer.OpenGLState;
import electrosphere.renderer.RenderPipelineState;
import electrosphere.renderer.actor.instance.InstancedActor;
import electrosphere.renderer.actor.instance.TextureInstancedActor;
import electrosphere.renderer.buffer.ShaderAttribute;

3
src/main/java/electrosphere/client/scene/ClientWorldData.java
View File

@ -5,8 +5,7 @@ import org.joml.Vector3f;
import org.joml.Vector3i;
/**
*
* @author amaterasu
* Client's data on the world
*/
public class ClientWorldData {

3
src/main/java/electrosphere/client/targeting/crosshair/Crosshair.java
View File

@ -10,8 +10,7 @@ import electrosphere.entity.types.camera.CameraEntityUtils;
import org.joml.Vector3d;
/**
*
* @author amaterasu
* Crosshair logic
*/
public class Crosshair {

1
src/main/java/electrosphere/collision/CollisionWorldData.java
View File

@ -5,7 +5,6 @@ import electrosphere.client.terrain.manager.ClientTerrainManager;
import electrosphere.game.server.world.ServerWorldData;
import electrosphere.server.terrain.manager.ServerTerrainManager;
import org.joml.Vector3d;
import org.joml.Vector3f;
public class CollisionWorldData {

4
src/main/java/electrosphere/collision/collidable/Collidable.java
View File

@ -2,13 +2,9 @@ package electrosphere.collision.collidable;
import electrosphere.entity.Entity;
import electrosphere.entity.state.collidable.Impulse;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Matrix4f;
import org.joml.Vector3f;
/**
* Stores the type of the collidable object as well as the impulses currently applied to it

4
src/main/java/electrosphere/engine/Globals.java
View File

@ -23,7 +23,6 @@ import electrosphere.client.terrain.cells.VoxelTextureAtlas;
import electrosphere.client.terrain.manager.ClientTerrainManager;
import electrosphere.collision.CollisionEngine;
import electrosphere.collision.CollisionWorldData;
import electrosphere.collision.hitbox.HitboxManager;
import electrosphere.controls.CameraHandler;
import electrosphere.controls.ControlCallback;
import electrosphere.controls.ControlHandler;
@ -80,8 +79,7 @@ import electrosphere.server.terrain.manager.ServerTerrainManager;
import electrosphere.util.FileUtils;
/**
*
* @author amaterasu
* Global values
*/
public class Globals {

3
src/main/java/electrosphere/engine/assetmanager/AssetDataStrings.java
View File

@ -1,8 +1,7 @@
package electrosphere.engine.assetmanager;
/**
*
* @author amaterasu
* Assets that should be included by the engine by default or generated
*/
public class AssetDataStrings {
public static final String ASSET_STRING_BITMAP_FONT_MESH_NAME = "quad";

3
src/main/java/electrosphere/engine/assetmanager/PhysicsMeshQueueItem.java
View File

@ -1,8 +1,5 @@
package electrosphere.engine.assetmanager;
import org.ode4j.ode.DSpace;
import org.ode4j.ode.DWorld;
import electrosphere.collision.CollisionEngine;
/**

3
src/main/java/electrosphere/engine/profiler/Profiler.java
View File

@ -1,10 +1,7 @@
package electrosphere.engine.profiler;
import java.nio.IntBuffer;
import org.lwjgl.PointerBuffer;
import org.lwjgl.system.MemoryStack;
import org.lwjgl.system.MemoryUtil;
import org.lwjgl.util.remotery.Remotery;
/**

51
src/main/java/electrosphere/entity/Entity.java
View File

@ -1,57 +1,86 @@
package electrosphere.entity;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import electrosphere.engine.Globals;
/**
*
* @author amaterasu
* An entity
*/
public class Entity {
/**
* The iterator used to assign entities unique ids
*/
static int entity_id_iterator = 0;
/**
* The id of this entity
*/
int id;
/**
* The data associated with this entity
*/
HashMap<String,Object> data;
/**
* Gets the id of this entity
* @return The id
*/
public int getId() {
return id;
}
/**
* Sets the id of this entity
* @param id The id
*/
public void setId(int id){
this.id = id;
}
// HashMap<String, Object> getData() {
// return data;
// }
/**
* Puts some data into this entity
* @param key The key for the data
* @param o The data
*/
public void putData(String key, Object o){
data.put(key,o);
}
/**
* Checks if an entity contains a key
* @param key The key
* @return true if the entity contains the key, false otherwise
*/
public boolean containsKey(String key){
return data.containsKey(key);
}
/**
* Gets some data on the entity
* @param key The key for the data
* @return The data if it exists, null otherwise
*/
public Object getData(String key){
return data.get(key);
}
/**
* Constructs an entity
*/
protected Entity(){
data = new HashMap<String,Object>();
id = entity_id_iterator;
entity_id_iterator++;
}
/**
* Removes data from an entity based on the key of the data
* @param key The key
*/
public void removeData(String key){
data.remove(key);
}

3
src/main/java/electrosphere/entity/EntityDataStrings.java
View File

@ -1,8 +1,7 @@
package electrosphere.entity;
/**
*
* @author amaterasu
* Data strings for entities
*/
public class EntityDataStrings {

3
src/main/java/electrosphere/entity/state/LookAtState.java
View File

@ -3,8 +3,7 @@ package electrosphere.entity.state;
import electrosphere.entity.Entity;
/**
*
* @author amaterasu
* State for looking at items
*/
public class LookAtState {

4
src/main/java/electrosphere/entity/state/ParticleTree.java
View File

@ -1,6 +1,5 @@
package electrosphere.entity.state;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
@ -9,8 +8,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Particle b tree
*/
public class ParticleTree implements BehaviorTree {
Entity parent;

3
src/main/java/electrosphere/entity/state/RagdollTree.java
View File

@ -1,8 +1,7 @@
package electrosphere.entity.state;
/**
*
* @author amaterasu
* Ragdoll b tree
*/
public class RagdollTree {

11
src/main/java/electrosphere/entity/state/collidable/ClientCollidableTree.java
View File

@ -1,14 +1,9 @@
package electrosphere.entity.state.collidable;
import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Quaterniond;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector4d;
import org.ode4j.ode.DBody;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
@ -17,13 +12,9 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.entity.types.item.ItemUtils;
import electrosphere.game.data.collidable.CollidableTemplate;
/**
*
* @author amaterasu
* Client collidable tree
*/
public class ClientCollidableTree implements BehaviorTree {

4
src/main/java/electrosphere/entity/state/collidable/Impulse.java
View File

@ -1,11 +1,9 @@
package electrosphere.entity.state.collidable;
import org.joml.Vector3d;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* An impulse to be applied to a collidable
*/
public class Impulse {

14
src/main/java/electrosphere/entity/state/collidable/ServerCollidableTree.java
View File

@ -8,26 +8,14 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.entity.types.debug.DebugVisualizerUtils;
import electrosphere.entity.types.item.ItemUtils;
import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.utils.DataCellSearchUtils;
import org.joml.Matrix4f;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector4d;
import org.joml.Vector4f;
import org.ode4j.ode.DBody;
/**
*
* @author amaterasu
* Server collidable tree
*/
public class ServerCollidableTree implements BehaviorTree {

3
src/main/java/electrosphere/entity/state/equip/ServerEquipState.java
View File

@ -1,13 +1,10 @@
package electrosphere.entity.state.equip;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;

4
src/main/java/electrosphere/entity/state/foliage/AmbientFoliage.java
View File

@ -1,14 +1,10 @@
package electrosphere.entity.state.foliage;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.types.camera.CameraEntityUtils;
/**
* Behavior tree for ambient foliage. Controls regrowing, wind movement, etc

2
src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
View File

@ -3,12 +3,10 @@ package electrosphere.entity.state.gravity;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody;

2
src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java
View File

@ -13,7 +13,6 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody;
@ -31,7 +30,6 @@ import electrosphere.entity.state.movement.ServerJumpTree;
import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.synchronization.annotation.SyncedField;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.server.datacell.Realm;
@SynchronizedBehaviorTree(name = "serverGravity", isServer = true, correspondingTree="clientGravity")
/**

2
src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java
View File

@ -7,7 +7,6 @@ import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.movement.AirplaneMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
@ -20,7 +19,6 @@ import electrosphere.net.synchronization.annotation.SyncedField;
import electrosphere.net.synchronization.annotation.SynchronizableEnum;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.anim.Animation;

2
src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java
View File

@ -14,13 +14,11 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.game.data.creature.type.CreatureType;
import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.net.synchronization.annotation.SyncedField;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.anim.Animation;
import electrosphere.server.datacell.utils.DataCellSearchUtils;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;

4
src/main/java/electrosphere/entity/state/inventory/InventoryUtils.java
View File

@ -1,7 +1,6 @@
package electrosphere.entity.state.inventory;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
@ -16,12 +15,9 @@ import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.InventoryMessage;
import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.player.Player;
import electrosphere.server.datacell.EntityDataCellMapper;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.datacell.utils.DataCellSearchUtils;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.util.Utilities;
public class InventoryUtils {

6
src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java
View File

@ -2,17 +2,11 @@ package electrosphere.entity.state.inventory;
import java.util.concurrent.CopyOnWriteArrayList;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.equip.ServerEquipState;
import electrosphere.entity.types.item.ItemUtils;
import electrosphere.game.data.creature.type.equip.EquipPoint;
import electrosphere.menu.WindowStrings;
import electrosphere.menu.WindowUtils;
import electrosphere.net.parser.net.message.InventoryMessage;
import electrosphere.net.server.protocol.InventoryProtocol;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;

3
src/main/java/electrosphere/entity/state/life/LifeUtils.java
View File

@ -4,8 +4,7 @@ import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
/**
*
* @author amaterasu
* Utility functions for dealing with life state
*/
public class LifeUtils {

2
src/main/java/electrosphere/entity/state/movement/AirplaneMovementTree.java
View File

@ -3,13 +3,11 @@ package electrosphere.entity.state.movement;
import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;

1
src/main/java/electrosphere/entity/state/movement/ApplyRotationTree.java
View File

@ -1,7 +1,6 @@
package electrosphere.entity.state.movement;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;

5
src/main/java/electrosphere/entity/state/movement/JumpTree.java
View File

@ -1,21 +1,16 @@
package electrosphere.entity.state.movement;
import org.joml.Vector3d;
import org.ode4j.math.DVector3C;
import org.ode4j.ode.DBody;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.gravity.GravityUtils;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.game.data.creature.type.movement.JumpMovementSystem;
import electrosphere.renderer.actor.Actor;

2
src/main/java/electrosphere/entity/state/movement/ProjectileTree.java
View File

@ -1,9 +1,7 @@
package electrosphere.entity.state.movement;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;

1
src/main/java/electrosphere/entity/state/movement/ServerFallTree.java
View File

@ -4,7 +4,6 @@ import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.renderer.actor.Actor;
import electrosphere.server.poseactor.PoseActor;
public class ServerFallTree implements BehaviorTree {

5
src/main/java/electrosphere/entity/state/movement/ServerJumpTree.java
View File

@ -1,19 +1,14 @@
package electrosphere.entity.state.movement;
import org.joml.Vector3d;
import org.ode4j.math.DVector3C;
import org.ode4j.ode.DBody;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.gravity.GravityUtils;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.renderer.actor.Actor;
import electrosphere.server.poseactor.PoseActor;
public class ServerJumpTree implements BehaviorTree {

4
src/main/java/electrosphere/entity/state/movement/ServerSprintTree.java
View File

@ -1,14 +1,12 @@
package electrosphere.entity.state.movement;
import electrosphere.engine.Main;
import electrosphere.entity.Entity;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
/**
*
* @author amaterasu
* Server sprint tree
*/
public class ServerSprintTree implements BehaviorTree {

4
src/main/java/electrosphere/entity/state/movement/SprintTree.java
View File

@ -1,14 +1,12 @@
package electrosphere.entity.state.movement;
import electrosphere.engine.Main;
import electrosphere.entity.Entity;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
/**
*
* @author amaterasu
* Client sprint tree
*/
public class SprintTree implements BehaviorTree {

1
src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
View File

@ -2,7 +2,6 @@ package electrosphere.entity.state.movement.groundmove;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.net.parser.net.message.SynchronizationMessage;

2
src/main/java/electrosphere/entity/state/rotator/RotatorTree.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals;
@ -14,7 +13,6 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.view.ViewUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorBoneRotator;

3
src/main/java/electrosphere/entity/state/rotator/ServerRotatorTree.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals;
@ -14,8 +13,6 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.view.ViewUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorBoneRotator;
import electrosphere.server.poseactor.PoseActor;

3
src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java
View File

@ -13,8 +13,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Camera entity utility functions
*/
public class CameraEntityUtils {

4
src/main/java/electrosphere/entity/types/collision/CollisionObjUtils.java
View File

@ -1,6 +1,5 @@
package electrosphere.entity.types.collision;
import org.joml.Matrix4f;
import org.joml.Quaterniond;
import org.joml.Vector3d;
import org.joml.Vector3f;
@ -19,8 +18,7 @@ import electrosphere.entity.types.attach.AttachUtils;
import electrosphere.server.datacell.Realm;
/**
*
* @author amaterasu
* Collision object utility functions
*/
public class CollisionObjUtils {

11
src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
View File

@ -1,18 +1,10 @@
package electrosphere.entity.types.creature;
import java.util.LinkedList;
import java.util.List;
import org.joml.Matrix4f;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.collision.hitbox.HitboxUtils;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;
@ -26,8 +18,6 @@ import electrosphere.entity.state.attack.ServerAttackTree;
import electrosphere.entity.state.attack.ShooterTree;
import electrosphere.entity.state.block.ClientBlockTree;
import electrosphere.entity.state.block.ServerBlockTree;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.ServerCollidableTree;
import electrosphere.entity.state.equip.ClientEquipState;
import electrosphere.entity.state.equip.ServerEquipState;
import electrosphere.entity.state.gravity.ClientGravityTree;
@ -55,7 +45,6 @@ import electrosphere.entity.state.rotator.RotatorTree;
import electrosphere.entity.state.rotator.ServerRotatorTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.game.data.collidable.HitboxData;
import electrosphere.game.data.creature.type.CreatureType;
import electrosphere.game.data.creature.type.SprintSystem;
import electrosphere.game.data.creature.type.attack.AttackMove;

1
src/main/java/electrosphere/entity/types/debug/DebugVisualizerUtils.java
View File

@ -1,7 +1,6 @@
package electrosphere.entity.types.debug;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;

13
src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java
View File

@ -1,9 +1,5 @@
package electrosphere.entity.types.foliage;
import electrosphere.audio.VirtualAudioSource;
import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;
@ -12,26 +8,17 @@ import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.ServerEntityUtils;
import electrosphere.entity.state.client.ambientaudio.ClientAmbientAudioTree;
import electrosphere.entity.state.idle.ClientIdleTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.entity.types.tree.ProceduralTree;
import electrosphere.game.data.foliage.type.AmbientAudio;
import electrosphere.game.data.foliage.type.FoliageType;
import electrosphere.game.data.foliage.type.PhysicsObject;
import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.player.Player;
import electrosphere.renderer.actor.ActorUtils;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.utils.ServerEntityTagUtils;
import electrosphere.util.Utilities;
import java.util.List;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector4f;
/**
* Utilities for generating foliage

12
src/main/java/electrosphere/entity/types/item/ItemUtils.java
View File

@ -1,20 +1,12 @@
package electrosphere.entity.types.item;
import java.util.LinkedList;
import java.util.List;
import org.joml.Matrix4f;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody;
import org.ode4j.ode.DSpace;
import org.ode4j.ode.DWorld;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.collision.hitbox.HitboxUtils;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;
@ -22,13 +14,10 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.ServerEntityUtils;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.ServerCollidableTree;
import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.state.hitbox.HitboxCollectionState;
import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.game.data.collidable.HitboxData;
import electrosphere.game.data.item.type.EquipWhitelist;
import electrosphere.game.data.item.type.Item;
import electrosphere.game.data.item.type.WeaponData;
@ -38,7 +27,6 @@ import electrosphere.net.server.player.Player;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorUtils;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.server.datacell.utils.ServerEntityTagUtils;
import electrosphere.server.poseactor.PoseActor;

10
src/main/java/electrosphere/entity/types/object/ObjectUtils.java
View File

@ -1,13 +1,9 @@
package electrosphere.entity.types.object;
import org.joml.Matrix4f;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.engine.assetmanager.PhysicsMeshQueueItem;
@ -18,8 +14,6 @@ import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.ServerEntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.ServerCollidableTree;
import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.state.hitbox.HitboxCollectionState;
@ -32,14 +26,10 @@ import electrosphere.entity.state.inventory.UnrelationalInventoryState;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.game.data.object.type.ObjectData;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorUtils;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.server.datacell.utils.ServerEntityTagUtils;
import electrosphere.server.poseactor.PoseActor;
public class ObjectUtils {

3
src/main/java/electrosphere/entity/types/particle/ParticleUtils.java
View File

@ -16,8 +16,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Particle utility functions
*/
public class ParticleUtils {

3
src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java
View File

@ -4,12 +4,9 @@ import java.util.LinkedList;
import java.util.List;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Quaternionfc;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.collision.hitbox.HitboxUtils;
import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;

4
src/main/java/electrosphere/entity/types/structure/StructureUtils.java
View File

@ -1,6 +1,5 @@
package electrosphere.entity.types.structure;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;
@ -22,8 +21,7 @@ import org.joml.Vector3f;
import org.joml.Vector4f;
/**
*
* @author amaterasu
* Structure entity utility functions
*/
public class StructureUtils {

1
src/main/java/electrosphere/entity/types/terrain/TerrainChunk.java
View File

@ -6,7 +6,6 @@ import electrosphere.client.terrain.cells.DrawCell;
import electrosphere.client.terrain.cells.VoxelTextureAtlas;
import electrosphere.client.terrain.manager.ClientTerrainManager;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;
import electrosphere.entity.EntityDataStrings;

10
src/main/java/electrosphere/entity/types/tree/ProceduralTree.java
View File

@ -15,34 +15,24 @@ import org.joml.Vector3f;
import org.joml.Vector4d;
import org.joml.Vector4f;
import org.ode4j.ode.DBody;
import org.ode4j.ode.DCylinder;
import electrosphere.audio.VirtualAudioSource;
import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.entity.DrawableUtils;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.types.attach.AttachUtils;
import electrosphere.entity.types.instance.InstanceTemplate;
import electrosphere.entity.types.instance.InstancedEntityUtils;
import electrosphere.game.data.foliage.type.AmbientAudio;
import electrosphere.game.data.foliage.type.FoliageType;
import electrosphere.game.data.foliage.type.TreeModel;
import electrosphere.renderer.actor.instance.InstancedActor;
import electrosphere.renderer.buffer.ShaderAttribute;
import electrosphere.renderer.buffer.HomogenousUniformBuffer.HomogenousBufferTypes;
import electrosphere.server.datacell.Realm;
import electrosphere.server.poseactor.PoseActor;
import electrosphere.server.poseactor.PoseActorUtils;
/**
* Used for generating procedural trees

3
src/main/java/electrosphere/entity/types/waypoint/WaypointUtils.java
View File

@ -1,8 +1,7 @@
package electrosphere.entity.types.waypoint;
/**
*
* @author amaterasu
* Waypoint entity utility functions
*/
public class WaypointUtils {

3
src/main/java/electrosphere/game/data/creature/type/Animation.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type;
/**
*
* @author amaterasu
* Data about an animation
*/
public class Animation {

3
src/main/java/electrosphere/game/data/creature/type/HealthSystem.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type;
/**
*
* @author amaterasu
* Data about the health of a creature
*/
public class HealthSystem {
int maxHealth;

3
src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type;
/**
*
* @author amaterasu
* Look at behavior and data
*/
public class LookAtSystem {

3
src/main/java/electrosphere/game/data/creature/type/SprintSystem.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type;
/**
*
* @author amaterasu
* Sprint data
*/
public class SprintSystem {
Animation animationStartUp;

3
src/main/java/electrosphere/game/data/creature/type/movement/MovementSystem.java
View File

@ -1,8 +1,5 @@
package electrosphere.game.data.creature.type.movement;
import electrosphere.game.data.creature.type.Animation;
import electrosphere.game.data.creature.type.SprintSystem;
public interface MovementSystem {
public String getType();

3
src/main/java/electrosphere/game/data/foliage/type/PhysicsObject.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.data.foliage.type;
/**
*
* @author amaterasu
* Physics data
*/
public class PhysicsObject {

3
src/main/java/electrosphere/game/data/structure/type/model/CollisionObjectTemplate.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.data.structure.type.model;
/**
*
* @author amaterasu
* Collidable data
*/
public class CollisionObjectTemplate {

3
src/main/java/electrosphere/game/data/structure/type/model/StructureType.java
View File

@ -3,8 +3,7 @@ package electrosphere.game.data.structure.type.model;
import java.util.List;
/**
*
* @author amaterasu
* Structure data
*/
public class StructureType {

3
src/main/java/electrosphere/game/data/structure/type/model/StructureTypeMap.java
View File

@ -3,8 +3,7 @@ package electrosphere.game.data.structure.type.model;
import java.util.List;
/**
*
* @author amaterasu
* Map of name of structure to data about said structure
*/
public class StructureTypeMap {
List<StructureType> structures;

3
src/main/java/electrosphere/game/server/character/Character.java
View File

@ -1,9 +1,6 @@
package electrosphere.game.server.character;
import electrosphere.game.server.character.diety.Diety;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
public class Character {

3
src/main/java/electrosphere/game/server/character/CharacterDataStrings.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.server.character;
/**
*
* @author amaterasu
* Data strings for characters
*/
public class CharacterDataStrings {

4
src/main/java/electrosphere/game/server/character/CharacterUtils.java
View File

@ -1,6 +1,5 @@
package electrosphere.game.server.character;
import electrosphere.game.server.character.Character;
import electrosphere.game.server.character.diety.Diety;
import electrosphere.game.server.race.model.Race;
import electrosphere.game.server.structure.virtual.Structure;
@ -8,8 +7,7 @@ import electrosphere.game.server.town.Town;
import org.joml.Vector2i;
/**
*
* @author amaterasu
* Utility functions for dealing with characters
*/
public class CharacterUtils {

3
src/main/java/electrosphere/game/server/culture/religion/StoryDataStrings.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.server.culture.religion;
/**
*
* @author amaterasu
* Story data strings
*/
public class StoryDataStrings {
/*

3
src/main/java/electrosphere/game/server/effects/ParticleEffects.java
View File

@ -7,8 +7,7 @@ import java.util.Random;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Utility functions for spawning particle effects
*/
public class ParticleEffects {

3
src/main/java/electrosphere/game/server/race/model/Race.java
View File

@ -1,8 +1,7 @@
package electrosphere.game.server.race.model;
/**
*
* @author amaterasu
* The race of a creature
*/
public class Race {

3
src/main/java/electrosphere/game/server/race/model/RaceMap.java
View File

@ -3,8 +3,7 @@ package electrosphere.game.server.race.model;
import java.util.List;
/**
*
* @author amaterasu
* Map of name of race to data about said race
*/
public class RaceMap {

3
src/main/java/electrosphere/game/server/structure/virtual/Structure.java
View File

@ -5,8 +5,7 @@ import java.util.LinkedList;
import java.util.List;
/**
*
* @author amaterasu
* Server representation of a structure
*/
public class Structure {
int worldX;

8
src/main/java/electrosphere/game/server/structure/virtual/StructureManager.java
View File

@ -3,20 +3,14 @@ package electrosphere.game.server.structure.virtual;
import com.google.gson.Gson;
import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.server.db.DatabaseResult;
import electrosphere.server.db.DatabaseResultRow;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
* @author amaterasu
* Manages all server views of structures
*/
public class StructureManager {

7
src/main/java/electrosphere/game/server/structure/virtual/VirtualStructureUtils.java
View File

@ -1,21 +1,16 @@
package electrosphere.game.server.structure.virtual;
import electrosphere.engine.Globals;
import electrosphere.entity.types.structure.StructureUtils;
import electrosphere.game.data.structure.type.model.StructureType;
import electrosphere.game.server.character.Character;
import electrosphere.server.datacell.Realm;
import java.util.LinkedList;
import java.util.List;
import org.joml.Quaternionf;
import org.joml.Vector2f;
import org.joml.Vector3d;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Utility functions for dealing with structures on the server
*/
public class VirtualStructureUtils {

3
src/main/java/electrosphere/game/server/symbolism/model/Symbol.java
View File

@ -3,8 +3,7 @@ package electrosphere.game.server.symbolism.model;
import java.util.List;
/**
*
* @author amaterasu
* A symbol
*/
public class Symbol {
String name;

12
src/main/java/electrosphere/game/server/town/Town.java
View File

@ -1,25 +1,15 @@
package electrosphere.game.server.town;
import electrosphere.game.server.structure.virtual.Structure;
import electrosphere.game.server.structure.virtual.VirtualStructureUtils;
import electrosphere.engine.Globals;
import electrosphere.game.server.character.Character;
import electrosphere.logger.LoggerInterface;
import electrosphere.server.db.DatabaseResult;
import electrosphere.server.terrain.manager.ServerTerrainChunk;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.joml.Vector2i;
/**
*
* @author amaterasu
* Server representation of a town
*/
public class Town {

3
src/main/java/electrosphere/game/server/world/MacroData.java
View File

@ -19,8 +19,7 @@ import java.util.Random;
import org.joml.Vector2i;
/**
*
* @author amaterasu
* Server macro level data
*/
public class MacroData {

6
src/main/java/electrosphere/game/server/world/ServerWorldData.java
View File

@ -1,18 +1,14 @@
package electrosphere.game.server.world;
import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.terrain.manager.ServerTerrainChunk;
import electrosphere.server.terrain.manager.ServerTerrainManager;
import java.util.List;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector3i;
/**
*
* @author amaterasu
* Server data about the world
*/
public class ServerWorldData {

2
src/main/java/electrosphere/game/terrain/processing/TerrainInterpolator.java
View File

@ -1,7 +1,5 @@
package electrosphere.game.terrain.processing;
import java.util.Random;
public class TerrainInterpolator {

28
src/main/java/electrosphere/menu/MenuGenerators.java
View File

@ -2,53 +2,27 @@ package electrosphere.menu;
import java.util.List;
import org.joml.Vector3f;
import electrosphere.auth.AuthenticationManager;
import electrosphere.controls.ControlHandler.ControlsState;
import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.engine.loadingthreads.LoadingThread;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.types.camera.CameraEntityUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.game.data.creature.type.CreatureType;
import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
import electrosphere.menu.mainmenu.MenuGeneratorsKeybind;
import electrosphere.menu.mainmenu.MenuGeneratorsTitleMenu;
import electrosphere.net.NetUtils;
import electrosphere.renderer.RenderingEngine;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorStaticMorph;
import electrosphere.renderer.actor.ActorUtils;
import electrosphere.renderer.model.Model;
import electrosphere.renderer.ui.elements.ActorPanel;
import electrosphere.renderer.ui.elements.Button;
import electrosphere.renderer.ui.elements.Div;
import electrosphere.renderer.ui.elements.FormElement;
import electrosphere.renderer.ui.elements.ImagePanel;
import electrosphere.renderer.ui.elements.Label;
import electrosphere.renderer.ui.elements.ScrollableContainer;
import electrosphere.renderer.ui.elements.Slider;
import electrosphere.renderer.ui.elements.TextInput;
import electrosphere.renderer.ui.elements.Window;
import electrosphere.renderer.ui.elementtypes.ClickableElement;
import electrosphere.renderer.ui.elementtypes.ClickableElement.ClickEventCallback;
import electrosphere.renderer.ui.elementtypes.Element;
import electrosphere.renderer.ui.elementtypes.NavigableElement.NavigationEventCallback;
import electrosphere.renderer.ui.elementtypes.ValueElement.ValueChangeEventCallback;
import electrosphere.renderer.ui.events.ClickEvent;
import electrosphere.renderer.ui.events.NavigationEvent;
import electrosphere.renderer.ui.events.ValueChangeEvent;
import electrosphere.server.saves.SaveUtils;
import electrosphere.server.terrain.generation.OverworldChunkGenerator;
import electrosphere.server.terrain.manager.ServerTerrainManager;
/**
*
* @author amaterasu
* Generator functions for creating menus
*/
public class MenuGenerators {

3
src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsDebug.java
View File

@ -17,8 +17,7 @@ import electrosphere.renderer.ui.elementtypes.Element;
import electrosphere.renderer.ui.events.ClickEvent;
/**
*
* @author amaterasu
* Debug menu generation functions
*/
public class MenuGeneratorsDebug {

3
src/main/java/electrosphere/net/NetUtils.java
View File

@ -6,8 +6,7 @@ import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.EntityMessage;
/**
*
* @author amaterasu
* Utilities for dealing with the net
*/
public class NetUtils {

18
src/main/java/electrosphere/net/client/ClientNetworking.java
View File

@ -1,15 +1,10 @@
package electrosphere.net.client;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.client.protocol.ClientProtocol;
import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.parser.net.message.PlayerMessage;
import electrosphere.net.parser.net.message.ServerMessage;
import electrosphere.net.parser.net.message.NetworkMessage.MessageType;
import electrosphere.net.parser.net.message.ServerMessage.ServerMessageType;
@ -17,24 +12,13 @@ import electrosphere.net.parser.net.raw.NetworkParser;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigInteger;
import java.net.Socket;
import java.net.SocketException;
import java.security.spec.RSAKeyGenParameterSpec;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.crypto.spec.SecretKeySpec;
/**
*
* @author amaterasu
* Client networking thread
*/
public class ClientNetworking implements Runnable{

2
src/main/java/electrosphere/net/client/protocol/AuthProtocol.java
View File

@ -3,9 +3,7 @@ package electrosphere.net.client.protocol;
import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.AuthMessage;
import electrosphere.net.parser.net.message.CharacterMessage;
import electrosphere.net.parser.net.message.LoreMessage;
import electrosphere.net.parser.net.message.TerrainMessage;
public class AuthProtocol {

1
src/main/java/electrosphere/net/client/protocol/PlayerProtocol.java
View File

@ -3,7 +3,6 @@ package electrosphere.net.client.protocol;
import org.joml.Vector3i;
import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.PlayerMessage;
import electrosphere.net.server.player.Player;

3
src/main/java/electrosphere/net/client/protocol/TerrainProtocol.java
View File

@ -3,13 +3,10 @@ package electrosphere.net.client.protocol;
import org.joml.Vector3f;
import electrosphere.client.fluid.cache.FluidChunkData;
import electrosphere.client.scene.ClientWorldData;
import electrosphere.client.terrain.cache.ChunkData;
import electrosphere.collision.CollisionWorldData;
import electrosphere.engine.Globals;
import electrosphere.entity.types.terrain.TerrainChunk;
import electrosphere.entity.types.terrain.TerrainChunkData;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.TerrainMessage;

4
src/main/java/electrosphere/net/monitor/NetMonitor.java
View File

@ -3,8 +3,6 @@ package electrosphere.net.monitor;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@ -12,9 +10,7 @@ import java.util.UUID;
import com.google.gson.Gson;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.client.ClientNetworking;
import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.ServerConnectionHandler;
public class NetMonitor {

4
src/main/java/electrosphere/net/server/player/PlayerManager.java
View File

@ -1,14 +1,12 @@
package electrosphere.net.server.player;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**
*
* @author amaterasu
* Server player manager
*/
public class PlayerManager {

8
src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java
View File

@ -3,25 +3,17 @@ package electrosphere.net.synchronization;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.entity.state.block.ClientBlockTree;
import electrosphere.entity.state.block.ServerBlockTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
import electrosphere.logger.LoggerInterface;
import electrosphere.entity.state.equip.ClientEquipState;
import electrosphere.entity.state.attack.ClientAttackTree;
import electrosphere.entity.state.attack.ServerAttackTree;
import electrosphere.entity.state.equip.ServerEquipState;
import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.state.idle.ServerIdleTree;
import electrosphere.entity.state.idle.ClientIdleTree;
import java.util.LinkedList;

20
src/main/java/electrosphere/renderer/RenderUtils.java
View File

@ -2,12 +2,9 @@ package electrosphere.renderer;
import electrosphere.engine.Globals;
import electrosphere.engine.assetmanager.AssetDataStrings;
import electrosphere.entity.types.camera.CameraEntityUtils;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@ -18,37 +15,22 @@ import electrosphere.renderer.model.Model;
import electrosphere.renderer.shader.ShaderProgram;
import electrosphere.renderer.texture.Texture;
import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Vector3f;
import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.GLFW;
import static org.lwjgl.glfw.GLFW.glfwMakeContextCurrent;
import static org.lwjgl.glfw.GLFW.glfwMaximizeWindow;
import org.lwjgl.opengl.GL11;
import static org.lwjgl.opengl.GL11.GL_FLOAT;
import static org.lwjgl.opengl.GL11.GL_LEQUAL;
import static org.lwjgl.opengl.GL11.GL_LESS;
import static org.lwjgl.opengl.GL11.GL_TRIANGLES;
import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT;
import org.lwjgl.opengl.GL15;
import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER;
import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
import static org.lwjgl.opengl.GL15.glBindBuffer;
import static org.lwjgl.opengl.GL15.glGenBuffers;
import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray;
import static org.lwjgl.opengl.GL20.glGetUniformLocation;
import static org.lwjgl.opengl.GL20.glUniform3fv;
import static org.lwjgl.opengl.GL20.glUniformMatrix4fv;
import static org.lwjgl.opengl.GL20.glUseProgram;
import static org.lwjgl.opengl.GL20.glVertexAttribPointer;
import static org.lwjgl.opengl.GL30.glBindVertexArray;
import static org.lwjgl.opengl.GL30.glGenVertexArrays;
/**
*
* @author amaterasu
* Utilities to assist with rendering
*/
public class RenderUtils {

4
src/main/java/electrosphere/renderer/actor/instance/InstanceData.java
View File

@ -8,10 +8,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NavigableSet;
import java.util.PriorityQueue;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentSkipListSet;
import org.joml.Matrix4d;
import org.joml.Matrix4f;

1
src/main/java/electrosphere/renderer/actor/instance/InstancedActor.java
View File

@ -13,7 +13,6 @@ import org.joml.Vector3f;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.RenderPipelineState;
import electrosphere.renderer.buffer.ShaderAttribute;

7
src/main/java/electrosphere/renderer/anim/AnimChannel.java
View File

@ -1,20 +1,15 @@
package electrosphere.renderer.anim;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.ListIterator;
import java.util.Map;
import java.util.TreeMap;
import java.util.Map.Entry;
import org.joml.Matrix4f;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* A single channel of keyframes in an animation
*/
public class AnimChannel {

3
src/main/java/electrosphere/renderer/anim/AnimNode.java
View File

@ -7,8 +7,7 @@ import org.joml.Matrix4d;
import org.lwjgl.assimp.AINode;
/**
*
* @author amaterasu
* A node that will be animated by an animation
*/
public class AnimNode {
public String id;

6
src/main/java/electrosphere/renderer/anim/Animation.java
View File

@ -4,23 +4,17 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.PriorityQueue;
import org.joml.Matrix4d;
import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.joml.Vector4d;
import org.lwjgl.PointerBuffer;
import org.lwjgl.assimp.AIAnimation;
import org.lwjgl.assimp.AIMeshAnim;
import org.lwjgl.assimp.AIMeshKey;
import org.lwjgl.assimp.AINodeAnim;
import org.lwjgl.assimp.AIQuatKey;
import org.lwjgl.assimp.AIVectorKey;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.loading.ModelPretransforms;
/**
*

3
src/main/java/electrosphere/renderer/anim/Keyframe.java
View File

@ -4,8 +4,7 @@ import org.joml.Quaterniond;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* A single keyframe of a single node within an animation
*/
public class Keyframe implements Comparable<Keyframe>{
double time;

3
src/main/java/electrosphere/renderer/framebuffer/Renderbuffer.java
View File

@ -6,8 +6,7 @@ import static org.lwjgl.opengl.GL30.glDeleteRenderbuffers;
import static org.lwjgl.opengl.GL30.glGenRenderbuffers;
/**
*
* @author amaterasu
* A renderbuffer
*/
public class Renderbuffer {
int renderbuffer;

3
src/main/java/electrosphere/renderer/light/LightEntityUtils.java
View File

@ -10,8 +10,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Utility functions for dealing with entities that create light
*/
public class LightEntityUtils {

3
src/main/java/electrosphere/renderer/light/PointLight.java
View File

@ -3,8 +3,7 @@ package electrosphere.renderer.light;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Data about a point light
*/
public class PointLight {
Vector3f position;

8
src/main/java/electrosphere/renderer/light/SpotLight.java
View File

@ -1,15 +1,9 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package electrosphere.renderer.light;
import org.joml.Vector3f;
/**
*
* @author amaterasu
* Data about a spotlight
*/
public class SpotLight {
Vector3f position;

11
src/main/java/electrosphere/renderer/loading/ModelLoader.java
View File

@ -1,28 +1,17 @@
package electrosphere.renderer.loading;
import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.model.Material;
import electrosphere.renderer.model.Mesh;
import electrosphere.renderer.model.Model;
import electrosphere.renderer.texture.Texture;
import electrosphere.renderer.texture.TextureMap;
import electrosphere.util.FileUtils;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.lwjgl.assimp.AIScene;
import static org.lwjgl.assimp.Assimp.*;

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