diff --git a/src/main/java/com/recom/service/map/cluster/ClusteringService.java b/src/main/java/com/recom/service/map/cluster/ClusteringService.java index f3aca89d..cfadde6c 100644 --- a/src/main/java/com/recom/service/map/cluster/ClusteringService.java +++ b/src/main/java/com/recom/service/map/cluster/ClusteringService.java @@ -14,9 +14,9 @@ import com.recom.service.dbcached.DBCachedService; import com.recom.util.JSNumberUtil; import jakarta.annotation.PostConstruct; -import lib.alphashape.AlphaShapeConcaveHull; -import lib.concavehull.ConcaveHull; -import lib.concavehull.Point; +import lib.clipboard.alphashape.AlphaShapeConcaveHull; +import lib.clipboard.concavehull.ConcaveHull; +import lib.clipboard.concavehull.Point; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/lib/alphashape/AlphaShapeConcaveHull.java b/src/main/java/lib/clipboard/alphashape/AlphaShapeConcaveHull.java similarity index 98% rename from src/main/java/lib/alphashape/AlphaShapeConcaveHull.java rename to src/main/java/lib/clipboard/alphashape/AlphaShapeConcaveHull.java index 13e5027d..3ee1b074 100644 --- a/src/main/java/lib/alphashape/AlphaShapeConcaveHull.java +++ b/src/main/java/lib/clipboard/alphashape/AlphaShapeConcaveHull.java @@ -1,6 +1,6 @@ -package lib.alphashape; +package lib.clipboard.alphashape; -import lib.concavehull.Point; +import lib.clipboard.concavehull.Point; import lombok.NonNull; import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; diff --git a/src/main/java/lib/alphashape/QuickHull.java b/src/main/java/lib/clipboard/alphashape/QuickHull.java similarity index 98% rename from src/main/java/lib/alphashape/QuickHull.java rename to src/main/java/lib/clipboard/alphashape/QuickHull.java index 3e728e04..b3528ea1 100644 --- a/src/main/java/lib/alphashape/QuickHull.java +++ b/src/main/java/lib/clipboard/alphashape/QuickHull.java @@ -1,8 +1,8 @@ -package lib.alphashape; +package lib.clipboard.alphashape; import java.util.ArrayList; import java.util.List; -import lib.concavehull.Point; +import lib.clipboard.concavehull.Point; public class QuickHull { diff --git a/src/main/java/lib/concavehull/ConcaveHull.java b/src/main/java/lib/clipboard/concavehull/ConcaveHull.java similarity index 99% rename from src/main/java/lib/concavehull/ConcaveHull.java rename to src/main/java/lib/clipboard/concavehull/ConcaveHull.java index 131ea93a..c8da3484 100644 --- a/src/main/java/lib/concavehull/ConcaveHull.java +++ b/src/main/java/lib/clipboard/concavehull/ConcaveHull.java @@ -1,4 +1,4 @@ -package lib.concavehull; +package lib.clipboard.concavehull; import lombok.NoArgsConstructor; import lombok.NonNull; diff --git a/src/main/java/lib/concavehull/DistancedPoint.java b/src/main/java/lib/clipboard/concavehull/DistancedPoint.java similarity index 86% rename from src/main/java/lib/concavehull/DistancedPoint.java rename to src/main/java/lib/clipboard/concavehull/DistancedPoint.java index a9a96fa3..b5f201e4 100644 --- a/src/main/java/lib/concavehull/DistancedPoint.java +++ b/src/main/java/lib/clipboard/concavehull/DistancedPoint.java @@ -1,4 +1,4 @@ -package lib.concavehull; +package lib.clipboard.concavehull; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/lib/concavehull/LICENSE.md b/src/main/java/lib/clipboard/concavehull/LICENSE.md similarity index 100% rename from src/main/java/lib/concavehull/LICENSE.md rename to src/main/java/lib/clipboard/concavehull/LICENSE.md diff --git a/src/main/java/lib/concavehull/Point.java b/src/main/java/lib/clipboard/concavehull/Point.java similarity index 95% rename from src/main/java/lib/concavehull/Point.java rename to src/main/java/lib/clipboard/concavehull/Point.java index e657d56a..48c12317 100644 --- a/src/main/java/lib/concavehull/Point.java +++ b/src/main/java/lib/clipboard/concavehull/Point.java @@ -1,4 +1,4 @@ -package lib.concavehull; +package lib.clipboard.concavehull; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/lib/concavehull/README.md b/src/main/java/lib/clipboard/concavehull/README.md similarity index 100% rename from src/main/java/lib/concavehull/README.md rename to src/main/java/lib/clipboard/concavehull/README.md diff --git a/src/main/java/lib/goap/UnperformableActionException.java b/src/main/java/lib/clipboard/goap/UnperformableActionException.java similarity index 94% rename from src/main/java/lib/goap/UnperformableActionException.java rename to src/main/java/lib/clipboard/goap/UnperformableActionException.java index 6c0a6b02..ea7a1c6c 100644 --- a/src/main/java/lib/goap/UnperformableActionException.java +++ b/src/main/java/lib/clipboard/goap/UnperformableActionException.java @@ -1,4 +1,4 @@ -package lib.goap; +package lib.clipboard.goap; /** * UnperformableActionException.java --- Exception raised when an Action could diff --git a/src/main/java/lib/goap/action/GoapActionBase.java b/src/main/java/lib/clipboard/goap/action/GoapActionBase.java similarity index 97% rename from src/main/java/lib/goap/action/GoapActionBase.java rename to src/main/java/lib/clipboard/goap/action/GoapActionBase.java index bae69871..54c5c4e3 100644 --- a/src/main/java/lib/goap/action/GoapActionBase.java +++ b/src/main/java/lib/clipboard/goap/action/GoapActionBase.java @@ -1,8 +1,8 @@ -package lib.goap.action; +package lib.clipboard.goap.action; -import lib.goap.state.GoapState; -import lib.goap.target.GoapTargetable; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.target.GoapTargetable; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/goap/agent/FSMPlanEventListenable.java b/src/main/java/lib/clipboard/goap/agent/FSMPlanEventListenable.java similarity index 85% rename from src/main/java/lib/goap/agent/FSMPlanEventListenable.java rename to src/main/java/lib/clipboard/goap/agent/FSMPlanEventListenable.java index 933feb4f..86c95276 100644 --- a/src/main/java/lib/goap/agent/FSMPlanEventListenable.java +++ b/src/main/java/lib/clipboard/goap/agent/FSMPlanEventListenable.java @@ -1,6 +1,6 @@ -package lib.goap.agent; +package lib.clipboard.goap.agent; -import lib.goap.action.GoapActionBase; +import lib.clipboard.goap.action.GoapActionBase; import lombok.NonNull; import java.util.Queue; diff --git a/src/main/java/lib/goap/agent/GoapAgent.java b/src/main/java/lib/clipboard/goap/agent/GoapAgent.java similarity index 59% rename from src/main/java/lib/goap/agent/GoapAgent.java rename to src/main/java/lib/clipboard/goap/agent/GoapAgent.java index 568fda5e..d61df0e2 100644 --- a/src/main/java/lib/goap/agent/GoapAgent.java +++ b/src/main/java/lib/clipboard/goap/agent/GoapAgent.java @@ -1,8 +1,8 @@ -package lib.goap.agent; +package lib.clipboard.goap.agent; -import lib.goap.unit.IGoapUnit; -import lib.goap.planner.GoapPlanner; -import lib.goap.planner.GoapPlannerable; +import lib.clipboard.goap.planner.GoapPlanner; +import lib.clipboard.goap.unit.IGoapUnit; +import lib.clipboard.goap.planner.GoapPlannerable; import lombok.NonNull; public class GoapAgent extends GoapAgentBase { diff --git a/src/main/java/lib/goap/agent/GoapAgentBase.java b/src/main/java/lib/clipboard/goap/agent/GoapAgentBase.java similarity index 83% rename from src/main/java/lib/goap/agent/GoapAgentBase.java rename to src/main/java/lib/clipboard/goap/agent/GoapAgentBase.java index 1bd1a229..14732e13 100644 --- a/src/main/java/lib/goap/agent/GoapAgentBase.java +++ b/src/main/java/lib/clipboard/goap/agent/GoapAgentBase.java @@ -1,12 +1,12 @@ -package lib.goap.agent; +package lib.clipboard.goap.agent; -import lib.goap.action.GoapActionBase; -import lib.goap.state.GoapState; -import lib.goap.fsm.FSM; -import lib.goap.fsm.states.IdleState; -import lib.goap.fsm.states.PerformActionState; -import lib.goap.planner.GoapPlannerable; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.fsm.FSM; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.fsm.states.IdleState; +import lib.clipboard.goap.fsm.states.PerformActionState; +import lib.clipboard.goap.planner.GoapPlannerable; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/goap/agent/ImportantUnitChangeEventListenable.java b/src/main/java/lib/clipboard/goap/agent/ImportantUnitChangeEventListenable.java similarity index 92% rename from src/main/java/lib/goap/agent/ImportantUnitChangeEventListenable.java rename to src/main/java/lib/clipboard/goap/agent/ImportantUnitChangeEventListenable.java index d2b36feb..f1b28c65 100644 --- a/src/main/java/lib/goap/agent/ImportantUnitChangeEventListenable.java +++ b/src/main/java/lib/clipboard/goap/agent/ImportantUnitChangeEventListenable.java @@ -1,6 +1,6 @@ -package lib.goap.agent; +package lib.clipboard.goap.agent; -import lib.goap.state.GoapState; +import lib.clipboard.goap.state.GoapState; public interface ImportantUnitChangeEventListenable { diff --git a/src/main/java/lib/goap/agent/PlanCreatedEventListenable.java b/src/main/java/lib/clipboard/goap/agent/PlanCreatedEventListenable.java similarity index 84% rename from src/main/java/lib/goap/agent/PlanCreatedEventListenable.java rename to src/main/java/lib/clipboard/goap/agent/PlanCreatedEventListenable.java index 862fb155..3efa9615 100644 --- a/src/main/java/lib/goap/agent/PlanCreatedEventListenable.java +++ b/src/main/java/lib/clipboard/goap/agent/PlanCreatedEventListenable.java @@ -1,6 +1,6 @@ -package lib.goap.agent; +package lib.clipboard.goap.agent; -import lib.goap.action.GoapActionBase; +import lib.clipboard.goap.action.GoapActionBase; import java.util.Queue; diff --git a/src/main/java/lib/goap/fsm/FSM.java b/src/main/java/lib/clipboard/goap/fsm/FSM.java similarity index 88% rename from src/main/java/lib/goap/fsm/FSM.java rename to src/main/java/lib/clipboard/goap/fsm/FSM.java index ab938be4..216c6cf3 100644 --- a/src/main/java/lib/goap/fsm/FSM.java +++ b/src/main/java/lib/clipboard/goap/fsm/FSM.java @@ -1,10 +1,10 @@ -package lib.goap.fsm; +package lib.clipboard.goap.fsm; -import lib.goap.action.GoapActionBase; -import lib.goap.agent.FSMPlanEventListenable; -import lib.goap.fsm.states.FSMStateful; -import lib.goap.fsm.states.PerformActionState; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.agent.FSMPlanEventListenable; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.fsm.states.FSMStateful; +import lib.clipboard.goap.fsm.states.PerformActionState; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NoArgsConstructor; import lombok.NonNull; diff --git a/src/main/java/lib/goap/fsm/states/FSMStateful.java b/src/main/java/lib/clipboard/goap/fsm/states/FSMStateful.java similarity index 88% rename from src/main/java/lib/goap/fsm/states/FSMStateful.java rename to src/main/java/lib/clipboard/goap/fsm/states/FSMStateful.java index 2ea4fed2..6f4607c7 100644 --- a/src/main/java/lib/goap/fsm/states/FSMStateful.java +++ b/src/main/java/lib/clipboard/goap/fsm/states/FSMStateful.java @@ -1,6 +1,6 @@ -package lib.goap.fsm.states; +package lib.clipboard.goap.fsm.states; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NonNull; public interface FSMStateful { diff --git a/src/main/java/lib/goap/fsm/states/IdleState.java b/src/main/java/lib/clipboard/goap/fsm/states/IdleState.java similarity index 86% rename from src/main/java/lib/goap/fsm/states/IdleState.java rename to src/main/java/lib/clipboard/goap/fsm/states/IdleState.java index 5a67f4dd..ff088d53 100644 --- a/src/main/java/lib/goap/fsm/states/IdleState.java +++ b/src/main/java/lib/clipboard/goap/fsm/states/IdleState.java @@ -1,9 +1,9 @@ -package lib.goap.fsm.states; +package lib.clipboard.goap.fsm.states; -import lib.goap.action.GoapActionBase; -import lib.goap.agent.PlanCreatedEventListenable; -import lib.goap.planner.GoapPlannerable; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.agent.PlanCreatedEventListenable; +import lib.clipboard.goap.planner.GoapPlannerable; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NonNull; import java.util.ArrayList; diff --git a/src/main/java/lib/goap/fsm/states/MoveToState.java b/src/main/java/lib/clipboard/goap/fsm/states/MoveToState.java similarity index 88% rename from src/main/java/lib/goap/fsm/states/MoveToState.java rename to src/main/java/lib/clipboard/goap/fsm/states/MoveToState.java index 81fc90b1..6c39b658 100644 --- a/src/main/java/lib/goap/fsm/states/MoveToState.java +++ b/src/main/java/lib/clipboard/goap/fsm/states/MoveToState.java @@ -1,7 +1,7 @@ -package lib.goap.fsm.states; +package lib.clipboard.goap.fsm.states; -import lib.goap.action.GoapActionBase; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/lib/goap/fsm/states/PerformActionState.java b/src/main/java/lib/clipboard/goap/fsm/states/PerformActionState.java similarity index 91% rename from src/main/java/lib/goap/fsm/states/PerformActionState.java rename to src/main/java/lib/clipboard/goap/fsm/states/PerformActionState.java index e1e6b098..24d00232 100644 --- a/src/main/java/lib/goap/fsm/states/PerformActionState.java +++ b/src/main/java/lib/clipboard/goap/fsm/states/PerformActionState.java @@ -1,9 +1,9 @@ -package lib.goap.fsm.states; +package lib.clipboard.goap.fsm.states; -import lib.goap.action.GoapActionBase; -import lib.goap.UnperformableActionException; -import lib.goap.fsm.FSM; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.fsm.FSM; +import lib.clipboard.goap.unit.IGoapUnit; +import lib.clipboard.goap.UnperformableActionException; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/goap/graph/DirectedGraph.java b/src/main/java/lib/clipboard/goap/graph/DirectedGraph.java similarity index 98% rename from src/main/java/lib/goap/graph/DirectedGraph.java rename to src/main/java/lib/clipboard/goap/graph/DirectedGraph.java index 51b96a92..83b7b393 100644 --- a/src/main/java/lib/goap/graph/DirectedGraph.java +++ b/src/main/java/lib/clipboard/goap/graph/DirectedGraph.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.NoArgsConstructor; import lombok.NonNull; diff --git a/src/main/java/lib/goap/graph/DirectedWeightedGraph.java b/src/main/java/lib/clipboard/goap/graph/DirectedWeightedGraph.java similarity index 93% rename from src/main/java/lib/goap/graph/DirectedWeightedGraph.java rename to src/main/java/lib/clipboard/goap/graph/DirectedWeightedGraph.java index d893d0f7..46febc16 100644 --- a/src/main/java/lib/goap/graph/DirectedWeightedGraph.java +++ b/src/main/java/lib/clipboard/goap/graph/DirectedWeightedGraph.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.NonNull; diff --git a/src/main/java/lib/clipboard/goap/graph/Edge.java b/src/main/java/lib/clipboard/goap/graph/Edge.java new file mode 100644 index 00000000..623293af --- /dev/null +++ b/src/main/java/lib/clipboard/goap/graph/Edge.java @@ -0,0 +1,5 @@ +package lib.clipboard.goap.graph; + +public class Edge { + +} diff --git a/src/main/java/lib/goap/graph/IGraph.java b/src/main/java/lib/clipboard/goap/graph/IGraph.java similarity index 98% rename from src/main/java/lib/goap/graph/IGraph.java rename to src/main/java/lib/clipboard/goap/graph/IGraph.java index 7ee150ec..71f3b528 100644 --- a/src/main/java/lib/goap/graph/IGraph.java +++ b/src/main/java/lib/clipboard/goap/graph/IGraph.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.NonNull; import org.springframework.lang.Nullable; diff --git a/src/main/java/lib/goap/graph/IWeightedGraph.java b/src/main/java/lib/clipboard/goap/graph/IWeightedGraph.java similarity index 95% rename from src/main/java/lib/goap/graph/IWeightedGraph.java rename to src/main/java/lib/clipboard/goap/graph/IWeightedGraph.java index 4fa07731..b244fe79 100644 --- a/src/main/java/lib/goap/graph/IWeightedGraph.java +++ b/src/main/java/lib/clipboard/goap/graph/IWeightedGraph.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.NonNull; diff --git a/src/main/java/lib/goap/graph/Node.java b/src/main/java/lib/clipboard/goap/graph/Node.java similarity index 97% rename from src/main/java/lib/goap/graph/Node.java rename to src/main/java/lib/clipboard/goap/graph/Node.java index 258e7672..e95412a0 100644 --- a/src/main/java/lib/goap/graph/Node.java +++ b/src/main/java/lib/clipboard/goap/graph/Node.java @@ -1,8 +1,8 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; -import lib.goap.action.GoapActionBase; -import lib.goap.state.GoapState; -import lib.goap.state.WorldAspect; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.state.WorldAspect; import lombok.Getter; import lombok.NonNull; import org.springframework.lang.Nullable; diff --git a/src/main/java/lib/goap/graph/Path.java b/src/main/java/lib/clipboard/goap/graph/Path.java similarity index 92% rename from src/main/java/lib/goap/graph/Path.java rename to src/main/java/lib/clipboard/goap/graph/Path.java index 8602d87c..360215bc 100644 --- a/src/main/java/lib/goap/graph/Path.java +++ b/src/main/java/lib/clipboard/goap/graph/Path.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/lib/goap/graph/PathFactory.java b/src/main/java/lib/clipboard/goap/graph/PathFactory.java similarity index 99% rename from src/main/java/lib/goap/graph/PathFactory.java rename to src/main/java/lib/clipboard/goap/graph/PathFactory.java index 02013823..88018fdb 100644 --- a/src/main/java/lib/goap/graph/PathFactory.java +++ b/src/main/java/lib/clipboard/goap/graph/PathFactory.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.NonNull; import org.springframework.lang.Nullable; diff --git a/src/main/java/lib/goap/graph/WeightedEdge.java b/src/main/java/lib/clipboard/goap/graph/WeightedEdge.java similarity index 87% rename from src/main/java/lib/goap/graph/WeightedEdge.java rename to src/main/java/lib/clipboard/goap/graph/WeightedEdge.java index f5aaa895..7bc9f3ed 100644 --- a/src/main/java/lib/goap/graph/WeightedEdge.java +++ b/src/main/java/lib/clipboard/goap/graph/WeightedEdge.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/lib/goap/graph/WeightedPath.java b/src/main/java/lib/clipboard/goap/graph/WeightedPath.java similarity index 94% rename from src/main/java/lib/goap/graph/WeightedPath.java rename to src/main/java/lib/clipboard/goap/graph/WeightedPath.java index b4599d56..8a45abf8 100644 --- a/src/main/java/lib/goap/graph/WeightedPath.java +++ b/src/main/java/lib/clipboard/goap/graph/WeightedPath.java @@ -1,4 +1,4 @@ -package lib.goap.graph; +package lib.clipboard.goap.graph; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/goap/planner/GoapPlanner.java b/src/main/java/lib/clipboard/goap/planner/GoapPlanner.java similarity index 50% rename from src/main/java/lib/goap/planner/GoapPlanner.java rename to src/main/java/lib/clipboard/goap/planner/GoapPlanner.java index 146eed6b..3f48525b 100644 --- a/src/main/java/lib/goap/planner/GoapPlanner.java +++ b/src/main/java/lib/clipboard/goap/planner/GoapPlanner.java @@ -1,10 +1,10 @@ -package lib.goap.planner; +package lib.clipboard.goap.planner; -import lib.goap.graph.DirectedWeightedGraph; -import lib.goap.graph.IWeightedGraph; -import lib.goap.graph.WeightedEdge; -import lib.goap.graph.Node; +import lib.clipboard.goap.graph.DirectedWeightedGraph; +import lib.clipboard.goap.graph.IWeightedGraph; +import lib.clipboard.goap.graph.WeightedEdge; +import lib.clipboard.goap.graph.Node; public class GoapPlanner extends GoapPlannerBase { diff --git a/src/main/java/lib/goap/planner/GoapPlannerBase.java b/src/main/java/lib/clipboard/goap/planner/GoapPlannerBase.java similarity index 98% rename from src/main/java/lib/goap/planner/GoapPlannerBase.java rename to src/main/java/lib/clipboard/goap/planner/GoapPlannerBase.java index d248cf5e..f5da4bcd 100644 --- a/src/main/java/lib/goap/planner/GoapPlannerBase.java +++ b/src/main/java/lib/clipboard/goap/planner/GoapPlannerBase.java @@ -1,12 +1,11 @@ -package lib.goap.planner; +package lib.clipboard.goap.planner; -import lib.goap.action.GoapActionBase; -import lib.goap.graph.*; -import lib.goap.state.GoapState; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.graph.*; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.Getter; import lombok.NonNull; -import org.hibernate.mapping.Array; import org.springframework.lang.Nullable; import java.util.*; diff --git a/src/main/java/lib/goap/planner/GoapPlannerable.java b/src/main/java/lib/clipboard/goap/planner/GoapPlannerable.java similarity index 76% rename from src/main/java/lib/goap/planner/GoapPlannerable.java rename to src/main/java/lib/clipboard/goap/planner/GoapPlannerable.java index a28249ed..96fa1aba 100644 --- a/src/main/java/lib/goap/planner/GoapPlannerable.java +++ b/src/main/java/lib/clipboard/goap/planner/GoapPlannerable.java @@ -1,7 +1,7 @@ -package lib.goap.planner; +package lib.clipboard.goap.planner; -import lib.goap.action.GoapActionBase; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NonNull; import java.util.Queue; diff --git a/src/main/java/lib/goap/state/GoapState.java b/src/main/java/lib/clipboard/goap/state/GoapState.java similarity index 97% rename from src/main/java/lib/goap/state/GoapState.java rename to src/main/java/lib/clipboard/goap/state/GoapState.java index f4c30fb0..8f4760e4 100644 --- a/src/main/java/lib/goap/state/GoapState.java +++ b/src/main/java/lib/clipboard/goap/state/GoapState.java @@ -1,4 +1,4 @@ -package lib.goap.state; +package lib.clipboard.goap.state; import lombok.Data; import lombok.NonNull; diff --git a/src/main/java/lib/goap/state/Important.java b/src/main/java/lib/clipboard/goap/state/Important.java similarity index 64% rename from src/main/java/lib/goap/state/Important.java rename to src/main/java/lib/clipboard/goap/state/Important.java index 298bbe67..2de6deb2 100644 --- a/src/main/java/lib/goap/state/Important.java +++ b/src/main/java/lib/clipboard/goap/state/Important.java @@ -1,4 +1,4 @@ -package lib.goap.state; +package lib.clipboard.goap.state; public interface Important { diff --git a/src/main/java/lib/goap/state/Stateful.java b/src/main/java/lib/clipboard/goap/state/Stateful.java similarity index 70% rename from src/main/java/lib/goap/state/Stateful.java rename to src/main/java/lib/clipboard/goap/state/Stateful.java index 18fdefe5..3d84db62 100644 --- a/src/main/java/lib/goap/state/Stateful.java +++ b/src/main/java/lib/clipboard/goap/state/Stateful.java @@ -1,4 +1,4 @@ -package lib.goap.state; +package lib.clipboard.goap.state; public interface Stateful { diff --git a/src/main/java/lib/goap/state/WorldAspect.java b/src/main/java/lib/clipboard/goap/state/WorldAspect.java similarity index 60% rename from src/main/java/lib/goap/state/WorldAspect.java rename to src/main/java/lib/clipboard/goap/state/WorldAspect.java index 02f2777d..f0081613 100644 --- a/src/main/java/lib/goap/state/WorldAspect.java +++ b/src/main/java/lib/clipboard/goap/state/WorldAspect.java @@ -1,4 +1,4 @@ -package lib.goap.state; +package lib.clipboard.goap.state; public interface WorldAspect extends Stateful { diff --git a/src/main/java/lib/goap/target/GoapTargetable.java b/src/main/java/lib/clipboard/goap/target/GoapTargetable.java similarity index 51% rename from src/main/java/lib/goap/target/GoapTargetable.java rename to src/main/java/lib/clipboard/goap/target/GoapTargetable.java index 4f4295c7..b5b502f0 100644 --- a/src/main/java/lib/goap/target/GoapTargetable.java +++ b/src/main/java/lib/clipboard/goap/target/GoapTargetable.java @@ -1,4 +1,4 @@ -package lib.goap.target; +package lib.clipboard.goap.target; public interface GoapTargetable { } diff --git a/src/main/java/lib/goap/target/NullTarget.java b/src/main/java/lib/clipboard/goap/target/NullTarget.java similarity index 61% rename from src/main/java/lib/goap/target/NullTarget.java rename to src/main/java/lib/clipboard/goap/target/NullTarget.java index f93e43a5..9b0e39c2 100644 --- a/src/main/java/lib/goap/target/NullTarget.java +++ b/src/main/java/lib/clipboard/goap/target/NullTarget.java @@ -1,4 +1,4 @@ -package lib.goap.target; +package lib.clipboard.goap.target; public class NullTarget implements GoapTargetable { } diff --git a/src/main/java/lib/goap/unit/GoapUnitBase.java b/src/main/java/lib/clipboard/goap/unit/GoapUnitBase.java similarity index 94% rename from src/main/java/lib/goap/unit/GoapUnitBase.java rename to src/main/java/lib/clipboard/goap/unit/GoapUnitBase.java index 9594ac61..194802e3 100644 --- a/src/main/java/lib/goap/unit/GoapUnitBase.java +++ b/src/main/java/lib/clipboard/goap/unit/GoapUnitBase.java @@ -1,9 +1,9 @@ -package lib.goap.unit; +package lib.clipboard.goap.unit; -import lib.goap.action.GoapActionBase; -import lib.goap.agent.ImportantUnitChangeEventListenable; -import lib.goap.state.GoapState; -import lib.goap.state.WorldAspect; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.agent.ImportantUnitChangeEventListenable; +import lib.clipboard.goap.state.WorldAspect; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.NonNull; diff --git a/src/main/java/lib/goap/unit/IGoapUnit.java b/src/main/java/lib/clipboard/goap/unit/IGoapUnit.java similarity index 85% rename from src/main/java/lib/goap/unit/IGoapUnit.java rename to src/main/java/lib/clipboard/goap/unit/IGoapUnit.java index 146427f0..d1654b83 100644 --- a/src/main/java/lib/goap/unit/IGoapUnit.java +++ b/src/main/java/lib/clipboard/goap/unit/IGoapUnit.java @@ -1,9 +1,9 @@ -package lib.goap.unit; +package lib.clipboard.goap.unit; -import lib.goap.action.GoapActionBase; -import lib.goap.agent.ImportantUnitChangeEventListenable; -import lib.goap.state.GoapState; -import lib.goap.state.WorldAspect; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.agent.ImportantUnitChangeEventListenable; +import lib.clipboard.goap.state.WorldAspect; import lombok.NonNull; import java.util.List; diff --git a/src/main/java/lib/graph/BaseGraph.java b/src/main/java/lib/clipboard/graph/BaseGraph.java similarity index 98% rename from src/main/java/lib/graph/BaseGraph.java rename to src/main/java/lib/clipboard/graph/BaseGraph.java index cf7ff042..ce4ed85f 100644 --- a/src/main/java/lib/graph/BaseGraph.java +++ b/src/main/java/lib/clipboard/graph/BaseGraph.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.NonNull; diff --git a/src/main/java/lib/graph/DijkstraNode.java b/src/main/java/lib/clipboard/graph/DijkstraNode.java similarity index 94% rename from src/main/java/lib/graph/DijkstraNode.java rename to src/main/java/lib/clipboard/graph/DijkstraNode.java index 96ac3f97..bd996d94 100644 --- a/src/main/java/lib/graph/DijkstraNode.java +++ b/src/main/java/lib/clipboard/graph/DijkstraNode.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/graph/DijkstraResult.java b/src/main/java/lib/clipboard/graph/DijkstraResult.java similarity index 89% rename from src/main/java/lib/graph/DijkstraResult.java rename to src/main/java/lib/clipboard/graph/DijkstraResult.java index d6239287..eaec5066 100644 --- a/src/main/java/lib/graph/DijkstraResult.java +++ b/src/main/java/lib/clipboard/graph/DijkstraResult.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/lib/graph/Edge.java b/src/main/java/lib/clipboard/graph/Edge.java similarity index 92% rename from src/main/java/lib/graph/Edge.java rename to src/main/java/lib/clipboard/graph/Edge.java index fe83526d..dbf37c72 100644 --- a/src/main/java/lib/graph/Edge.java +++ b/src/main/java/lib/clipboard/graph/Edge.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.NonNull; diff --git a/src/main/java/lib/graph/UnweightedGraph.java b/src/main/java/lib/clipboard/graph/UnweightedGraph.java similarity index 96% rename from src/main/java/lib/graph/UnweightedGraph.java rename to src/main/java/lib/clipboard/graph/UnweightedGraph.java index ccb5564a..7d7d7375 100644 --- a/src/main/java/lib/graph/UnweightedGraph.java +++ b/src/main/java/lib/clipboard/graph/UnweightedGraph.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.NonNull; diff --git a/src/main/java/lib/graph/WeightedEdge.java b/src/main/java/lib/clipboard/graph/WeightedEdge.java similarity index 96% rename from src/main/java/lib/graph/WeightedEdge.java rename to src/main/java/lib/clipboard/graph/WeightedEdge.java index d3ebe8ad..c4001f08 100644 --- a/src/main/java/lib/graph/WeightedEdge.java +++ b/src/main/java/lib/clipboard/graph/WeightedEdge.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.Getter; diff --git a/src/main/java/lib/graph/WeightedGraph.java b/src/main/java/lib/clipboard/graph/WeightedGraph.java similarity index 98% rename from src/main/java/lib/graph/WeightedGraph.java rename to src/main/java/lib/clipboard/graph/WeightedGraph.java index 00815dbd..5028f261 100644 --- a/src/main/java/lib/graph/WeightedGraph.java +++ b/src/main/java/lib/clipboard/graph/WeightedGraph.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import lombok.NonNull; diff --git a/src/main/java/lib/maze/Cell.java b/src/main/java/lib/clipboard/maze/Cell.java similarity index 95% rename from src/main/java/lib/maze/Cell.java rename to src/main/java/lib/clipboard/maze/Cell.java index f9e9f28a..f32bde72 100644 --- a/src/main/java/lib/maze/Cell.java +++ b/src/main/java/lib/clipboard/maze/Cell.java @@ -1,4 +1,4 @@ -package lib.maze; +package lib.clipboard.maze; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/lib/maze/Maze.java b/src/main/java/lib/clipboard/maze/Maze.java similarity index 99% rename from src/main/java/lib/maze/Maze.java rename to src/main/java/lib/clipboard/maze/Maze.java index ba292528..41d9208f 100644 --- a/src/main/java/lib/maze/Maze.java +++ b/src/main/java/lib/clipboard/maze/Maze.java @@ -1,4 +1,4 @@ -package lib.maze; +package lib.clipboard.maze; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/lib/maze/MazeLocation.java b/src/main/java/lib/clipboard/maze/MazeLocation.java similarity index 92% rename from src/main/java/lib/maze/MazeLocation.java rename to src/main/java/lib/clipboard/maze/MazeLocation.java index 378d5ffa..718dd676 100644 --- a/src/main/java/lib/maze/MazeLocation.java +++ b/src/main/java/lib/clipboard/maze/MazeLocation.java @@ -1,4 +1,4 @@ -package lib.maze; +package lib.clipboard.maze; import lombok.Builder; import lombok.EqualsAndHashCode; diff --git a/src/main/java/lib/maze/Node.java b/src/main/java/lib/clipboard/maze/Node.java similarity index 98% rename from src/main/java/lib/maze/Node.java rename to src/main/java/lib/clipboard/maze/Node.java index 3f961889..a842e34d 100644 --- a/src/main/java/lib/maze/Node.java +++ b/src/main/java/lib/clipboard/maze/Node.java @@ -1,4 +1,4 @@ -package lib.maze; +package lib.clipboard.maze; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/maze/searchstrategy/AstarStrategy.java b/src/main/java/lib/clipboard/maze/searchstrategy/AstarStrategy.java similarity index 96% rename from src/main/java/lib/maze/searchstrategy/AstarStrategy.java rename to src/main/java/lib/clipboard/maze/searchstrategy/AstarStrategy.java index a94b7a3f..442811a4 100644 --- a/src/main/java/lib/maze/searchstrategy/AstarStrategy.java +++ b/src/main/java/lib/clipboard/maze/searchstrategy/AstarStrategy.java @@ -1,6 +1,6 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Node; +import lib.clipboard.maze.Node; import lombok.NonNull; import java.util.*; diff --git a/src/main/java/lib/maze/searchstrategy/BSFStrategy.java b/src/main/java/lib/clipboard/maze/searchstrategy/BSFStrategy.java similarity index 95% rename from src/main/java/lib/maze/searchstrategy/BSFStrategy.java rename to src/main/java/lib/clipboard/maze/searchstrategy/BSFStrategy.java index 71bd48cf..8b30d624 100644 --- a/src/main/java/lib/maze/searchstrategy/BSFStrategy.java +++ b/src/main/java/lib/clipboard/maze/searchstrategy/BSFStrategy.java @@ -1,6 +1,6 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Node; +import lib.clipboard.maze.Node; import lombok.NonNull; import java.util.*; diff --git a/src/main/java/lib/maze/searchstrategy/DSFStrategy.java b/src/main/java/lib/clipboard/maze/searchstrategy/DSFStrategy.java similarity index 95% rename from src/main/java/lib/maze/searchstrategy/DSFStrategy.java rename to src/main/java/lib/clipboard/maze/searchstrategy/DSFStrategy.java index 6c6c4e9e..c8b3515e 100644 --- a/src/main/java/lib/maze/searchstrategy/DSFStrategy.java +++ b/src/main/java/lib/clipboard/maze/searchstrategy/DSFStrategy.java @@ -1,6 +1,6 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Node; +import lib.clipboard.maze.Node; import lombok.NonNull; import java.util.*; diff --git a/src/main/java/lib/maze/searchstrategy/DijkstraStrategy.java b/src/main/java/lib/clipboard/maze/searchstrategy/DijkstraStrategy.java similarity index 95% rename from src/main/java/lib/maze/searchstrategy/DijkstraStrategy.java rename to src/main/java/lib/clipboard/maze/searchstrategy/DijkstraStrategy.java index e48c3784..24b9b2da 100644 --- a/src/main/java/lib/maze/searchstrategy/DijkstraStrategy.java +++ b/src/main/java/lib/clipboard/maze/searchstrategy/DijkstraStrategy.java @@ -1,9 +1,9 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.graph.DijkstraNode; -import lib.graph.DijkstraResult; -import lib.graph.WeightedEdge; -import lib.graph.WeightedGraph; +import lib.clipboard.graph.DijkstraNode; +import lib.clipboard.graph.DijkstraResult; +import lib.clipboard.graph.WeightedEdge; +import lib.clipboard.graph.WeightedGraph; import lombok.NonNull; import java.util.*; diff --git a/src/main/java/lib/maze/searchstrategy/GoalSearchableStrategy.java b/src/main/java/lib/clipboard/maze/searchstrategy/GoalSearchableStrategy.java similarity index 84% rename from src/main/java/lib/maze/searchstrategy/GoalSearchableStrategy.java rename to src/main/java/lib/clipboard/maze/searchstrategy/GoalSearchableStrategy.java index 195bdcce..8367cfc8 100644 --- a/src/main/java/lib/maze/searchstrategy/GoalSearchableStrategy.java +++ b/src/main/java/lib/clipboard/maze/searchstrategy/GoalSearchableStrategy.java @@ -1,6 +1,6 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Node; +import lib.clipboard.maze.Node; import lombok.NonNull; import java.util.List; diff --git a/src/main/java/lib/maze/searchstrategy/JarnikMSTStrategy.java b/src/main/java/lib/clipboard/maze/searchstrategy/JarnikMSTStrategy.java similarity index 93% rename from src/main/java/lib/maze/searchstrategy/JarnikMSTStrategy.java rename to src/main/java/lib/clipboard/maze/searchstrategy/JarnikMSTStrategy.java index 0bdd04b9..20acbf83 100644 --- a/src/main/java/lib/maze/searchstrategy/JarnikMSTStrategy.java +++ b/src/main/java/lib/clipboard/maze/searchstrategy/JarnikMSTStrategy.java @@ -1,7 +1,7 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.graph.WeightedEdge; -import lib.graph.WeightedGraph; +import lib.clipboard.graph.WeightedEdge; +import lib.clipboard.graph.WeightedGraph; import lombok.NonNull; import java.util.ArrayList; diff --git a/src/main/java/lib/gecom/agent/state/FSMState.java b/src/main/java/lib/gecom/agent/state/FSMState.java index 756343b6..dc1270ac 100644 --- a/src/main/java/lib/gecom/agent/state/FSMState.java +++ b/src/main/java/lib/gecom/agent/state/FSMState.java @@ -3,7 +3,7 @@ import lib.gecom.agent.event.RequestTransitionChangeEvent; import lib.gecom.observer.HasSubject; import lib.gecom.observer.Subject; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/gecom/agent/state/IdleState.java b/src/main/java/lib/gecom/agent/state/IdleState.java index 2ca5ded2..4ffa8b67 100644 --- a/src/main/java/lib/gecom/agent/state/IdleState.java +++ b/src/main/java/lib/gecom/agent/state/IdleState.java @@ -1,7 +1,7 @@ package lib.gecom.agent.state; import lib.gecom.agent.GeAgent; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NonNull; public class IdleState extends FSMState implements Startable, Stoppable { diff --git a/src/main/java/lib/gecom/agent/state/MoveToState.java b/src/main/java/lib/gecom/agent/state/MoveToState.java index 5d39a368..c7a56972 100644 --- a/src/main/java/lib/gecom/agent/state/MoveToState.java +++ b/src/main/java/lib/gecom/agent/state/MoveToState.java @@ -1,7 +1,7 @@ package lib.gecom.agent.state; import lib.gecom.agent.GeAgent; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/gecom/agent/state/PerformActionState.java b/src/main/java/lib/gecom/agent/state/PerformActionState.java index e42e8ca6..d68a3ca6 100644 --- a/src/main/java/lib/gecom/agent/state/PerformActionState.java +++ b/src/main/java/lib/gecom/agent/state/PerformActionState.java @@ -1,7 +1,7 @@ package lib.gecom.agent.state; import lib.gecom.agent.GeAgent; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/lib/gecom/commands/CommandTemplate.java b/src/main/java/lib/gecom/commands/CommandTemplate.java deleted file mode 100644 index aee86030..00000000 --- a/src/main/java/lib/gecom/commands/CommandTemplate.java +++ /dev/null @@ -1,8 +0,0 @@ -package lib.gecom.commands; - -public abstract class CommandTemplate implements Commandable { - - @Override - public abstract void execute(); - -} diff --git a/src/main/java/lib/gecom/commands/Commandable.java b/src/main/java/lib/gecom/commands/Commandable.java deleted file mode 100644 index 213c445f..00000000 --- a/src/main/java/lib/gecom/commands/Commandable.java +++ /dev/null @@ -1,7 +0,0 @@ -package lib.gecom.commands; - -public interface Commandable { - - void execute(); - -} diff --git a/src/main/java/lib/goap/graph/Edge.java b/src/main/java/lib/goap/graph/Edge.java deleted file mode 100644 index c665a80c..00000000 --- a/src/main/java/lib/goap/graph/Edge.java +++ /dev/null @@ -1,5 +0,0 @@ -package lib.goap.graph; - -public class Edge { - -} diff --git a/src/test/java/lib/alphashape/AlphaShapeConcaveHullTest.java b/src/test/java/lib/clipboard/alphashape/AlphaShapeConcaveHullTest.java similarity index 97% rename from src/test/java/lib/alphashape/AlphaShapeConcaveHullTest.java rename to src/test/java/lib/clipboard/alphashape/AlphaShapeConcaveHullTest.java index 27537839..bbd5fa8c 100644 --- a/src/test/java/lib/alphashape/AlphaShapeConcaveHullTest.java +++ b/src/test/java/lib/clipboard/alphashape/AlphaShapeConcaveHullTest.java @@ -1,6 +1,6 @@ -package lib.alphashape; +package lib.clipboard.alphashape; -import lib.concavehull.Point; +import lib.clipboard.concavehull.Point; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/convexhull/ConcaveHullTest.java b/src/test/java/lib/clipboard/convexhull/ConcaveHullTest.java similarity index 98% rename from src/test/java/lib/convexhull/ConcaveHullTest.java rename to src/test/java/lib/clipboard/convexhull/ConcaveHullTest.java index f1d88122..347ce71d 100644 --- a/src/test/java/lib/convexhull/ConcaveHullTest.java +++ b/src/test/java/lib/clipboard/convexhull/ConcaveHullTest.java @@ -1,7 +1,7 @@ -package lib.convexhull; +package lib.clipboard.convexhull; -import lib.concavehull.ConcaveHull; -import lib.concavehull.Point; +import lib.clipboard.concavehull.ConcaveHull; +import lib.clipboard.concavehull.Point; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/goap/DirectedGraphTest.java b/src/test/java/lib/clipboard/goap/DirectedGraphTest.java similarity index 94% rename from src/test/java/lib/goap/DirectedGraphTest.java rename to src/test/java/lib/clipboard/goap/DirectedGraphTest.java index a1f7a9c8..6885bb2d 100644 --- a/src/test/java/lib/goap/DirectedGraphTest.java +++ b/src/test/java/lib/clipboard/goap/DirectedGraphTest.java @@ -1,8 +1,8 @@ -package lib.goap; +package lib.clipboard.goap; -import lib.goap.graph.DirectedGraph; -import lib.goap.graph.Edge; +import lib.clipboard.goap.graph.DirectedGraph; +import lib.clipboard.goap.graph.Edge; import lombok.NonNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/goap/DirectedWeightedGraphTest.java b/src/test/java/lib/clipboard/goap/DirectedWeightedGraphTest.java similarity index 90% rename from src/test/java/lib/goap/DirectedWeightedGraphTest.java rename to src/test/java/lib/clipboard/goap/DirectedWeightedGraphTest.java index 712414c0..3bdd79bc 100644 --- a/src/test/java/lib/goap/DirectedWeightedGraphTest.java +++ b/src/test/java/lib/clipboard/goap/DirectedWeightedGraphTest.java @@ -1,8 +1,8 @@ -package lib.goap; +package lib.clipboard.goap; -import lib.goap.graph.DirectedWeightedGraph; -import lib.goap.graph.WeightedEdge; +import lib.clipboard.goap.graph.DirectedWeightedGraph; +import lib.clipboard.goap.graph.WeightedEdge; import lombok.NonNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/goap/GoapPlannerBaseTest.java b/src/test/java/lib/clipboard/goap/GoapPlannerBaseTest.java similarity index 94% rename from src/test/java/lib/goap/GoapPlannerBaseTest.java rename to src/test/java/lib/clipboard/goap/GoapPlannerBaseTest.java index 3294ec5a..3b8bc014 100644 --- a/src/test/java/lib/goap/GoapPlannerBaseTest.java +++ b/src/test/java/lib/clipboard/goap/GoapPlannerBaseTest.java @@ -1,9 +1,9 @@ -package lib.goap; +package lib.clipboard.goap; -import lib.goap.action.GoapActionBase; -import lib.goap.planner.GoapPlanner; -import lib.goap.planner.GoapPlannerable; -import lib.goap.testimplementations.TestUnit; +import lib.clipboard.goap.testimplementations.TestUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.planner.GoapPlanner; +import lib.clipboard.goap.planner.GoapPlannerable; import org.junit.jupiter.api.Test; import java.util.Queue; diff --git a/src/test/java/lib/goap/PathTest.java b/src/test/java/lib/clipboard/goap/PathTest.java similarity index 90% rename from src/test/java/lib/goap/PathTest.java rename to src/test/java/lib/clipboard/goap/PathTest.java index 7db04303..d4d2350b 100644 --- a/src/test/java/lib/goap/PathTest.java +++ b/src/test/java/lib/clipboard/goap/PathTest.java @@ -1,9 +1,9 @@ -package lib.goap; +package lib.clipboard.goap; -import lib.goap.graph.DirectedGraph; -import lib.goap.graph.Edge; -import lib.goap.graph.Path; -import lib.goap.graph.PathFactory; +import lib.clipboard.goap.graph.DirectedGraph; +import lib.clipboard.goap.graph.Edge; +import lib.clipboard.goap.graph.Path; +import lib.clipboard.goap.graph.PathFactory; import org.junit.jupiter.api.Test; import org.springframework.lang.Nullable; diff --git a/src/test/java/lib/goap/testimplementations/TestActionOne.java b/src/test/java/lib/clipboard/goap/testimplementations/TestActionOne.java similarity index 83% rename from src/test/java/lib/goap/testimplementations/TestActionOne.java rename to src/test/java/lib/clipboard/goap/testimplementations/TestActionOne.java index 1c0d13cb..39910554 100644 --- a/src/test/java/lib/goap/testimplementations/TestActionOne.java +++ b/src/test/java/lib/clipboard/goap/testimplementations/TestActionOne.java @@ -1,9 +1,9 @@ -package lib.goap.testimplementations; +package lib.clipboard.goap.testimplementations; -import lib.goap.action.GoapActionBase; -import lib.goap.state.GoapState; -import lib.goap.target.GoapTargetable; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.target.GoapTargetable; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/src/test/java/lib/goap/testimplementations/TestActionThree.java b/src/test/java/lib/clipboard/goap/testimplementations/TestActionThree.java similarity index 69% rename from src/test/java/lib/goap/testimplementations/TestActionThree.java rename to src/test/java/lib/clipboard/goap/testimplementations/TestActionThree.java index f906a6c7..1b19c9ba 100644 --- a/src/test/java/lib/goap/testimplementations/TestActionThree.java +++ b/src/test/java/lib/clipboard/goap/testimplementations/TestActionThree.java @@ -1,8 +1,8 @@ -package lib.goap.testimplementations; +package lib.clipboard.goap.testimplementations; -import lib.goap.state.GoapState; -import lib.goap.target.GoapTargetable; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.target.GoapTargetable; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NonNull; public class TestActionThree extends TestActionOne { diff --git a/src/test/java/lib/goap/testimplementations/TestActionTwo.java b/src/test/java/lib/clipboard/goap/testimplementations/TestActionTwo.java similarity index 68% rename from src/test/java/lib/goap/testimplementations/TestActionTwo.java rename to src/test/java/lib/clipboard/goap/testimplementations/TestActionTwo.java index fe380055..5ea528f9 100644 --- a/src/test/java/lib/goap/testimplementations/TestActionTwo.java +++ b/src/test/java/lib/clipboard/goap/testimplementations/TestActionTwo.java @@ -1,8 +1,8 @@ -package lib.goap.testimplementations; +package lib.clipboard.goap.testimplementations; -import lib.goap.state.GoapState; -import lib.goap.target.GoapTargetable; -import lib.goap.unit.IGoapUnit; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.target.GoapTargetable; +import lib.clipboard.goap.unit.IGoapUnit; import lombok.NonNull; public class TestActionTwo extends TestActionOne { diff --git a/src/test/java/lib/goap/testimplementations/TestUnit.java b/src/test/java/lib/clipboard/goap/testimplementations/TestUnit.java similarity index 81% rename from src/test/java/lib/goap/testimplementations/TestUnit.java rename to src/test/java/lib/clipboard/goap/testimplementations/TestUnit.java index 54a96f8c..f4760984 100644 --- a/src/test/java/lib/goap/testimplementations/TestUnit.java +++ b/src/test/java/lib/clipboard/goap/testimplementations/TestUnit.java @@ -1,10 +1,10 @@ -package lib.goap.testimplementations; +package lib.clipboard.goap.testimplementations; -import lib.goap.action.GoapActionBase; -import lib.goap.state.GoapState; -import lib.goap.state.WorldAspect; -import lib.goap.target.NullTarget; -import lib.goap.unit.GoapUnitBase; +import lib.clipboard.goap.action.GoapActionBase; +import lib.clipboard.goap.state.GoapState; +import lib.clipboard.goap.state.WorldAspect; +import lib.clipboard.goap.target.NullTarget; +import lib.clipboard.goap.unit.GoapUnitBase; import lombok.NonNull; import java.util.Queue; diff --git a/src/test/java/lib/graph/UnweightedGraphTest.java b/src/test/java/lib/clipboard/graph/UnweightedGraphTest.java similarity index 97% rename from src/test/java/lib/graph/UnweightedGraphTest.java rename to src/test/java/lib/clipboard/graph/UnweightedGraphTest.java index c46c850d..3a2a0b13 100644 --- a/src/test/java/lib/graph/UnweightedGraphTest.java +++ b/src/test/java/lib/clipboard/graph/UnweightedGraphTest.java @@ -1,7 +1,7 @@ -package lib.graph; +package lib.clipboard.graph; -import lib.maze.Node; -import lib.maze.searchstrategy.BSFStrategy; +import lib.clipboard.maze.Node; +import lib.clipboard.maze.searchstrategy.BSFStrategy; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/lib/graph/WeightedGraphTest.java b/src/test/java/lib/clipboard/graph/WeightedGraphTest.java similarity index 99% rename from src/test/java/lib/graph/WeightedGraphTest.java rename to src/test/java/lib/clipboard/graph/WeightedGraphTest.java index 12d6c92c..7209fb08 100644 --- a/src/test/java/lib/graph/WeightedGraphTest.java +++ b/src/test/java/lib/clipboard/graph/WeightedGraphTest.java @@ -1,4 +1,4 @@ -package lib.graph; +package lib.clipboard.graph; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/maze/CellTest.java b/src/test/java/lib/clipboard/maze/CellTest.java similarity index 54% rename from src/test/java/lib/maze/CellTest.java rename to src/test/java/lib/clipboard/maze/CellTest.java index 73b0f23e..0745bf5d 100644 --- a/src/test/java/lib/maze/CellTest.java +++ b/src/test/java/lib/clipboard/maze/CellTest.java @@ -1,5 +1,6 @@ -package lib.maze; +package lib.clipboard.maze; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,6 +9,6 @@ class CellTest { @Test void testToString() { - assertEquals("[X]", Cell.BLOCKED.toString()); + Assertions.assertEquals("[X]", Cell.BLOCKED.toString()); } } \ No newline at end of file diff --git a/src/test/java/lib/maze/MazeTest.java b/src/test/java/lib/clipboard/maze/MazeTest.java similarity index 99% rename from src/test/java/lib/maze/MazeTest.java rename to src/test/java/lib/clipboard/maze/MazeTest.java index b6016f46..078a116b 100644 --- a/src/test/java/lib/maze/MazeTest.java +++ b/src/test/java/lib/clipboard/maze/MazeTest.java @@ -1,4 +1,4 @@ -package lib.maze; +package lib.clipboard.maze; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/maze/searchstrategy/AstarStrategyTest.java b/src/test/java/lib/clipboard/maze/searchstrategy/AstarStrategyTest.java similarity index 96% rename from src/test/java/lib/maze/searchstrategy/AstarStrategyTest.java rename to src/test/java/lib/clipboard/maze/searchstrategy/AstarStrategyTest.java index 445bf137..92624ca6 100644 --- a/src/test/java/lib/maze/searchstrategy/AstarStrategyTest.java +++ b/src/test/java/lib/clipboard/maze/searchstrategy/AstarStrategyTest.java @@ -1,8 +1,8 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Maze; -import lib.maze.MazeLocation; -import lib.maze.Node; +import lib.clipboard.maze.Maze; +import lib.clipboard.maze.MazeLocation; +import lib.clipboard.maze.Node; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/lib/maze/searchstrategy/BSFStrategyTest.java b/src/test/java/lib/clipboard/maze/searchstrategy/BSFStrategyTest.java similarity index 94% rename from src/test/java/lib/maze/searchstrategy/BSFStrategyTest.java rename to src/test/java/lib/clipboard/maze/searchstrategy/BSFStrategyTest.java index fc5e10b9..9d36d9e9 100644 --- a/src/test/java/lib/maze/searchstrategy/BSFStrategyTest.java +++ b/src/test/java/lib/clipboard/maze/searchstrategy/BSFStrategyTest.java @@ -1,8 +1,8 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Maze; -import lib.maze.MazeLocation; -import lib.maze.Node; +import lib.clipboard.maze.Maze; +import lib.clipboard.maze.MazeLocation; +import lib.clipboard.maze.Node; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/lib/maze/searchstrategy/DSFStrategyTest.java b/src/test/java/lib/clipboard/maze/searchstrategy/DSFStrategyTest.java similarity index 94% rename from src/test/java/lib/maze/searchstrategy/DSFStrategyTest.java rename to src/test/java/lib/clipboard/maze/searchstrategy/DSFStrategyTest.java index 0dd5950f..6a376399 100644 --- a/src/test/java/lib/maze/searchstrategy/DSFStrategyTest.java +++ b/src/test/java/lib/clipboard/maze/searchstrategy/DSFStrategyTest.java @@ -1,8 +1,8 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.maze.Maze; -import lib.maze.MazeLocation; -import lib.maze.Node; +import lib.clipboard.maze.Maze; +import lib.clipboard.maze.MazeLocation; +import lib.clipboard.maze.Node; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/lib/maze/searchstrategy/DijkstraStrategyTest.java b/src/test/java/lib/clipboard/maze/searchstrategy/DijkstraStrategyTest.java similarity index 93% rename from src/test/java/lib/maze/searchstrategy/DijkstraStrategyTest.java rename to src/test/java/lib/clipboard/maze/searchstrategy/DijkstraStrategyTest.java index 65885124..dd4c8293 100644 --- a/src/test/java/lib/maze/searchstrategy/DijkstraStrategyTest.java +++ b/src/test/java/lib/clipboard/maze/searchstrategy/DijkstraStrategyTest.java @@ -1,8 +1,8 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.graph.DijkstraResult; -import lib.graph.WeightedGraph; -import lib.graph.WeightedGraphTest; +import lib.clipboard.graph.DijkstraResult; +import lib.clipboard.graph.WeightedGraph; +import lib.clipboard.graph.WeightedGraphTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/lib/maze/searchstrategy/JarnikMSTStrategyTest.java b/src/test/java/lib/clipboard/maze/searchstrategy/JarnikMSTStrategyTest.java similarity index 79% rename from src/test/java/lib/maze/searchstrategy/JarnikMSTStrategyTest.java rename to src/test/java/lib/clipboard/maze/searchstrategy/JarnikMSTStrategyTest.java index 4affe063..fb255246 100644 --- a/src/test/java/lib/maze/searchstrategy/JarnikMSTStrategyTest.java +++ b/src/test/java/lib/clipboard/maze/searchstrategy/JarnikMSTStrategyTest.java @@ -1,8 +1,8 @@ -package lib.maze.searchstrategy; +package lib.clipboard.maze.searchstrategy; -import lib.graph.WeightedEdge; -import lib.graph.WeightedGraph; -import lib.graph.WeightedGraphTest; +import lib.clipboard.graph.WeightedEdge; +import lib.clipboard.graph.WeightedGraph; +import lib.clipboard.graph.WeightedGraphTest; import org.junit.jupiter.api.Test; import java.util.List;