diff --git a/src/main/java/cactusServer/entities/AddressedEntity.java b/src/main/java/cactusServer/entities/AddressedEntity.java new file mode 100644 index 0000000..2b3dc80 --- /dev/null +++ b/src/main/java/cactusServer/entities/AddressedEntity.java @@ -0,0 +1,23 @@ +package cactusServer.entities; + +/** + * �e���\�[�X��POST�ō쐬�����ۂ�, ���Y���\�[�X�̎��̂�URI���Ăяo�����ɕԂ��Ƃ��ɗp����N���X + * @author r-isitani + * + */ +public class AddressedEntity { + private String URI; + private Entity body; + + public AddressedEntity(String URI, Entity body) { + this.URI = URI; + this.body = body; + } + + public String getURI() { + return URI; + } + public Entity getBody() { + return body; + } +} diff --git a/src/main/java/cactusServer/entities/Area.java b/src/main/java/cactusServer/entities/Area.java index 5050012..222db78 100644 --- a/src/main/java/cactusServer/entities/Area.java +++ b/src/main/java/cactusServer/entities/Area.java @@ -2,7 +2,7 @@ import java.util.HashSet; -public class Area { +public class Area extends Entity{ private String name; private Plain[] region; // �C�ӌ‚̕��ʂ̕����� private HashSet permissions; // �G���A���ʼn”\�Ȃ��Ƃ̗��� diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 76b37de..bf8b4dd 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -10,7 +10,7 @@ import framework.model3D.Position3D; import net.arnx.jsonic.JSONHint; -public class Character { +public class Character extends Entity{ private URI accountURI; private String name; private Position3D position; diff --git a/src/main/java/cactusServer/entities/Entity.java b/src/main/java/cactusServer/entities/Entity.java new file mode 100644 index 0000000..433e43c --- /dev/null +++ b/src/main/java/cactusServer/entities/Entity.java @@ -0,0 +1,10 @@ +package cactusServer.entities; + +/** + * AddressedEntity�N���X�ɂĈ������̂�\�����ۃN���X + * @author r-isitani + * + */ +public abstract class Entity { + +} diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index f3f9986..9bd0225 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Set; +import cactusServer.entities.Entity; import cactusServer.entities.Object; import cactusServer.utils.RandomStringGenerator; import cactusServer.entities.Character; @@ -18,7 +19,7 @@ * @author ryo isitani * */ -public class Instance { +public class Instance extends Entity { private String name; private State state; // private StageModel stage; diff --git a/src/main/java/cactusServer/entities/Item.java b/src/main/java/cactusServer/entities/Item.java index 9bc9af3..77ff15f 100644 --- a/src/main/java/cactusServer/entities/Item.java +++ b/src/main/java/cactusServer/entities/Item.java @@ -1,6 +1,6 @@ package cactusServer.entities; -public class Item { +public class Item extends Entity{ private String name; private int amount; diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index 8d9f067..9c2b7b6 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -6,7 +6,7 @@ import framework.physics.AngularVelocity3D; import framework.physics.Velocity3D; -public class Object { +public class Object extends Entity{ private Position3D position; private Velocity3D velocity; private AngularVelocity3D angularVelocity;