diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 703fc56..64738e3 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -10,8 +10,8 @@ import net.arnx.jsonic.JSONHint; public class Player extends Entity3D { - private String instanceURI; - private String characterURI; + private String instanceID; + private String characterID; private String areaURI; private Position3D position; private Quaternion3D angle; @@ -24,10 +24,10 @@ // JSONDecode���̌Ăяo���p } - public Player(String instanceURI, String characterURI, CameraState cameraState, + public Player(String instanceID, String characterID, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { - setInstanceURI(instanceURI); - setCharacterURI(characterURI); + setInstanceID(instanceID); + setCharacterID(characterID); if (cameraState != null) { setCameraState(cameraState); } else { @@ -38,8 +38,8 @@ } else { setEmoteState(new EmoteState()); } - Character character = getCharacter(characterURI); - readCharacterData(character); + Character character = getCharacter(); + readCharacterData(); initPlaceable(character.getModelID()); } @@ -48,17 +48,17 @@ Object3D body = CharacterModelManager.getInstance().getCharacterModel(modelID).createObject(); setPlaceable(new OvergroundActor(body, null)); // ��������Instance������Universe��placeable��z�u���� - String[] instanceURISplit = instanceURI.split("/"); // �c�c/instances/{instanceId} + String[] instanceURISplit = instanceID.split("/"); // �c�c/instances/{instanceId} String instanceId = instanceURISplit[instanceURISplit.length - 1]; Instances.getInstance().getInstance(instanceId).getUniverse().place(this.getPlaceable()); } - public String getInstanceURI() { - return instanceURI; + public String getInstanceID() { + return instanceID; } - public String getCharacterURI() { - return characterURI; + public String getCharacterID() { + return characterID; } public String getAreaURI() { @@ -81,12 +81,12 @@ return emoteState; } - public void setInstanceURI(String instanceURI) { - this.instanceURI = instanceURI; + public void setInstanceID(String instanceID) { + this.instanceID = instanceID; } - public void setCharacterURI(String characterURI) { - this.characterURI = characterURI; + public void setCharacterID(String characterID) { + this.characterID = characterID; } public void setAreaURI(String areaURI) { @@ -113,9 +113,9 @@ setEmoteState(new EmoteState(animationClassToStart)); } - public Player update(String characterURI, Position3D position, Quaternion3D angle, CameraState cameraState, + public Player update(String characterID, Position3D position, Quaternion3D angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { - setCharacterURI(characterURI); + setCharacterID(characterID); setPosition(position); setAngle(angle); setCameraState(cameraState); @@ -153,37 +153,33 @@ emoteState.setEmoteType(animationClassToStart); } - public void changeCharacter(String characterURI) { - writeCharacterData(this.characterURI); - readCharacterData(characterURI); + public void changeCharacter(String characterID) { + writeCharacterData(); + setCharacterID(characterID); + readCharacterData(); } public void destroy() { - writeCharacterData(characterURI); + writeCharacterData(); } - private Character getCharacter(String characterURI) { - String[] characterURISplit = characterURI.split("/"); // �c�c/instances/{instanceId}/characters/{characterId} - int splitSize = characterURISplit.length; - String characterId = characterURISplit[splitSize - 1]; - String instanceId = characterURISplit[splitSize - 3]; - return Instances.getInstance().getInstance(instanceId).getCharacter(characterId); + private Character getCharacter() { + return Instances.getInstance().getInstance(instanceID).getCharacter(characterID); } private void readCharacterData(Character character) { setPosition(character.getPosition()); setAngle(character.getAngle()); setAreaURI(character.getAreaURI()); - setCharacterURI(characterURI); } - private void readCharacterData(String characterURI) { - Character character = getCharacter(characterURI); + private void readCharacterData() { + Character character = getCharacter(); readCharacterData(character); } - private void writeCharacterData(String characterURI) { - Character character = getCharacter(characterURI); + private void writeCharacterData() { + Character character = getCharacter(); character.update(position, angle, areaURI); } }