From 5bee4a945e39cce294b79f0d55f84e16a0e43ca3 Mon Sep 17 00:00:00 2001 From: ilotterytea Date: Wed, 22 Jan 2025 01:17:55 +0500 Subject: upd: moved some files --- .../domain/actions/ChangedDirectionAction.java | 32 ++++++++++++ .../frogartha/domain/actions/PlayerJumpAction.java | 32 ++++++++++++ .../domain/client/ChangedDirectionAction.java | 32 ------------ .../frogartha/domain/client/PlayerJumpAction.java | 32 ------------ .../domain/events/ChangedDirectionEvent.java | 35 +++++++++++++ .../ilotterytea/frogartha/domain/events/Event.java | 16 ++++++ .../frogartha/domain/events/PlayerJumpEvent.java | 58 ++++++++++++++++++++++ .../frogartha/events/ChangedDirectionEvent.java | 35 ------------- .../kz/ilotterytea/frogartha/events/Event.java | 16 ------ .../frogartha/events/PlayerJumpEvent.java | 58 ---------------------- .../frogartha/utils/SerializerUtils.java | 8 +-- 11 files changed, 177 insertions(+), 177 deletions(-) create mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/ChangedDirectionAction.java create mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/PlayerJumpAction.java delete mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/client/ChangedDirectionAction.java delete mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/client/PlayerJumpAction.java create mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/events/ChangedDirectionEvent.java create mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/events/Event.java create mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/domain/events/PlayerJumpEvent.java delete mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/events/ChangedDirectionEvent.java delete mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/events/Event.java delete mode 100644 shared/src/main/java/kz/ilotterytea/frogartha/events/PlayerJumpEvent.java (limited to 'shared/src/main/java') diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/ChangedDirectionAction.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/ChangedDirectionAction.java new file mode 100644 index 0000000..b3004ba --- /dev/null +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/ChangedDirectionAction.java @@ -0,0 +1,32 @@ +package kz.ilotterytea.frogartha.domain.actions; + +import com.badlogic.gdx.math.Vector3; +import com.github.czyzby.websocket.serialization.SerializationException; +import com.github.czyzby.websocket.serialization.Transferable; +import com.github.czyzby.websocket.serialization.impl.Deserializer; +import com.github.czyzby.websocket.serialization.impl.Serializer; + +public class ChangedDirectionAction implements Transferable { + private Vector3 direction; + + public ChangedDirectionAction() { + } + + public ChangedDirectionAction(Vector3 direction) { + this.direction = direction; + } + + public Vector3 getDirection() { + return direction; + } + + @Override + public void serialize(Serializer serializer) throws SerializationException { + serializer.serializeFloatArray(new float[]{direction.x, direction.y, direction.z}); + } + + @Override + public ChangedDirectionAction deserialize(Deserializer deserializer) throws SerializationException { + return new ChangedDirectionAction(new Vector3(deserializer.deserializeFloatArray())); + } +} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/PlayerJumpAction.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/PlayerJumpAction.java new file mode 100644 index 0000000..9d150a4 --- /dev/null +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/PlayerJumpAction.java @@ -0,0 +1,32 @@ +package kz.ilotterytea.frogartha.domain.actions; + +import com.github.czyzby.websocket.serialization.SerializationException; +import com.github.czyzby.websocket.serialization.Transferable; +import com.github.czyzby.websocket.serialization.impl.Deserializer; +import com.github.czyzby.websocket.serialization.impl.Serializer; +import kz.ilotterytea.frogartha.FrogarthaConstants; + +public class PlayerJumpAction implements Transferable { + private float jumpStrength; + + public PlayerJumpAction() { + } + + public PlayerJumpAction(Float jumpStrength) { + this.jumpStrength = Math.min(jumpStrength, FrogarthaConstants.Player.MAX_JUMP_STRENGTH); + } + + public float getJumpStrength() { + return jumpStrength; + } + + @Override + public void serialize(Serializer serializer) throws SerializationException { + serializer.serializeFloat(jumpStrength); + } + + @Override + public PlayerJumpAction deserialize(Deserializer deserializer) throws SerializationException { + return new PlayerJumpAction(deserializer.deserializeFloat()); + } +} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/ChangedDirectionAction.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/ChangedDirectionAction.java deleted file mode 100644 index 9c64c56..0000000 --- a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/ChangedDirectionAction.java +++ /dev/null @@ -1,32 +0,0 @@ -package kz.ilotterytea.frogartha.domain.client; - -import com.badlogic.gdx.math.Vector3; -import com.github.czyzby.websocket.serialization.SerializationException; -import com.github.czyzby.websocket.serialization.Transferable; -import com.github.czyzby.websocket.serialization.impl.Deserializer; -import com.github.czyzby.websocket.serialization.impl.Serializer; - -public class ChangedDirectionAction implements Transferable { - private Vector3 direction; - - public ChangedDirectionAction() { - } - - public ChangedDirectionAction(Vector3 direction) { - this.direction = direction; - } - - public Vector3 getDirection() { - return direction; - } - - @Override - public void serialize(Serializer serializer) throws SerializationException { - serializer.serializeFloatArray(new float[]{direction.x, direction.y, direction.z}); - } - - @Override - public ChangedDirectionAction deserialize(Deserializer deserializer) throws SerializationException { - return new ChangedDirectionAction(new Vector3(deserializer.deserializeFloatArray())); - } -} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/PlayerJumpAction.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/PlayerJumpAction.java deleted file mode 100644 index 272f514..0000000 --- a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/PlayerJumpAction.java +++ /dev/null @@ -1,32 +0,0 @@ -package kz.ilotterytea.frogartha.domain.client; - -import com.github.czyzby.websocket.serialization.SerializationException; -import com.github.czyzby.websocket.serialization.Transferable; -import com.github.czyzby.websocket.serialization.impl.Deserializer; -import com.github.czyzby.websocket.serialization.impl.Serializer; -import kz.ilotterytea.frogartha.FrogarthaConstants; - -public class PlayerJumpAction implements Transferable { - private float jumpStrength; - - public PlayerJumpAction() { - } - - public PlayerJumpAction(Float jumpStrength) { - this.jumpStrength = Math.min(jumpStrength, FrogarthaConstants.Player.MAX_JUMP_STRENGTH); - } - - public float getJumpStrength() { - return jumpStrength; - } - - @Override - public void serialize(Serializer serializer) throws SerializationException { - serializer.serializeFloat(jumpStrength); - } - - @Override - public PlayerJumpAction deserialize(Deserializer deserializer) throws SerializationException { - return new PlayerJumpAction(deserializer.deserializeFloat()); - } -} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/ChangedDirectionEvent.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/ChangedDirectionEvent.java new file mode 100644 index 0000000..71eea4d --- /dev/null +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/ChangedDirectionEvent.java @@ -0,0 +1,35 @@ +package kz.ilotterytea.frogartha.domain.events; + +import com.badlogic.gdx.math.Vector3; +import com.github.czyzby.websocket.serialization.SerializationException; +import com.github.czyzby.websocket.serialization.Transferable; +import com.github.czyzby.websocket.serialization.impl.Deserializer; +import com.github.czyzby.websocket.serialization.impl.Serializer; + +public class ChangedDirectionEvent extends Event implements Transferable { + private Vector3 direction; + + public ChangedDirectionEvent() { + } + + public ChangedDirectionEvent(int playerId, Vector3 direction) { + super(playerId); + this.direction = direction; + } + + public Vector3 getDirection() { + return direction; + } + + @Override + public void serialize(Serializer serializer) throws SerializationException { + serializer + .serializeInt(playerId) + .serializeFloatArray(new float[]{direction.x, direction.y, direction.z}); + } + + @Override + public ChangedDirectionEvent deserialize(Deserializer deserializer) throws SerializationException { + return new ChangedDirectionEvent(deserializer.deserializeInt(), new Vector3(deserializer.deserializeFloatArray())); + } +} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/Event.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/Event.java new file mode 100644 index 0000000..3c1efe7 --- /dev/null +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/Event.java @@ -0,0 +1,16 @@ +package kz.ilotterytea.frogartha.domain.events; + +public class Event { + protected int playerId; + + public Event() { + } + + public Event(int playerId) { + this.playerId = playerId; + } + + public int getPlayerId() { + return playerId; + } +} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/PlayerJumpEvent.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/PlayerJumpEvent.java new file mode 100644 index 0000000..6df14bc --- /dev/null +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/PlayerJumpEvent.java @@ -0,0 +1,58 @@ +package kz.ilotterytea.frogartha.domain.events; + +import com.badlogic.gdx.math.Vector3; +import com.github.czyzby.websocket.serialization.SerializationException; +import com.github.czyzby.websocket.serialization.Transferable; +import com.github.czyzby.websocket.serialization.impl.Deserializer; +import com.github.czyzby.websocket.serialization.impl.Serializer; + +public class PlayerJumpEvent extends Event implements Transferable { + private Vector3 startPosition, endPosition; + private float jumpStrength; + + public PlayerJumpEvent() { + super(); + } + + public PlayerJumpEvent(Integer playerId, Vector3 startPosition, Vector3 endPosition, Float jumpStrength) { + super(playerId); + this.startPosition = startPosition; + this.endPosition = endPosition; + this.jumpStrength = jumpStrength; + } + + public Vector3 getStartPosition() { + return startPosition; + } + + public Vector3 getEndPosition() { + return endPosition; + } + + public float getJumpStrength() { + return jumpStrength; + } + + @Override + public void serialize(Serializer serializer) throws SerializationException { + serializer + // id + .serializeInt(playerId) + // start position + .serializeFloatArray(new float[]{startPosition.x, startPosition.y, startPosition.z}) + // end position + .serializeFloatArray(new float[]{endPosition.x, endPosition.y, endPosition.z}) + // jump strength + .serializeFloat(jumpStrength); + } + + @Override + public PlayerJumpEvent deserialize(Deserializer deserializer) throws SerializationException { + return new PlayerJumpEvent( + deserializer.deserializeInt(), + new Vector3(deserializer.deserializeFloatArray()), + new Vector3(deserializer.deserializeFloatArray()), + deserializer.deserializeFloat() + ); + } +} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/events/ChangedDirectionEvent.java b/shared/src/main/java/kz/ilotterytea/frogartha/events/ChangedDirectionEvent.java deleted file mode 100644 index eefe20a..0000000 --- a/shared/src/main/java/kz/ilotterytea/frogartha/events/ChangedDirectionEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package kz.ilotterytea.frogartha.events; - -import com.badlogic.gdx.math.Vector3; -import com.github.czyzby.websocket.serialization.SerializationException; -import com.github.czyzby.websocket.serialization.Transferable; -import com.github.czyzby.websocket.serialization.impl.Deserializer; -import com.github.czyzby.websocket.serialization.impl.Serializer; - -public class ChangedDirectionEvent extends Event implements Transferable { - private Vector3 direction; - - public ChangedDirectionEvent() { - } - - public ChangedDirectionEvent(int playerId, Vector3 direction) { - super(playerId); - this.direction = direction; - } - - public Vector3 getDirection() { - return direction; - } - - @Override - public void serialize(Serializer serializer) throws SerializationException { - serializer - .serializeInt(playerId) - .serializeFloatArray(new float[]{direction.x, direction.y, direction.z}); - } - - @Override - public ChangedDirectionEvent deserialize(Deserializer deserializer) throws SerializationException { - return new ChangedDirectionEvent(deserializer.deserializeInt(), new Vector3(deserializer.deserializeFloatArray())); - } -} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/events/Event.java b/shared/src/main/java/kz/ilotterytea/frogartha/events/Event.java deleted file mode 100644 index dcc0177..0000000 --- a/shared/src/main/java/kz/ilotterytea/frogartha/events/Event.java +++ /dev/null @@ -1,16 +0,0 @@ -package kz.ilotterytea.frogartha.events; - -public class Event { - protected int playerId; - - public Event() { - } - - public Event(int playerId) { - this.playerId = playerId; - } - - public int getPlayerId() { - return playerId; - } -} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/events/PlayerJumpEvent.java b/shared/src/main/java/kz/ilotterytea/frogartha/events/PlayerJumpEvent.java deleted file mode 100644 index a084555..0000000 --- a/shared/src/main/java/kz/ilotterytea/frogartha/events/PlayerJumpEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -package kz.ilotterytea.frogartha.events; - -import com.badlogic.gdx.math.Vector3; -import com.github.czyzby.websocket.serialization.SerializationException; -import com.github.czyzby.websocket.serialization.Transferable; -import com.github.czyzby.websocket.serialization.impl.Deserializer; -import com.github.czyzby.websocket.serialization.impl.Serializer; - -public class PlayerJumpEvent extends Event implements Transferable { - private Vector3 startPosition, endPosition; - private float jumpStrength; - - public PlayerJumpEvent() { - super(); - } - - public PlayerJumpEvent(Integer playerId, Vector3 startPosition, Vector3 endPosition, Float jumpStrength) { - super(playerId); - this.startPosition = startPosition; - this.endPosition = endPosition; - this.jumpStrength = jumpStrength; - } - - public Vector3 getStartPosition() { - return startPosition; - } - - public Vector3 getEndPosition() { - return endPosition; - } - - public float getJumpStrength() { - return jumpStrength; - } - - @Override - public void serialize(Serializer serializer) throws SerializationException { - serializer - // id - .serializeInt(playerId) - // start position - .serializeFloatArray(new float[]{startPosition.x, startPosition.y, startPosition.z}) - // end position - .serializeFloatArray(new float[]{endPosition.x, endPosition.y, endPosition.z}) - // jump strength - .serializeFloat(jumpStrength); - } - - @Override - public PlayerJumpEvent deserialize(Deserializer deserializer) throws SerializationException { - return new PlayerJumpEvent( - deserializer.deserializeInt(), - new Vector3(deserializer.deserializeFloatArray()), - new Vector3(deserializer.deserializeFloatArray()), - deserializer.deserializeFloat() - ); - } -} diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java b/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java index a00c0ff..2df2acf 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java @@ -2,11 +2,11 @@ package kz.ilotterytea.frogartha.utils; import com.github.czyzby.websocket.serialization.impl.ManualSerializer; import kz.ilotterytea.frogartha.domain.Identity; -import kz.ilotterytea.frogartha.domain.client.ChangedDirectionAction; -import kz.ilotterytea.frogartha.domain.client.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.actions.ChangedDirectionAction; +import kz.ilotterytea.frogartha.domain.actions.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.events.ChangedDirectionEvent; +import kz.ilotterytea.frogartha.domain.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.domain.server.Acknowledge; -import kz.ilotterytea.frogartha.events.ChangedDirectionEvent; -import kz.ilotterytea.frogartha.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.exceptions.PlayerKickException; public class SerializerUtils { -- cgit v1.2.3