diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/BuildOnResourceAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/BuildOnResourceAction.java index cf84623a8313acdf0c5eb69e9ea9e54f08bb62d3..5a38da2061ca0e669a9f304e172081d87bad7460 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/BuildOnResourceAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/BuildOnResourceAction.java @@ -1,11 +1,11 @@ package com.fossgalaxy.games.ggj2017; import com.fossgalaxy.games.ggj2017.drones.DroneBuildAction; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.EntityType; -import com.fossgalaxy.games.rts.entity.Resource; -import com.fossgalaxy.games.rts.entity.ResourceType; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.EntityType; +import com.fossgalaxy.games.tbs.entity.Resource; +import com.fossgalaxy.games.tbs.entity.ResourceType; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/JamApp.java b/src/main/java/com/fossgalaxy/games/ggj2017/JamApp.java index d55cdf2f9f7a6a16ae3a08298a65299847a8754b..c657236bbeeccbdd821828f422d9e5dd596f290c 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/JamApp.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/JamApp.java @@ -1,15 +1,17 @@ package com.fossgalaxy.games.ggj2017; -import com.fossgalaxy.games.rts.GameDef; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.ai.Controller; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.ResourceType; -import com.fossgalaxy.games.rts.io.SettingsIO; -import com.fossgalaxy.games.rts.order.Order; -import com.fossgalaxy.games.rts.order.OrderProcessor; -import com.fossgalaxy.games.rts.rules.Rule; -import com.fossgalaxy.games.rts.ui.*; + + +import com.fossgalaxy.games.tbs.GameDef; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.ai.Controller; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.ResourceType; +import com.fossgalaxy.games.tbs.io.SettingsIO; +import com.fossgalaxy.games.tbs.order.Order; +import com.fossgalaxy.games.tbs.order.OrderProcessor; +import com.fossgalaxy.games.tbs.rules.Rule; +import com.fossgalaxy.games.tbs.ui.*; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/MineOrder.java b/src/main/java/com/fossgalaxy/games/ggj2017/MineOrder.java index 29ad376fca55f9ff45764fe4ed4367808cbd8447..bfbaafb8be01de20fa187634bcae19490e4ec42d 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/MineOrder.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/MineOrder.java @@ -1,10 +1,11 @@ package com.fossgalaxy.games.ggj2017; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.Resource; -import com.fossgalaxy.games.rts.entity.ResourceType; -import com.fossgalaxy.games.rts.order.Order; + +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.Resource; +import com.fossgalaxy.games.tbs.entity.ResourceType; +import com.fossgalaxy.games.tbs.order.Order; public class MineOrder implements Order { diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/ResourceBar.java b/src/main/java/com/fossgalaxy/games/ggj2017/ResourceBar.java index c02c2971f0c57563db2d5a0c6e14bf9c7bce292e..83a39073925556b6c2bbf8d41c38d996266386fa 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/ResourceBar.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/ResourceBar.java @@ -1,7 +1,8 @@ package com.fossgalaxy.games.ggj2017; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.ui.UIModel; + +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.ui.UIModel; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/UpgradeOrder.java b/src/main/java/com/fossgalaxy/games/ggj2017/UpgradeOrder.java index da68b1c04c62aa1cf787c4c6d7043e0652e5df99..b37d3417c725fdac78da949ec0eca4f9d7463617 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/UpgradeOrder.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/UpgradeOrder.java @@ -1,9 +1,10 @@ package com.fossgalaxy.games.ggj2017; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.EntityType; -import com.fossgalaxy.games.rts.order.Order; + +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.EntityType; +import com.fossgalaxy.games.tbs.order.Order; public class UpgradeOrder implements Order { private EntityType from; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneAttackAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneAttackAction.java index 71e0b776237cbad1ea1009accda335c839ee30d2..ef5437ea67c70556aacce5ca9462e76ae4a19bf8 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneAttackAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneAttackAction.java @@ -1,8 +1,8 @@ package com.fossgalaxy.games.ggj2017.drones; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.actions.RangeAttackAction; -import com.fossgalaxy.games.rts.entity.Entity; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.actions.RangeAttackAction; +import com.fossgalaxy.games.tbs.entity.Entity; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildAction.java index fa39be014bfe0615dbf899c3b6e6149a92fa0ed9..d55eb38ee2b27ba224f1596bcd4585e50edbdd85 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildAction.java @@ -1,11 +1,11 @@ package com.fossgalaxy.games.ggj2017.drones; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.actions.BuildAction; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.EntityType; -import com.fossgalaxy.games.rts.order.BuildOrder; -import com.fossgalaxy.games.rts.order.Order; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.actions.BuildAction; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.EntityType; +import com.fossgalaxy.games.tbs.order.BuildOrder; +import com.fossgalaxy.games.tbs.order.Order; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildResourceAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildResourceAction.java index 0ba810fafb765d9a6bba2c17f721d3e310907e72..94a31252bcf0e2a0fa7db3fe473ee71a9cc896cf 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildResourceAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneBuildResourceAction.java @@ -1,12 +1,12 @@ package com.fossgalaxy.games.ggj2017.drones; import com.fossgalaxy.games.ggj2017.BuildOnResourceAction; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.EntityType; -import com.fossgalaxy.games.rts.entity.ResourceType; -import com.fossgalaxy.games.rts.order.BuildOrder; -import com.fossgalaxy.games.rts.order.Order; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.EntityType; +import com.fossgalaxy.games.tbs.entity.ResourceType; +import com.fossgalaxy.games.tbs.order.BuildOrder; +import com.fossgalaxy.games.tbs.order.Order; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMineAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMineAction.java index 277ae1dae65fd6f21ee2bf0f26e809592521dfd7..326931b8961d8d03df9ee3dae933f9c96b65a122 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMineAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMineAction.java @@ -1,9 +1,9 @@ package com.fossgalaxy.games.ggj2017.drones; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.actions.MinesAction; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.ResourceType; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.actions.MinesAction; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.ResourceType; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMoveAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMoveAction.java index 3ab217de691d3cd07d9929b2636ee64595a57c54..362950800a2e63b7d815521fdaa5e7c4c5a03da8 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMoveAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneMoveAction.java @@ -1,10 +1,10 @@ package com.fossgalaxy.games.ggj2017.drones; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.actions.MoveAction; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.order.MoveOrder; -import com.fossgalaxy.games.rts.order.Order; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.actions.MoveAction; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.order.MoveOrder; +import com.fossgalaxy.games.tbs.order.Order; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUpgradeAction.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUpgradeAction.java index dd79a0b1702ce6f219489b1ee63f188454678145..4ea595f7767dd9f7695f9b1b38dc8c82b16b7471 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUpgradeAction.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUpgradeAction.java @@ -1,9 +1,9 @@ package com.fossgalaxy.games.ggj2017.drones; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.actions.UpgradeAction; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.EntityType; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.actions.UpgradeAction; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.EntityType; import com.fossgalaxy.object.annotations.ObjectDef; import org.codetome.hexameter.core.api.CubeCoordinate; diff --git a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUtils.java b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUtils.java index 89c12bb404605610eccfd171cf9825ed807279a0..48abf7527a1f2dac161f55fd31300e26ccc7cbc6 100644 --- a/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUtils.java +++ b/src/main/java/com/fossgalaxy/games/ggj2017/drones/DroneUtils.java @@ -1,9 +1,9 @@ package com.fossgalaxy.games.ggj2017.drones; -import com.fossgalaxy.games.rts.GameState; -import com.fossgalaxy.games.rts.entity.Entity; -import com.fossgalaxy.games.rts.entity.HexagonTile; -import com.fossgalaxy.games.rts.io.SpriteRegistry; +import com.fossgalaxy.games.tbs.GameState; +import com.fossgalaxy.games.tbs.entity.Entity; +import com.fossgalaxy.games.tbs.entity.HexagonTile; +import com.fossgalaxy.games.tbs.io.SpriteRegistry; import org.codetome.hexameter.core.api.Hexagon; import java.awt.*;