diff --git a/src/main/java/cactusServer/models/StageModelManager.java b/src/main/java/cactusServer/models/StageModelManager.java index ebb1ecf..58ec54f 100644 --- a/src/main/java/cactusServer/models/StageModelManager.java +++ b/src/main/java/cactusServer/models/StageModelManager.java @@ -1,6 +1,8 @@ package cactusServer.models; +import java.io.File; import java.io.IOException; +import java.io.PrintStream; import java.util.HashMap; import javax.inject.Singleton; @@ -17,6 +19,9 @@ private StageModelManager() { try { setStage(0, ModelFactory.loadModel(getClass().getResource("assets/konan/konan.stl").getPath())); +// PrintStream sysOut = new PrintStream(new File("../../../../../../conf/logging.properties")); +// sysOut.println(getClass().getResource("assets/konan/konan.stl").getPath()); +// System.out.println(getClass().getResource("assets/konan/konan.stl").getPath()); setStage(1, ModelFactory.loadModel(getClass().getResource("assets/konan/konan.stl").getPath())); } catch (IOException | ModelFileFormatException e) { e.printStackTrace(); diff --git a/src/main/java/cactusServer/resources/InstancesRest.java b/src/main/java/cactusServer/resources/InstancesRest.java index cd642b6..af19f0d 100644 --- a/src/main/java/cactusServer/resources/InstancesRest.java +++ b/src/main/java/cactusServer/resources/InstancesRest.java @@ -64,7 +64,13 @@ } return null; } - + + @GET + @Produces(MediaType.APPLICATION_JSON) + public HashMap getInstances(){ + return Instances.getInstance().getInstances(); + } + @POST @Produces(MediaType.APPLICATION_JSON) public HashMap createInstance(@FormParam("name") String name, @FormParam("stageID") int stageID) { diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 979a556..c9f4c4f 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -24,8 +24,8 @@ private ScheduledThreadPoolExecutor task = new ScheduledThreadPoolExecutor(4); public App() { - StageModelManager.getInstance(); CharacterModelManager.getInstance(); + StageModelManager.getInstance(); Instances.getInstance(); Accounts.getInstance(); initDummy();