bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor :api structure and move some classes to snippet package

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-22 13:09:41 +01:00
parent 0bf816ce4e
commit b91c67100e
25 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/bartlomiejpluta/base/api/game/animation/Animation.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.game.animation;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.map.layer.base.Layer;
import com.bartlomiejpluta.base.api.game.move.Movable;
import com.bartlomiejpluta.base.api.internal.logic.Updatable;
import com.bartlomiejpluta.base.api.internal.object.Placeable;
import com.bartlomiejpluta.base.api.internal.render.Renderable;

4
api/src/main/java/com/bartlomiejpluta/base/api/game/animation/AnimationDelegate.java
View File

@@ -1,9 +1,9 @@
package com.bartlomiejpluta.base.api.game.animation;
import com.bartlomiejpluta.base.api.game.camera.Camera;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.entity.Movement;
import com.bartlomiejpluta.base.api.game.map.layer.base.Layer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.game.move.Movement;
import com.bartlomiejpluta.base.api.game.screen.Screen;
import com.bartlomiejpluta.base.api.internal.object.Placeable;
import com.bartlomiejpluta.base.api.internal.render.ShaderManager;

2
api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Entity.java
View File

@@ -1,6 +1,8 @@
package com.bartlomiejpluta.base.api.game.entity;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.game.move.Movable;
import com.bartlomiejpluta.base.api.internal.logic.Updatable;
import com.bartlomiejpluta.base.api.internal.object.Placeable;
import com.bartlomiejpluta.base.api.internal.render.Renderable;

2
api/src/main/java/com/bartlomiejpluta/base/api/game/entity/EntityDelegate.java
View File

@@ -2,6 +2,8 @@ package com.bartlomiejpluta.base.api.game.entity;
import com.bartlomiejpluta.base.api.game.camera.Camera;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.game.move.Movement;
import com.bartlomiejpluta.base.api.game.screen.Screen;
import com.bartlomiejpluta.base.api.internal.object.Placeable;
import com.bartlomiejpluta.base.api.internal.render.ShaderManager;

2
api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/ObjectLayer.java
View File

@@ -1,8 +1,8 @@
package com.bartlomiejpluta.base.api.game.map.layer.object;
import com.bartlomiejpluta.base.api.game.entity.Entity;
import com.bartlomiejpluta.base.api.game.entity.Movement;
import com.bartlomiejpluta.base.api.game.map.layer.base.Layer;
import com.bartlomiejpluta.base.api.game.move.Movement;
import com.bartlomiejpluta.base.api.game.rule.Rule;
import org.joml.Vector2ic;

2
api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Direction.java → api/src/main/java/com/bartlomiejpluta/base/api/game/move/Direction.java
View File

@@ -1,4 +1,4 @@
package com.bartlomiejpluta.base.api.game.entity;
package com.bartlomiejpluta.base.api.game.move;
import org.joml.Vector2i;
import org.joml.Vector2ic;

2
api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Movable.java → api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movable.java
View File

@@ -1,4 +1,4 @@
package com.bartlomiejpluta.base.api.game.entity;
package com.bartlomiejpluta.base.api.game.move;
import org.joml.Vector2fc;
import org.joml.Vector2ic;

2
api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Movement.java → api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movement.java
View File

@@ -1,4 +1,4 @@
package com.bartlomiejpluta.base.api.game.entity;
package com.bartlomiejpluta.base.api.game.move;
import org.joml.Vector2ic;

2
api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowEntityAI.java
View File

@@ -2,9 +2,9 @@ package com.bartlomiejpluta.base.api.snippet.ai;
import com.bartlomiejpluta.base.api.game.ai.AI;
import com.bartlomiejpluta.base.api.game.ai.NPC;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.entity.Entity;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.util.pathfinder.PathFinder;
import org.joml.Vector2i;

2
api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowPathAI.java
View File

@@ -2,8 +2,8 @@ package com.bartlomiejpluta.base.api.snippet.ai;
import com.bartlomiejpluta.base.api.game.ai.AI;
import com.bartlomiejpluta.base.api.game.ai.NPC;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.util.path.NPCPath;
import com.bartlomiejpluta.base.api.util.path.PathExecutor;

2
api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/RandomMovementAI.java
View File

@@ -2,8 +2,8 @@ package com.bartlomiejpluta.base.api.snippet.ai;
import com.bartlomiejpluta.base.api.game.ai.AI;
import com.bartlomiejpluta.base.api.game.ai.NPC;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import java.util.Random;

4
api/src/main/java/com/bartlomiejpluta/base/api/util/path/MoveSegment.java
View File

@@ -1,8 +1,8 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.game.move.Movable;
import java.util.Objects;

2
api/src/main/java/com/bartlomiejpluta/base/api/util/path/NPCPath.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.ai.NPC;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.move.Direction;
public class NPCPath extends Path<NPC> {

4
api/src/main/java/com/bartlomiejpluta/base/api/util/path/Path.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.move.Direction;
import com.bartlomiejpluta.base.api.game.move.Movable;
import java.util.ArrayList;
import java.util.List;

2
api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathExecutor.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Movable;
import java.util.List;
import java.util.Objects;

2
api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathSegment.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Movable;
public interface PathSegment<T extends Movable> {
PathProgress perform(T movable, ObjectLayer layer, float dt);

2
api/src/main/java/com/bartlomiejpluta/base/api/util/path/RunSegment.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Movable;
import static java.util.Objects.requireNonNull;

2
api/src/main/java/com/bartlomiejpluta/base/api/util/path/TurnSegment.java
View File

@@ -1,8 +1,8 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.ai.NPC;
import com.bartlomiejpluta.base.api.game.entity.Direction;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Direction;
import static java.util.Objects.requireNonNull;

2
api/src/main/java/com/bartlomiejpluta/base/api/util/path/WaitSegment.java
View File

@@ -1,7 +1,7 @@
package com.bartlomiejpluta.base.api.util.path;
import com.bartlomiejpluta.base.api.game.entity.Movable;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.move.Movable;
public class WaitSegment<T extends Movable> implements PathSegment<T> {
private final float seconds;