Create bindings to js via annotations

Sponge-RPG-dev · May 16, 2018 · 9784ed6 · 9784ed6
1 parent 2e29e36
commit 9784ed6
Show file tree

Hide file tree

Showing 41 changed files with 127 additions and 38 deletions.
diff --git a/Plugin/src/main/java/cz/neumimto/rpg/ResourceLoader.java b/Plugin/src/main/java/cz/neumimto/rpg/ResourceLoader.java
@@ -33,6 +33,8 @@
 import cz.neumimto.rpg.players.properties.PropertyContainer;
 import cz.neumimto.rpg.players.properties.PropertyService;
 import cz.neumimto.rpg.players.properties.attributes.ICharacterAttribute;
+import cz.neumimto.rpg.scripting.JSLoader;
+import cz.neumimto.rpg.scripting.JsBinding;
 import cz.neumimto.rpg.skills.ISkill;
 import cz.neumimto.rpg.skills.SkillService;
 import javassist.CannotCompileException;
@@ -216,11 +218,14 @@ public void loadClass(Class<?> clazz) throws IllegalAccessException, CannotCompi
 		if (clazz.isAnnotationPresent(Attribute.class)) {
 			propertyService.registerAttribute((ICharacterAttribute) clazz.newInstance());
 		}
+		if (clazz.isAnnotationPresent(JsBinding.class)) {
+			IoC.get().build(JSLoader.class).getDataToBind().put(clazz, clazz.getAnnotation(JsBinding.class).value());
+		}
 		//Effects
 		if (IEffect.class.isAssignableFrom(clazz)) {
 			ClassGenerator.Generate a = clazz.getAnnotation(ClassGenerator.Generate.class);
 			if (a != null) {
-				Class c = (Class<? extends IEffect>) clazz;
+				Class c = clazz;
 				IGlobalEffect iGlobalEffect = classGenerator.generateGlobalEffect(c);
 				if (iGlobalEffect == null) {
 					return;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/CancellableEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/CancellableEvent.java
@@ -18,7 +18,6 @@
 
 package cz.neumimto.rpg.events;
 
-import cz.neumimto.rpg.GlobalScope;
 import cz.neumimto.rpg.NtRpgPlugin;
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.cause.Cause;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterAttributeChange.java b/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterAttributeChange.java
@@ -1,10 +1,11 @@
 package cz.neumimto.rpg.events;
 
-import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 23.1.2016.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterAttributeChange extends CharacterEvent {
 	private final int attributechange;
 

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterChangeClassEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterChangeClassEvent.java
@@ -2,10 +2,12 @@
 
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.groups.ConfigClass;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by ja on 29.4.2017.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterChangeClassEvent extends CharacterChangeGroupEvent {
 
 	private final int slot;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterChangeGroupEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterChangeGroupEvent.java
@@ -2,10 +2,12 @@
 
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.groups.PlayerGroup;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 29.4.2017.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterChangeGroupEvent extends CharacterEvent {
 	private final PlayerGroup _new;
 	private final PlayerGroup old;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterGainedLevelEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterGainedLevelEvent.java
@@ -2,10 +2,12 @@
 
 import cz.neumimto.rpg.players.ExtendedNClass;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 27.12.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterGainedLevelEvent extends CharacterEvent {
 	private final ExtendedNClass aClass;
 	private final int level;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterWeaponDamageEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/CharacterWeaponDamageEvent.java
@@ -2,11 +2,12 @@
 
 import cz.neumimto.rpg.IEntity;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 17.6.2017.
  */
-
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterWeaponDamageEvent extends INEntityWeaponDamageEvent {
 
 

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/ManaRegainEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/ManaRegainEvent.java
@@ -1,11 +1,13 @@
 package cz.neumimto.rpg.events;
 
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 
 /**
  * Created by NeumimTo on 9.8.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class ManaRegainEvent extends CancellableEvent {
 	private IActiveCharacter character;
 	private double newVal;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/PlayerDataPreloadComplete.java b/Plugin/src/main/java/cz/neumimto/rpg/events/PlayerDataPreloadComplete.java
diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/ProjectileHitEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/ProjectileHitEvent.java
@@ -1,11 +1,13 @@
 package cz.neumimto.rpg.events;
 
 import cz.neumimto.rpg.IEntity;
+import cz.neumimto.rpg.scripting.JsBinding;
 import org.spongepowered.api.entity.projectile.Projectile;
 
 /**
  * Created by NeumimTo on 17.6.2017.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class ProjectileHitEvent extends CancellableEvent {
 
 	private IEntity shooter;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/SkillDamageEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/SkillDamageEvent.java
@@ -1,12 +1,14 @@
 package cz.neumimto.rpg.events;
 
 import cz.neumimto.rpg.IEntity;
+import cz.neumimto.rpg.scripting.JsBinding;
 import cz.neumimto.rpg.skills.ISkill;
 import org.spongepowered.api.event.cause.entity.damage.DamageType;
 
 /**
  * Created by NeumimTo on 18.6.2017.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class SkillDamageEvent extends INEntityDamageEvent {
 	ISkill skill;
 

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/SkillDamageEventLate.java b/Plugin/src/main/java/cz/neumimto/rpg/events/SkillDamageEventLate.java
@@ -1,12 +1,14 @@
 package cz.neumimto.rpg.events;
 
 import cz.neumimto.rpg.IEntity;
+import cz.neumimto.rpg.scripting.JsBinding;
 import cz.neumimto.rpg.skills.ISkill;
 import org.spongepowered.api.event.cause.entity.damage.DamageType;
 
 /**
  * Created by ja on 18.6.2017.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class SkillDamageEventLate extends CancellableEvent {
 	IEntity caster;
 	IEntity target;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/CharacterDamageEntityEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/CharacterDamageEntityEvent.java
@@ -19,11 +19,13 @@
 package cz.neumimto.rpg.events.character;
 
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 import org.spongepowered.api.entity.living.player.Player;
 
 /**
  * Created by NeumimTo on 13.3.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterDamageEntityEvent extends CharacterEvent {
 	private Player damaged;
 	private double damage;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/CharacterWeaponUpdateEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/CharacterWeaponUpdateEvent.java
@@ -1,17 +1,17 @@
 package cz.neumimto.rpg.events.character;
 
 import cz.neumimto.rpg.events.CancellableEvent;
-import cz.neumimto.rpg.inventory.ConfigRPGItemType;
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.RPGItemWrapper;
+import cz.neumimto.rpg.scripting.JsBinding;
 import org.spongepowered.api.item.ItemType;
 
 import java.util.Map;
-import java.util.TreeSet;
 
 /**
  * Created by NeumimTo on 10.10.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class CharacterWeaponUpdateEvent extends CancellableEvent {
 	private final IActiveCharacter character;
 	private final Map<ItemType, RPGItemWrapper> allowedArmor;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/ManaRegainEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/ManaRegainEvent.java
@@ -20,11 +20,13 @@
 
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 
 /**
  * Created by NeumimTo on 9.8.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class ManaRegainEvent extends CancellableEvent {
 	private IActiveCharacter character;
 	private double newVal;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/PlayerCombatEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/PlayerCombatEvent.java
@@ -17,7 +17,9 @@
 package cz.neumimto.rpg.events.character;
 
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
+@JsBinding(JsBinding.Type.CLASS)
 public class PlayerCombatEvent extends CharacterEvent {
 
 	private final cz.neumimto.rpg.players.IActiveCharacter target;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/PlayerDataPreloadComplete.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/PlayerDataPreloadComplete.java
@@ -21,6 +21,7 @@
 import cz.neumimto.rpg.NEventContextKeys;
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.CharacterBase;
+import cz.neumimto.rpg.scripting.JsBinding;
 import org.spongepowered.api.event.cause.Cause;
 import org.spongepowered.api.event.cause.EventContext;
 
@@ -30,6 +31,7 @@
 /**
  * Created by NeumimTo on 10.7.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class PlayerDataPreloadComplete extends CancellableEvent {
 	private UUID player;
 	private List<CharacterBase> characterBases;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/WeaponEquipEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/WeaponEquipEvent.java
@@ -21,10 +21,12 @@
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.inventory.Weapon;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 12.2.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class WeaponEquipEvent extends CancellableEvent {
 	final IActiveCharacter player;
 	final Weapon newItem;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/character/WeaponSwitchEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/character/WeaponSwitchEvent.java
@@ -18,11 +18,13 @@
 
 package cz.neumimto.rpg.events.character;
 
+import cz.neumimto.rpg.scripting.JsBinding;
 import org.spongepowered.api.item.inventory.ItemStack;
 
 /**
  * Created by NeumimTo on 13.3.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class WeaponSwitchEvent extends CharacterEvent {
 
 	public WeaponSwitchEvent(cz.neumimto.rpg.players.IActiveCharacter IActiveCharacter, ItemStack newWeapon) {

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyInviteEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyInviteEvent.java
@@ -21,10 +21,12 @@
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.parties.Party;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 11.8.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class PartyInviteEvent extends CancellableEvent {
 	private final Party party;
 	private IActiveCharacter character;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyJoinEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyJoinEvent.java
@@ -21,10 +21,12 @@
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.parties.Party;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by ja on 2.9.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class PartyJoinEvent extends CancellableEvent {
 	private final IActiveCharacter character;
 	private final Party party;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyKickEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyKickEvent.java
@@ -20,10 +20,12 @@
 
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.parties.Party;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by ja on 2.9.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class PartyKickEvent extends PartyLeaveEvent {
 
 	public PartyKickEvent(Party party, IActiveCharacter kicked) {

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyLeaveEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/party/PartyLeaveEvent.java
@@ -21,10 +21,12 @@
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
 import cz.neumimto.rpg.players.parties.Party;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by ja on 2.9.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class PartyLeaveEvent extends CancellableEvent {
 	private Party party;
 	private IActiveCharacter leaver;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillFindTargetEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillFindTargetEvent.java
@@ -17,9 +17,11 @@
 
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 import cz.neumimto.rpg.skills.ISkill;
 import org.spongepowered.api.entity.living.Living;
 
+@JsBinding(JsBinding.Type.CLASS)
 public class SkillFindTargetEvent extends CancellableEvent {
 	private IActiveCharacter character;
 	private Living target;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillHealEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillHealEvent.java
@@ -21,10 +21,12 @@
 import cz.neumimto.rpg.IEntity;
 import cz.neumimto.rpg.effects.IEffectSourceProvider;
 import cz.neumimto.rpg.events.CancellableEvent;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 7.8.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class SkillHealEvent extends CancellableEvent {
 	private IEntity character;
 	private double amount;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillLearnEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillLearnEvent.java
@@ -20,11 +20,13 @@
 
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 import cz.neumimto.rpg.skills.ISkill;
 
 /**
  * Created by NeumimTo on 26.7.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class SkillLearnEvent extends CancellableEvent {
 	IActiveCharacter character;
 	ISkill skill;

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillPostUsageEvent.java b/Plugin/src/main/java/cz/neumimto/rpg/events/skills/SkillPostUsageEvent.java
@@ -20,10 +20,12 @@
 
 import cz.neumimto.rpg.events.CancellableEvent;
 import cz.neumimto.rpg.players.IActiveCharacter;
+import cz.neumimto.rpg.scripting.JsBinding;
 
 /**
  * Created by NeumimTo on 7.8.2015.
  */
+@JsBinding(JsBinding.Type.CLASS)
 public class SkillPostUsageEvent extends CancellableEvent {
 	private IActiveCharacter character;
 	private double hpcost;