diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index f435a04..671a985 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -1,6 +1,5 @@ package cactusServer.entities; -import java.net.URI; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -17,7 +16,6 @@ private Angle angle; private CharacterModel model; private String areaURI; - private HashMap itemMap = new HashMap<>(); private static final int UNIQUE_ID_LENGTH = 12; @@ -58,10 +56,12 @@ return areaURI; } + @JSONHint(ignore = true) public Item getItem(String itemId) { return itemMap.get(itemId); } + @JSONHint(ignore = true) public List getItems() { List itemList = new ArrayList<>(); for (Item item : itemMap.values()) { diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index d324b19..e1b58e6 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -1,18 +1,15 @@ package cactusServer.entities; -import java.net.URI; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import cactusServer.entities.Entity; import cactusServer.entities.Object; import cactusServer.entities.Area.Allowed; import cactusServer.entities.Object.Attribute; -import cactusServer.models.Instances; import cactusServer.utils.RandomStringGenerator; import cactusServer.entities.Character; import framework.model3D.Position3D; diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index 19f55f1..bed51eb 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -1,12 +1,10 @@ package cactusServer.entities; -import java.util.HashMap; - import framework.model3D.Position3D; import framework.physics.AngularVelocity3D; import framework.physics.Velocity3D; -public class Object extends Entity{ +public class Object extends Entity { private Position3D position; private Velocity3D velocity; private AngularVelocity3D angularVelocity; @@ -17,8 +15,9 @@ private Object() { // JSONDecode���̌Ăяo���p } - - public Object(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Angle angle, Attribute attribute, ObjectModel model) { + + public Object(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Angle angle, + Attribute attribute, ObjectModel model) { setPosition(position); setVelocity(velocity); setAngularVelocity(angularVelocity); @@ -26,19 +25,19 @@ setAttribute(attribute); setModel(model); } - + public Position3D getPosition() { return position; } - + public Velocity3D getVelocity() { return velocity; } - + public AngularVelocity3D getAngularVelocity() { return angularVelocity; } - + public Angle getAngle() { return angle; } @@ -50,19 +49,19 @@ public ObjectModel getModel() { return model; } - + public void setPosition(Position3D position) { this.position = position; } - + public void setVelocity(Velocity3D velocity) { this.velocity = velocity; } - + public void setAngularVelocity(AngularVelocity3D angularVelocity) { this.angularVelocity = angularVelocity; } - + public void setAngle(Angle angle) { this.angle = angle; } @@ -74,24 +73,24 @@ public void setModel(ObjectModel model) { this.model = model; } - + public static class Attribute { private boolean moveable; // �“� private double cof; // ���C�W�� - + public Attribute(boolean moveable, double cof) { setMoveable(moveable); setCof(cof); } - + public boolean isMoveable() { return moveable; } - + public double getCof() { return cof; } - + public void setMoveable(boolean moveable) { this.moveable = moveable; } diff --git a/src/main/java/cactusServer/entities/Plain.java b/src/main/java/cactusServer/entities/Plain.java index fbe7603..cdbad6c 100644 --- a/src/main/java/cactusServer/entities/Plain.java +++ b/src/main/java/cactusServer/entities/Plain.java @@ -1,7 +1,5 @@ package cactusServer.entities; -import java.util.List; - public class Plain { private double a; // ���ʂ̕����� ax+by+cz+d ��a private double b; // ���ʂ̕����� ax+by+cz+d ��b @@ -11,30 +9,30 @@ private Plain() { // JSONDecode���̌Ăяo���p } - + public Plain(double a, double b, double c, double d) { setA(a); setB(b); setC(c); setD(d); } - + public double getA() { return a; } - + public double getB() { return b; } - + public double getC() { return c; } - + public double getD() { return d; } - + public void setA(double a) { this.a = a; } diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 45039ed..13aae02 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -1,22 +1,15 @@ package cactusServer.models; -import java.net.URI; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; -import org.apache.commons.lang3.RandomStringUtils; - -import cactusServer.entities.AddressedEntity; import cactusServer.entities.CameraState; import cactusServer.entities.EmoteState; import cactusServer.entities.IDAddressedEntity; import cactusServer.entities.Instance; import cactusServer.entities.Player; -import cactusServer.entities.StageModel; import cactusServer.utils.RandomStringGenerator; -import net.arnx.jsonic.JSONHint; /** * �C���X�^���X���Ǘ�����N���X @@ -29,7 +22,7 @@ private HashMap instanceMap = new HashMap<>(); // instance��ID�Ǝ��̂��Ǘ� private HashMap playerMap = new HashMap<>(); private static final int UNIQUE_ID_LENGTH = 12; - + private Instances() { } @@ -45,23 +38,27 @@ } return theInstance; } - + /** * �V����Instance�N���X���쐬����Map�ɒlj����� + * * @param name * @param state * @param stageModel * @return */ public IDAddressedEntity createInstance(String name, Instance.State state, String stageModel) { - String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet()); + String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, + instanceMap.keySet()); Instance instance = new Instance(name, state, stageModel); instanceMap.put(id, instance); return new IDAddressedEntity(id, instance); } - - public IDAddressedEntity createPlayer(String instanceURI, String characterURI, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { - String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, playerMap.keySet()); + + public IDAddressedEntity createPlayer(String instanceURI, String characterURI, CameraState cameraState, + EmoteState.EmoteType animationClassToStart) { + String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, + playerMap.keySet()); Player player = new Player(instanceURI, characterURI, cameraState, animationClassToStart); playerMap.put(id, player); return new IDAddressedEntity(id, player); @@ -77,11 +74,11 @@ public Instance getInstance(String instanceId) { return instanceMap.get(instanceId); } - + public List getPlayers() { return new ArrayList(playerMap.values()); } - + public Player getPlayer(String playerId) { return playerMap.get(playerId); } @@ -96,7 +93,7 @@ public Instance destroyInstance(String instanceId) { return instanceMap.remove(instanceId); } - + public Player destroyPlayer(String playerId) { return playerMap.remove(playerId); } diff --git a/src/main/java/cactusServer/utils/MyParamConverter.java b/src/main/java/cactusServer/utils/MyParamConverter.java index 9f2cd8e..5c353cb 100644 --- a/src/main/java/cactusServer/utils/MyParamConverter.java +++ b/src/main/java/cactusServer/utils/MyParamConverter.java @@ -2,12 +2,11 @@ import javax.ws.rs.ext.ParamConverter; -import cactusServer.entities.StageModel; import net.arnx.jsonic.JSON; public class MyParamConverter implements ParamConverter { private Class type; - + public MyParamConverter(Class type) { this.type = type; } diff --git a/src/main/java/cactusServer/utils/MyParamConverterProvider.java b/src/main/java/cactusServer/utils/MyParamConverterProvider.java index b29620d..1f5f41a 100644 --- a/src/main/java/cactusServer/utils/MyParamConverterProvider.java +++ b/src/main/java/cactusServer/utils/MyParamConverterProvider.java @@ -7,8 +7,6 @@ import javax.ws.rs.ext.ParamConverterProvider; import javax.ws.rs.ext.Provider; -import cactusServer.entities.StageModel; - @Provider public class MyParamConverterProvider implements ParamConverterProvider { @Override