diff --git a/src/main/java/cactusServer/entities/Area.java b/src/main/java/cactusServer/entities/Area.java index f8dc5c3..2f52220 100644 --- a/src/main/java/cactusServer/entities/Area.java +++ b/src/main/java/cactusServer/entities/Area.java @@ -13,6 +13,7 @@ @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; + @SuppressWarnings("unused") private Area() { // JSONDecode���̌Ăяo���p } diff --git a/src/main/java/cactusServer/models/CharacterModelManager.java b/src/main/java/cactusServer/models/CharacterModelManager.java index d447846..8c9ff88 100644 --- a/src/main/java/cactusServer/models/CharacterModelManager.java +++ b/src/main/java/cactusServer/models/CharacterModelManager.java @@ -14,7 +14,7 @@ private static CharacterModelManager theInstance = null; private HashMap characterModels = new HashMap<>(); private int nextKey = 0; - private static final String MODEL_PATH = "assets\\"; + private static final String MODEL_PATH = "..\\..\\"; private CharacterModelManager() { initCharacterModels(); diff --git a/src/main/java/cactusServer/models/StageModelManager.java b/src/main/java/cactusServer/models/StageModelManager.java index 58ec54f..1e13fc2 100644 --- a/src/main/java/cactusServer/models/StageModelManager.java +++ b/src/main/java/cactusServer/models/StageModelManager.java @@ -1,8 +1,6 @@ package cactusServer.models; -import java.io.File; import java.io.IOException; -import java.io.PrintStream; import java.util.HashMap; import javax.inject.Singleton; @@ -18,11 +16,8 @@ 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())); + setStage(0, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); + setStage(1, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); } catch (IOException | ModelFileFormatException e) { e.printStackTrace(); } @@ -42,4 +37,9 @@ public Model3D getStage(int stageID) { return model.get(stageID); } + + public int getStageModelCount() { + return model.size(); + } + } diff --git a/src/main/java/cactusServer/resources/PlayersRest.java b/src/main/java/cactusServer/resources/PlayersRest.java index a8cff51..4f49faa 100644 --- a/src/main/java/cactusServer/resources/PlayersRest.java +++ b/src/main/java/cactusServer/resources/PlayersRest.java @@ -50,7 +50,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) - public HashMap getPlayers(@FormParam("instanceId") String instanceId) { + public HashMap getPlayers(@PathParam("instanceId") String instanceId) { return Instances.getInstance().getPlayers(instanceId); } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index c9f4c4f..979a556 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() { - CharacterModelManager.getInstance(); StageModelManager.getInstance(); + CharacterModelManager.getInstance(); Instances.getInstance(); Accounts.getInstance(); initDummy();