diff --git a/assets/Data/creatures.json b/assets/Data/creatures.json index 20d73ec7..649e0bad 100644 --- a/assets/Data/creatures.json +++ b/assets/Data/creatures.json @@ -8,7 +8,6 @@ "creatureId" : "CUBE_MAN", "hitboxes" : [], "tokens" : [ - "BLENDER_TRANSFORM", "SENTIENT", "GRAVITY" ], diff --git a/assets/Data/creatures/animals.json b/assets/Data/creatures/animals.json index dc636b59..1e5eb424 100644 --- a/assets/Data/creatures/animals.json +++ b/assets/Data/creatures/animals.json @@ -10,7 +10,6 @@ } ], "tokens" : [ - "BLENDER_TRANSFORM", "GRAVITY" ], "movementSystems" : [ diff --git a/assets/Data/creatures/elf.json b/assets/Data/creatures/elf.json index 24eac0d4..b388468b 100644 --- a/assets/Data/creatures/elf.json +++ b/assets/Data/creatures/elf.json @@ -50,7 +50,6 @@ } ], "tokens" : [ - "BLENDER_TRANSFORM", "SENTIENT", "ATTACKER", "GRAVITY", diff --git a/assets/Data/creatures/goblin.json b/assets/Data/creatures/goblin.json index 3f04ddcf..6c3e795b 100644 --- a/assets/Data/creatures/goblin.json +++ b/assets/Data/creatures/goblin.json @@ -50,7 +50,6 @@ } ], "tokens" : [ - "BLENDER_TRANSFORM", "SENTIENT", "ATTACKER", "GRAVITY", diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index 5715a477..a23c48a3 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -50,7 +50,6 @@ } ], "tokens" : [ - "BLENDER_TRANSFORM", "SENTIENT", "ATTACKER", "GRAVITY", diff --git a/assets/Data/items.json b/assets/Data/items.json index a215c224..a9439edb 100644 --- a/assets/Data/items.json +++ b/assets/Data/items.json @@ -32,7 +32,6 @@ }, "tokens" : [ "GRAVITY", - "BLENDER_TRANSFORM", "MELEE", "TARGETABLE", "OUTLINE" @@ -82,7 +81,6 @@ }, "tokens" : [ "GRAVITY", - "BLENDER_TRANSFORM", "MELEE", "TARGETABLE", "OUTLINE" diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java index 7c9a3ac3..3d137ac3 100644 --- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java +++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java @@ -205,9 +205,6 @@ public class CreatureUtils { } for(String token : rawType.getTokens()){ switch(token){ - case "BLENDER_TRANSFORM": - ActorUtils.applyBlenderTransformer(rVal); - break; case "ATTACKER": ClientAttackTree.attachTree(rVal); rVal.putData(EntityDataStrings.ATTACK_MOVE_TYPE_ACTIVE, null); @@ -476,9 +473,6 @@ public class CreatureUtils { } for(String token : rawType.getTokens()){ switch(token){ - case "BLENDER_TRANSFORM": { - PoseActorUtils.applyBlenderTransformer(rVal); - } break; case "ATTACKER": { ServerAttackTree.attachTree(rVal); rVal.putData(EntityDataStrings.ATTACK_MOVE_TYPE_ACTIVE, null); diff --git a/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java b/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java index 9873a7e9..67ee95f2 100644 --- a/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java +++ b/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java @@ -45,9 +45,6 @@ public class FoliageUtils { for(String token : rawType.getTokens()){ switch(token){ - case "BLENDER_TRANSFORM": - ActorUtils.applyBlenderTransformer(rVal); - break; case "BLENDER_ROTATION": ActorUtils.applyBlenderRotation(rVal); break; @@ -79,9 +76,6 @@ public class FoliageUtils { for(String token : rawType.getTokens()){ switch(token){ - case "BLENDER_TRANSFORM": - ActorUtils.applyBlenderTransformer(rVal); - break; case "BLENDER_ROTATION": ActorUtils.applyBlenderRotation(rVal); break; diff --git a/src/main/java/electrosphere/entity/types/item/ItemUtils.java b/src/main/java/electrosphere/entity/types/item/ItemUtils.java index c1d396d2..c7a87d64 100644 --- a/src/main/java/electrosphere/entity/types/item/ItemUtils.java +++ b/src/main/java/electrosphere/entity/types/item/ItemUtils.java @@ -64,9 +64,6 @@ public class ItemUtils { //tokens for(String token : item.getTokens()){ switch(token){ - case "BLENDER_TRANSFORM": - ActorUtils.applyBlenderTransformer(rVal); - break; case "GRAVITY": Collidable collidable = (Collidable)rVal.getData(EntityDataStrings.PHYSICS_COLLIDABLE); DBody collisionObject = (DBody)rVal.getData(EntityDataStrings.PHYSICS_COLLISION_BODY); @@ -146,9 +143,6 @@ public class ItemUtils { //tokens for(String token : item.getTokens()){ switch(token){ - case "BLENDER_TRANSFORM": - ActorUtils.applyBlenderTransformer(rVal); - break; case "GRAVITY": Collidable collidable = (Collidable)rVal.getData(EntityDataStrings.PHYSICS_COLLIDABLE); DBody collisionObject = (DBody)rVal.getData(EntityDataStrings.PHYSICS_COLLISION_BODY); diff --git a/src/main/java/electrosphere/server/poseactor/PoseActorUtils.java b/src/main/java/electrosphere/server/poseactor/PoseActorUtils.java index 3ceabb00..14cd9b7c 100644 --- a/src/main/java/electrosphere/server/poseactor/PoseActorUtils.java +++ b/src/main/java/electrosphere/server/poseactor/PoseActorUtils.java @@ -17,13 +17,4 @@ public class PoseActorUtils { return rVal; } - public static void applyBlenderTransformer(Entity actorEntity){ - PoseActor entityActor = EntityUtils.getPoseActor(actorEntity); - entityActor.setAnimationScalar(60f); //should be the value of the fps i think - } - - public static void applyBlenderRotation(Entity actorEntity){ - EntityUtils.getRotation(actorEntity).rotateLocalX((float)-Math.PI/2); - } - }