diff --git a/data/script/template/script/template/DisabledTemplate.java b/data/script/template/script/template/DisabledTemplate.java index d9b09b229..0572132b0 100644 --- a/data/script/template/script/template/DisabledTemplate.java +++ b/data/script/template/script/template/DisabledTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,23 +13,23 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ -package script.template; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Marker annotation that is used to mark disabled templates so they will be - * ignored by {@link TemplateLoader} - * - * @author Rogiel - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface DisabledTemplate { -} + */ +package script.template; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marker annotation that is used to mark disabled templates so they will be + * ignored by {@link TemplateLoader} + * + * @author Rogiel + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DisabledTemplate { +} diff --git a/data/script/template/script/template/TemplateLoader.java b/data/script/template/script/template/TemplateLoader.java index 0b576569f..68fcf3d14 100644 --- a/data/script/template/script/template/TemplateLoader.java +++ b/data/script/template/script/template/TemplateLoader.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,84 +13,84 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ -package script.template; - -import java.lang.reflect.Modifier; -import java.util.Set; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.inject.Inject; -import com.l2jserver.model.template.Template; -import com.l2jserver.service.game.scripting.classlistener.Loader; -import com.l2jserver.service.game.scripting.classlistener.Unloader; -import com.l2jserver.service.game.template.ScriptTemplateService; -import com.l2jserver.service.game.template.TemplateService; -import com.l2jserver.util.ClassUtils; -import com.l2jserver.util.factory.CollectionFactory; - -/** - * Utility class that loads all Template's in classPath of this script context.
- * Template should be public, not abstract, not interface, must have default - * constructor annotated with @Inject. - * - * @author Rogiel - */ -public class TemplateLoader implements Loader, Unloader { - private static final Logger log = LoggerFactory - .getLogger(TemplateLoader.class); - - private final ScriptTemplateService templateService; - - @Inject - public TemplateLoader(TemplateService templateService) { - this.templateService = (ScriptTemplateService) templateService; - } - - @Override - public void load(Class[] classes) { - log.debug("Loading templates from {} classes", classes.length); - for (final Class> template : getSuitableClasses(classes)) { - log.debug("Found loadable template class: {}", template); - templateService.addTemplate(template); - } - } - - @Override - public void unload(Class[] classes) { - log.debug("Unloading templates from {} classes", classes.length); - for (final Class> template : getSuitableClasses(classes)) { - log.debug("Found unloadable template class: {}", template); - // TODO unloading - } - } - - /** - * Returns list of suitable Template classes to load/unload - * - * @return list of Template classes to load/unload - */ - @SuppressWarnings({ "unchecked" }) - private static Set>> getSuitableClasses( - Class[] classes) { - final Set>> suitable = CollectionFactory - .newSet(null); - for (Class clazz : classes) { - if (!ClassUtils.isSubclass(clazz, Template.class)) - continue; - if (Modifier.isAbstract(clazz.getModifiers()) - || Modifier.isInterface(clazz.getModifiers())) - continue; - if (!Modifier.isPublic(clazz.getModifiers())) - continue; - if (clazz.isAnnotationPresent(DisabledTemplate.class)) - continue; - - suitable.add((Class>) clazz); - } - - return suitable; - } -} + */ +package script.template; + +import java.lang.reflect.Modifier; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.inject.Inject; +import com.l2jserver.model.template.Template; +import com.l2jserver.service.game.scripting.classlistener.Loader; +import com.l2jserver.service.game.scripting.classlistener.Unloader; +import com.l2jserver.service.game.template.ScriptTemplateService; +import com.l2jserver.service.game.template.TemplateService; +import com.l2jserver.util.ClassUtils; +import com.l2jserver.util.factory.CollectionFactory; + +/** + * Utility class that loads all Template's in classPath of this script context.
+ * Template should be public, not abstract, not interface, must have default + * constructor annotated with @Inject. + * + * @author Rogiel + */ +public class TemplateLoader implements Loader, Unloader { + private static final Logger log = LoggerFactory + .getLogger(TemplateLoader.class); + + private final ScriptTemplateService templateService; + + @Inject + public TemplateLoader(TemplateService templateService) { + this.templateService = (ScriptTemplateService) templateService; + } + + @Override + public void load(Class[] classes) { + log.debug("Loading templates from {} classes", classes.length); + for (final Class> template : getSuitableClasses(classes)) { + log.debug("Found loadable template class: {}", template); + templateService.addTemplate(template); + } + } + + @Override + public void unload(Class[] classes) { + log.debug("Unloading templates from {} classes", classes.length); + for (final Class> template : getSuitableClasses(classes)) { + log.debug("Found unloadable template class: {}", template); + // TODO unloading + } + } + + /** + * Returns list of suitable Template classes to load/unload + * + * @return list of Template classes to load/unload + */ + @SuppressWarnings({ "unchecked" }) + private static Set>> getSuitableClasses( + Class[] classes) { + final Set>> suitable = CollectionFactory + .newSet(null); + for (Class clazz : classes) { + if (!ClassUtils.isSubclass(clazz, Template.class)) + continue; + if (Modifier.isAbstract(clazz.getModifiers()) + || Modifier.isInterface(clazz.getModifiers())) + continue; + if (!Modifier.isPublic(clazz.getModifiers())) + continue; + if (clazz.isAnnotationPresent(DisabledTemplate.class)) + continue; + + suitable.add((Class>) clazz); + } + + return suitable; + } +} diff --git a/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java index 9aa74ce03..e5cc3331f 100644 --- a/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java index c02ba1167..03b5f3d00 100644 --- a/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java index 261d666d7..2c36d34f2 100644 --- a/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java index cd64d3271..9ed2b8f70 100644 --- a/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java index 343ba3037..659ef7225 100644 --- a/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java index 52a9097ba..d9d9572db 100644 --- a/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java b/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java index b69e42b19..3cdc07a74 100644 --- a/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java +++ b/data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java b/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java index 065395423..01e19fde5 100644 --- a/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java +++ b/data/script/template/script/template/actor/character/AbyssWalkerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/AdventurerTemplate.java b/data/script/template/script/template/actor/character/AdventurerTemplate.java index f898bed7c..0ab80c2b3 100644 --- a/data/script/template/script/template/actor/character/AdventurerTemplate.java +++ b/data/script/template/script/template/actor/character/AdventurerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ArbalesterTemplate.java b/data/script/template/script/template/actor/character/ArbalesterTemplate.java index ea393dd10..e1a5688b6 100644 --- a/data/script/template/script/template/actor/character/ArbalesterTemplate.java +++ b/data/script/template/script/template/actor/character/ArbalesterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ArcanaLordTemplate.java b/data/script/template/script/template/actor/character/ArcanaLordTemplate.java index 2fd2b2953..233918843 100644 --- a/data/script/template/script/template/actor/character/ArcanaLordTemplate.java +++ b/data/script/template/script/template/actor/character/ArcanaLordTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ArchmageTemplate.java b/data/script/template/script/template/actor/character/ArchmageTemplate.java index 36edf601c..9c89d91d4 100644 --- a/data/script/template/script/template/actor/character/ArchmageTemplate.java +++ b/data/script/template/script/template/actor/character/ArchmageTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ArtisanTemplate.java b/data/script/template/script/template/actor/character/ArtisanTemplate.java index 026d5452c..0d1ea551a 100644 --- a/data/script/template/script/template/actor/character/ArtisanTemplate.java +++ b/data/script/template/script/template/actor/character/ArtisanTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/AssassinTemplate.java b/data/script/template/script/template/actor/character/AssassinTemplate.java index 31b854b19..d9d0e20cb 100644 --- a/data/script/template/script/template/actor/character/AssassinTemplate.java +++ b/data/script/template/script/template/actor/character/AssassinTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/BersekerTemplate.java b/data/script/template/script/template/actor/character/BersekerTemplate.java index 245732310..0ed1afea1 100644 --- a/data/script/template/script/template/actor/character/BersekerTemplate.java +++ b/data/script/template/script/template/actor/character/BersekerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/BishopTemplate.java b/data/script/template/script/template/actor/character/BishopTemplate.java index c7d466d5a..d412150e1 100644 --- a/data/script/template/script/template/actor/character/BishopTemplate.java +++ b/data/script/template/script/template/actor/character/BishopTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/BladedancerTemplate.java b/data/script/template/script/template/actor/character/BladedancerTemplate.java index 0657d67d4..dc7f9d110 100644 --- a/data/script/template/script/template/actor/character/BladedancerTemplate.java +++ b/data/script/template/script/template/actor/character/BladedancerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/BountyHunterTemplate.java b/data/script/template/script/template/actor/character/BountyHunterTemplate.java index 46ddae3b1..10bf2536e 100644 --- a/data/script/template/script/template/actor/character/BountyHunterTemplate.java +++ b/data/script/template/script/template/actor/character/BountyHunterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/CardinalTemplate.java b/data/script/template/script/template/actor/character/CardinalTemplate.java index e2d1c4930..636a16069 100644 --- a/data/script/template/script/template/actor/character/CardinalTemplate.java +++ b/data/script/template/script/template/actor/character/CardinalTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ClericTemplate.java b/data/script/template/script/template/actor/character/ClericTemplate.java index 74af45f83..43838b039 100644 --- a/data/script/template/script/template/actor/character/ClericTemplate.java +++ b/data/script/template/script/template/actor/character/ClericTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DarkAvengerTemplate.java b/data/script/template/script/template/actor/character/DarkAvengerTemplate.java index 40093c3c1..7cefe7e4b 100644 --- a/data/script/template/script/template/actor/character/DarkAvengerTemplate.java +++ b/data/script/template/script/template/actor/character/DarkAvengerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DarkFighterTemplate.java b/data/script/template/script/template/actor/character/DarkFighterTemplate.java index d346704a2..ae8db51a4 100644 --- a/data/script/template/script/template/actor/character/DarkFighterTemplate.java +++ b/data/script/template/script/template/actor/character/DarkFighterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DarkMysticTemplate.java b/data/script/template/script/template/actor/character/DarkMysticTemplate.java index e571b0398..b388cf8b6 100644 --- a/data/script/template/script/template/actor/character/DarkMysticTemplate.java +++ b/data/script/template/script/template/actor/character/DarkMysticTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DarkWizardTemplate.java b/data/script/template/script/template/actor/character/DarkWizardTemplate.java index 4a1b7fa56..a160f3786 100644 --- a/data/script/template/script/template/actor/character/DarkWizardTemplate.java +++ b/data/script/template/script/template/actor/character/DarkWizardTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DestroyerTemplate.java b/data/script/template/script/template/actor/character/DestroyerTemplate.java index 3ddd81b15..e52992fd9 100644 --- a/data/script/template/script/template/actor/character/DestroyerTemplate.java +++ b/data/script/template/script/template/actor/character/DestroyerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DominatorTemplate.java b/data/script/template/script/template/actor/character/DominatorTemplate.java index 2a2b9dfc7..08624ea16 100644 --- a/data/script/template/script/template/actor/character/DominatorTemplate.java +++ b/data/script/template/script/template/actor/character/DominatorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DoombringerTemplate.java b/data/script/template/script/template/actor/character/DoombringerTemplate.java index bf3eee2ce..dbcab2fd1 100644 --- a/data/script/template/script/template/actor/character/DoombringerTemplate.java +++ b/data/script/template/script/template/actor/character/DoombringerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DoomcryerTemplate.java b/data/script/template/script/template/actor/character/DoomcryerTemplate.java index 97174fef8..e5e02b5a4 100644 --- a/data/script/template/script/template/actor/character/DoomcryerTemplate.java +++ b/data/script/template/script/template/actor/character/DoomcryerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DreadnoughtTemplate.java b/data/script/template/script/template/actor/character/DreadnoughtTemplate.java index eccbb89d7..c16bc4ce8 100644 --- a/data/script/template/script/template/actor/character/DreadnoughtTemplate.java +++ b/data/script/template/script/template/actor/character/DreadnoughtTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DuelistTemplate.java b/data/script/template/script/template/actor/character/DuelistTemplate.java index d89d5bdb9..bc814778e 100644 --- a/data/script/template/script/template/actor/character/DuelistTemplate.java +++ b/data/script/template/script/template/actor/character/DuelistTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java b/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java index cb3e56577..c481d2f2d 100644 --- a/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java +++ b/data/script/template/script/template/actor/character/DwarvenFighterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElderTemplate.java b/data/script/template/script/template/actor/character/ElderTemplate.java index ad0bd8f22..96a06df6f 100644 --- a/data/script/template/script/template/actor/character/ElderTemplate.java +++ b/data/script/template/script/template/actor/character/ElderTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElementalMasterTemplate.java b/data/script/template/script/template/actor/character/ElementalMasterTemplate.java index 43487d540..1f4bac0fb 100644 --- a/data/script/template/script/template/actor/character/ElementalMasterTemplate.java +++ b/data/script/template/script/template/actor/character/ElementalMasterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java b/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java index 1eccfa860..24a159145 100644 --- a/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java +++ b/data/script/template/script/template/actor/character/ElementalSummonerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElvenFighterTemplate.java b/data/script/template/script/template/actor/character/ElvenFighterTemplate.java index 7191fb13a..7868338b1 100644 --- a/data/script/template/script/template/actor/character/ElvenFighterTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenFighterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElvenKnightTemplate.java b/data/script/template/script/template/actor/character/ElvenKnightTemplate.java index 7c5de46bc..2d98c985d 100644 --- a/data/script/template/script/template/actor/character/ElvenKnightTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenKnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElvenMysticTemplate.java b/data/script/template/script/template/actor/character/ElvenMysticTemplate.java index 542ba4680..5068f30ad 100644 --- a/data/script/template/script/template/actor/character/ElvenMysticTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenMysticTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElvenScoutTemplate.java b/data/script/template/script/template/actor/character/ElvenScoutTemplate.java index 799204ca4..da2210352 100644 --- a/data/script/template/script/template/actor/character/ElvenScoutTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenScoutTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ElvenWizardTemplate.java b/data/script/template/script/template/actor/character/ElvenWizardTemplate.java index a4685d567..c80dab9f9 100644 --- a/data/script/template/script/template/actor/character/ElvenWizardTemplate.java +++ b/data/script/template/script/template/actor/character/ElvenWizardTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/EvaSaintTemplate.java b/data/script/template/script/template/actor/character/EvaSaintTemplate.java index 189a24698..ef24cee9b 100644 --- a/data/script/template/script/template/actor/character/EvaSaintTemplate.java +++ b/data/script/template/script/template/actor/character/EvaSaintTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/EvaTemplarTemplate.java b/data/script/template/script/template/actor/character/EvaTemplarTemplate.java index 2dc845ced..5a7e3e2a0 100644 --- a/data/script/template/script/template/actor/character/EvaTemplarTemplate.java +++ b/data/script/template/script/template/actor/character/EvaTemplarTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java b/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java index 61448c75d..0e771f9fb 100644 --- a/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java +++ b/data/script/template/script/template/actor/character/FemaleSoldierTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java b/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java index c30154ca8..b8380ca00 100644 --- a/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java +++ b/data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java b/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java index e381402d9..531bcfe0e 100644 --- a/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java +++ b/data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java b/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java index 2ccd2eaf4..30ee37db9 100644 --- a/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java +++ b/data/script/template/script/template/actor/character/FortuneSeekerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/GhostHunterTemplate.java b/data/script/template/script/template/actor/character/GhostHunterTemplate.java index 63cea365b..f91111315 100644 --- a/data/script/template/script/template/actor/character/GhostHunterTemplate.java +++ b/data/script/template/script/template/actor/character/GhostHunterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/GhostSentinelTemplate.java b/data/script/template/script/template/actor/character/GhostSentinelTemplate.java index 60bcf1cdf..04c3eefa0 100644 --- a/data/script/template/script/template/actor/character/GhostSentinelTemplate.java +++ b/data/script/template/script/template/actor/character/GhostSentinelTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/GladiatorTemplate.java b/data/script/template/script/template/actor/character/GladiatorTemplate.java index 53ea27a53..a74114bd9 100644 --- a/data/script/template/script/template/actor/character/GladiatorTemplate.java +++ b/data/script/template/script/template/actor/character/GladiatorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java b/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java index e71a9e81a..970281d23 100644 --- a/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java +++ b/data/script/template/script/template/actor/character/GrandKhauatariTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/HawkeyeTemplate.java b/data/script/template/script/template/actor/character/HawkeyeTemplate.java index c562a83b1..284552200 100644 --- a/data/script/template/script/template/actor/character/HawkeyeTemplate.java +++ b/data/script/template/script/template/actor/character/HawkeyeTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/HellKnightTemplate.java b/data/script/template/script/template/actor/character/HellKnightTemplate.java index 89c8aee8f..925051c30 100644 --- a/data/script/template/script/template/actor/character/HellKnightTemplate.java +++ b/data/script/template/script/template/actor/character/HellKnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/HierophantTemplate.java b/data/script/template/script/template/actor/character/HierophantTemplate.java index 0e8d45af3..17460ecc4 100644 --- a/data/script/template/script/template/actor/character/HierophantTemplate.java +++ b/data/script/template/script/template/actor/character/HierophantTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/HumanFighterTemplate.java b/data/script/template/script/template/actor/character/HumanFighterTemplate.java index 933cc3e0b..58f21a6e0 100644 --- a/data/script/template/script/template/actor/character/HumanFighterTemplate.java +++ b/data/script/template/script/template/actor/character/HumanFighterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/HumanMysticTemplate.java b/data/script/template/script/template/actor/character/HumanMysticTemplate.java index 77d038f5a..d566bf164 100644 --- a/data/script/template/script/template/actor/character/HumanMysticTemplate.java +++ b/data/script/template/script/template/actor/character/HumanMysticTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/InspectorTemplate.java b/data/script/template/script/template/actor/character/InspectorTemplate.java index e619c7361..11c40b7de 100644 --- a/data/script/template/script/template/actor/character/InspectorTemplate.java +++ b/data/script/template/script/template/actor/character/InspectorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/JudicatorTemplate.java b/data/script/template/script/template/actor/character/JudicatorTemplate.java index 4bc317375..0c52e920d 100644 --- a/data/script/template/script/template/actor/character/JudicatorTemplate.java +++ b/data/script/template/script/template/actor/character/JudicatorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/KnightTemplate.java b/data/script/template/script/template/actor/character/KnightTemplate.java index e822fedd0..7933d583e 100644 --- a/data/script/template/script/template/actor/character/KnightTemplate.java +++ b/data/script/template/script/template/actor/character/KnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/MaestroTemplate.java b/data/script/template/script/template/actor/character/MaestroTemplate.java index 375a09429..2af34b687 100644 --- a/data/script/template/script/template/actor/character/MaestroTemplate.java +++ b/data/script/template/script/template/actor/character/MaestroTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/MaleSoldierTemplate.java b/data/script/template/script/template/actor/character/MaleSoldierTemplate.java index 08ff7e5f8..4b05884fb 100644 --- a/data/script/template/script/template/actor/character/MaleSoldierTemplate.java +++ b/data/script/template/script/template/actor/character/MaleSoldierTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java b/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java index 396ad128a..e7e561aea 100644 --- a/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java +++ b/data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java b/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java index 4cbba86f2..913b0a7bb 100644 --- a/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java +++ b/data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java b/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java index 3541a5198..7cef9679a 100644 --- a/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java +++ b/data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/MysticMuseTemplate.java b/data/script/template/script/template/actor/character/MysticMuseTemplate.java index 1b23ec51d..efe2b8ce6 100644 --- a/data/script/template/script/template/actor/character/MysticMuseTemplate.java +++ b/data/script/template/script/template/actor/character/MysticMuseTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/NecromancerTemplate.java b/data/script/template/script/template/actor/character/NecromancerTemplate.java index 0f0ec5bc1..b88d535da 100644 --- a/data/script/template/script/template/actor/character/NecromancerTemplate.java +++ b/data/script/template/script/template/actor/character/NecromancerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OracleTemplate.java b/data/script/template/script/template/actor/character/OracleTemplate.java index f8fe3eb96..6041df647 100644 --- a/data/script/template/script/template/actor/character/OracleTemplate.java +++ b/data/script/template/script/template/actor/character/OracleTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OrcFighterTemplate.java b/data/script/template/script/template/actor/character/OrcFighterTemplate.java index ff9b428f3..14445e495 100644 --- a/data/script/template/script/template/actor/character/OrcFighterTemplate.java +++ b/data/script/template/script/template/actor/character/OrcFighterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OrcMonkTemplate.java b/data/script/template/script/template/actor/character/OrcMonkTemplate.java index 52ffc4a60..ee6add3ca 100644 --- a/data/script/template/script/template/actor/character/OrcMonkTemplate.java +++ b/data/script/template/script/template/actor/character/OrcMonkTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OrcMysticTemplate.java b/data/script/template/script/template/actor/character/OrcMysticTemplate.java index 5f1953643..4bfed5115 100644 --- a/data/script/template/script/template/actor/character/OrcMysticTemplate.java +++ b/data/script/template/script/template/actor/character/OrcMysticTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OrcRaiderTemplate.java b/data/script/template/script/template/actor/character/OrcRaiderTemplate.java index fd01c6a49..f593e9db8 100644 --- a/data/script/template/script/template/actor/character/OrcRaiderTemplate.java +++ b/data/script/template/script/template/actor/character/OrcRaiderTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OrcShamanTemplate.java b/data/script/template/script/template/actor/character/OrcShamanTemplate.java index e3392cc95..232047719 100644 --- a/data/script/template/script/template/actor/character/OrcShamanTemplate.java +++ b/data/script/template/script/template/actor/character/OrcShamanTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/OverlordTemplate.java b/data/script/template/script/template/actor/character/OverlordTemplate.java index 56993db54..52f1d20fb 100644 --- a/data/script/template/script/template/actor/character/OverlordTemplate.java +++ b/data/script/template/script/template/actor/character/OverlordTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/PaladinTemplate.java b/data/script/template/script/template/actor/character/PaladinTemplate.java index 503938776..814f4d905 100644 --- a/data/script/template/script/template/actor/character/PaladinTemplate.java +++ b/data/script/template/script/template/actor/character/PaladinTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/PalusKnightTemplate.java b/data/script/template/script/template/actor/character/PalusKnightTemplate.java index ab24231af..27f6d8e96 100644 --- a/data/script/template/script/template/actor/character/PalusKnightTemplate.java +++ b/data/script/template/script/template/actor/character/PalusKnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/PhantomRangerTemplate.java b/data/script/template/script/template/actor/character/PhantomRangerTemplate.java index a1c0d5df1..eea50a858 100644 --- a/data/script/template/script/template/actor/character/PhantomRangerTemplate.java +++ b/data/script/template/script/template/actor/character/PhantomRangerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java b/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java index e92865534..d3c7271f8 100644 --- a/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java +++ b/data/script/template/script/template/actor/character/PhantomSummonerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java b/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java index f060c5b13..6ed676012 100644 --- a/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java +++ b/data/script/template/script/template/actor/character/PhoenixKnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java b/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java index 30f39f5f4..296a5d42c 100644 --- a/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java +++ b/data/script/template/script/template/actor/character/PlainsWalkerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ProphetTemplate.java b/data/script/template/script/template/actor/character/ProphetTemplate.java index 8c7882f67..83355326d 100644 --- a/data/script/template/script/template/actor/character/ProphetTemplate.java +++ b/data/script/template/script/template/actor/character/ProphetTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/RogueTemplate.java b/data/script/template/script/template/actor/character/RogueTemplate.java index f79741952..8a81ca4d9 100644 --- a/data/script/template/script/template/actor/character/RogueTemplate.java +++ b/data/script/template/script/template/actor/character/RogueTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SagittariusTemplate.java b/data/script/template/script/template/actor/character/SagittariusTemplate.java index c3b8fad1b..8b46759f3 100644 --- a/data/script/template/script/template/actor/character/SagittariusTemplate.java +++ b/data/script/template/script/template/actor/character/SagittariusTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ScavengerTemplate.java b/data/script/template/script/template/actor/character/ScavengerTemplate.java index 1c0d22734..bb4cd5fbe 100644 --- a/data/script/template/script/template/actor/character/ScavengerTemplate.java +++ b/data/script/template/script/template/actor/character/ScavengerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java b/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java index 568f5492e..0b5ee53c0 100644 --- a/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java +++ b/data/script/template/script/template/actor/character/ShillieanSaintTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ShillienElderTemplate.java b/data/script/template/script/template/actor/character/ShillienElderTemplate.java index 6c4166597..389f7391e 100644 --- a/data/script/template/script/template/actor/character/ShillienElderTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienElderTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ShillienKnightTemplate.java b/data/script/template/script/template/actor/character/ShillienKnightTemplate.java index fe6849b6b..a6dd091b9 100644 --- a/data/script/template/script/template/actor/character/ShillienKnightTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienKnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ShillienOracleTemplate.java b/data/script/template/script/template/actor/character/ShillienOracleTemplate.java index efbd723ec..2d1c418ce 100644 --- a/data/script/template/script/template/actor/character/ShillienOracleTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienOracleTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java b/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java index 765ed877e..4d2ea2867 100644 --- a/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java +++ b/data/script/template/script/template/actor/character/ShillienTemplarTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SilverRangerTemplate.java b/data/script/template/script/template/actor/character/SilverRangerTemplate.java index 8ccf4fd6f..06056c01c 100644 --- a/data/script/template/script/template/actor/character/SilverRangerTemplate.java +++ b/data/script/template/script/template/actor/character/SilverRangerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SorcerorTemplate.java b/data/script/template/script/template/actor/character/SorcerorTemplate.java index f9cc9f3d7..62ed365f4 100644 --- a/data/script/template/script/template/actor/character/SorcerorTemplate.java +++ b/data/script/template/script/template/actor/character/SorcerorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SoultakerTemplate.java b/data/script/template/script/template/actor/character/SoultakerTemplate.java index 9aee990af..2c61c3739 100644 --- a/data/script/template/script/template/actor/character/SoultakerTemplate.java +++ b/data/script/template/script/template/actor/character/SoultakerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SpectralMasterTemplate.java b/data/script/template/script/template/actor/character/SpectralMasterTemplate.java index 89c73b321..c473282d1 100644 --- a/data/script/template/script/template/actor/character/SpectralMasterTemplate.java +++ b/data/script/template/script/template/actor/character/SpectralMasterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SpectraldancerTemplate.java b/data/script/template/script/template/actor/character/SpectraldancerTemplate.java index 191c624e0..b8523abc0 100644 --- a/data/script/template/script/template/actor/character/SpectraldancerTemplate.java +++ b/data/script/template/script/template/actor/character/SpectraldancerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SpellhowlerTemplate.java b/data/script/template/script/template/actor/character/SpellhowlerTemplate.java index 4687ae789..1f44620e0 100644 --- a/data/script/template/script/template/actor/character/SpellhowlerTemplate.java +++ b/data/script/template/script/template/actor/character/SpellhowlerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SpellsingerTemplate.java b/data/script/template/script/template/actor/character/SpellsingerTemplate.java index ff3cae936..dc89b33c4 100644 --- a/data/script/template/script/template/actor/character/SpellsingerTemplate.java +++ b/data/script/template/script/template/actor/character/SpellsingerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/StormScreamerTemplate.java b/data/script/template/script/template/actor/character/StormScreamerTemplate.java index 91620d92a..55627ccb0 100644 --- a/data/script/template/script/template/actor/character/StormScreamerTemplate.java +++ b/data/script/template/script/template/actor/character/StormScreamerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SwordMuseTemplate.java b/data/script/template/script/template/actor/character/SwordMuseTemplate.java index 18a84f477..d78dfbc99 100644 --- a/data/script/template/script/template/actor/character/SwordMuseTemplate.java +++ b/data/script/template/script/template/actor/character/SwordMuseTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/SwordSingerTemplate.java b/data/script/template/script/template/actor/character/SwordSingerTemplate.java index 8d81d5335..b43b04d9b 100644 --- a/data/script/template/script/template/actor/character/SwordSingerTemplate.java +++ b/data/script/template/script/template/actor/character/SwordSingerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/TempleKnightTemplate.java b/data/script/template/script/template/actor/character/TempleKnightTemplate.java index edf078382..42f1c4966 100644 --- a/data/script/template/script/template/actor/character/TempleKnightTemplate.java +++ b/data/script/template/script/template/actor/character/TempleKnightTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/TitanTemplate.java b/data/script/template/script/template/actor/character/TitanTemplate.java index b6c2f5518..619485557 100644 --- a/data/script/template/script/template/actor/character/TitanTemplate.java +++ b/data/script/template/script/template/actor/character/TitanTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/TreasureHunterTemplate.java b/data/script/template/script/template/actor/character/TreasureHunterTemplate.java index 813bc49b2..7dff4109a 100644 --- a/data/script/template/script/template/actor/character/TreasureHunterTemplate.java +++ b/data/script/template/script/template/actor/character/TreasureHunterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/TricksterTemplate.java b/data/script/template/script/template/actor/character/TricksterTemplate.java index 47ca8b2c5..2088f081c 100644 --- a/data/script/template/script/template/actor/character/TricksterTemplate.java +++ b/data/script/template/script/template/actor/character/TricksterTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/TrooperTemplate.java b/data/script/template/script/template/actor/character/TrooperTemplate.java index 4e7c47e35..f7cf53e81 100644 --- a/data/script/template/script/template/actor/character/TrooperTemplate.java +++ b/data/script/template/script/template/actor/character/TrooperTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/TyrantTemplate.java b/data/script/template/script/template/actor/character/TyrantTemplate.java index 8da551615..a9deb9945 100644 --- a/data/script/template/script/template/actor/character/TyrantTemplate.java +++ b/data/script/template/script/template/actor/character/TyrantTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WarcryerTemplate.java b/data/script/template/script/template/actor/character/WarcryerTemplate.java index befb3c971..3a6447a61 100644 --- a/data/script/template/script/template/actor/character/WarcryerTemplate.java +++ b/data/script/template/script/template/actor/character/WarcryerTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WarderTemplate.java b/data/script/template/script/template/actor/character/WarderTemplate.java index 9ccf71457..574095462 100644 --- a/data/script/template/script/template/actor/character/WarderTemplate.java +++ b/data/script/template/script/template/actor/character/WarderTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WarlockTemplate.java b/data/script/template/script/template/actor/character/WarlockTemplate.java index 283345658..fb5f32314 100644 --- a/data/script/template/script/template/actor/character/WarlockTemplate.java +++ b/data/script/template/script/template/actor/character/WarlockTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WarlordTemplate.java b/data/script/template/script/template/actor/character/WarlordTemplate.java index 6c1b298f2..d4898a9e7 100644 --- a/data/script/template/script/template/actor/character/WarlordTemplate.java +++ b/data/script/template/script/template/actor/character/WarlordTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WarriorTemplate.java b/data/script/template/script/template/actor/character/WarriorTemplate.java index 7e2554dc3..6d43da595 100644 --- a/data/script/template/script/template/actor/character/WarriorTemplate.java +++ b/data/script/template/script/template/actor/character/WarriorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WarsmithTemplate.java b/data/script/template/script/template/actor/character/WarsmithTemplate.java index 44b298106..cddf217c4 100644 --- a/data/script/template/script/template/actor/character/WarsmithTemplate.java +++ b/data/script/template/script/template/actor/character/WarsmithTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WindRiderTemplate.java b/data/script/template/script/template/actor/character/WindRiderTemplate.java index b73efac4c..7bf54fbc6 100644 --- a/data/script/template/script/template/actor/character/WindRiderTemplate.java +++ b/data/script/template/script/template/actor/character/WindRiderTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/actor/character/WizardTemplate.java b/data/script/template/script/template/actor/character/WizardTemplate.java index 3bc027057..d64fc4dc6 100644 --- a/data/script/template/script/template/actor/character/WizardTemplate.java +++ b/data/script/template/script/template/actor/character/WizardTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.actor.character; import com.google.inject.Inject; diff --git a/data/script/template/script/template/item/AdenaItemTemplate.java b/data/script/template/script/template/item/AdenaItemTemplate.java index 124949798..d5ad9c9de 100644 --- a/data/script/template/script/template/item/AdenaItemTemplate.java +++ b/data/script/template/script/template/item/AdenaItemTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item; import com.google.inject.Inject; diff --git a/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java b/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java index 9fb03a1ed..0aaab566a 100644 --- a/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java +++ b/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item.armor; import com.l2jserver.model.id.template.ItemTemplateID; diff --git a/data/script/template/script/template/item/armor/AbstractNoGradeArmorTemplate.java b/data/script/template/script/template/item/armor/AbstractNoGradeArmorTemplate.java index 734361837..41f15979d 100644 --- a/data/script/template/script/template/item/armor/AbstractNoGradeArmorTemplate.java +++ b/data/script/template/script/template/item/armor/AbstractNoGradeArmorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item.armor; import com.l2jserver.model.id.template.ItemTemplateID; diff --git a/data/script/template/script/template/item/armor/Dummy2ArmorTemplate.java b/data/script/template/script/template/item/armor/Dummy2ArmorTemplate.java index 303fc0195..68ee3d152 100644 --- a/data/script/template/script/template/item/armor/Dummy2ArmorTemplate.java +++ b/data/script/template/script/template/item/armor/Dummy2ArmorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item.armor; import com.google.inject.Inject; diff --git a/data/script/template/script/template/item/armor/DummyArmorTemplate.java b/data/script/template/script/template/item/armor/DummyArmorTemplate.java index bf1a408c6..40e732f69 100644 --- a/data/script/template/script/template/item/armor/DummyArmorTemplate.java +++ b/data/script/template/script/template/item/armor/DummyArmorTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item.armor; import com.google.inject.Inject; diff --git a/data/script/template/script/template/item/potion/RedPotionTemplate.java b/data/script/template/script/template/item/potion/RedPotionTemplate.java index e736e5d90..65f5e7c3e 100644 --- a/data/script/template/script/template/item/potion/RedPotionTemplate.java +++ b/data/script/template/script/template/item/potion/RedPotionTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item.potion; import com.google.inject.Inject; diff --git a/data/script/template/script/template/item/weapon/AbstractNoGradeWeaponTemplate.java b/data/script/template/script/template/item/weapon/AbstractNoGradeWeaponTemplate.java index 795018f84..bf0526661 100644 --- a/data/script/template/script/template/item/weapon/AbstractNoGradeWeaponTemplate.java +++ b/data/script/template/script/template/item/weapon/AbstractNoGradeWeaponTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.item.weapon; import com.l2jserver.model.id.template.ItemTemplateID; diff --git a/data/script/template/script/template/skill/TestSkillTemplate.java b/data/script/template/script/template/skill/TestSkillTemplate.java index 3ba4dd3f0..c963f4ecb 100644 --- a/data/script/template/script/template/skill/TestSkillTemplate.java +++ b/data/script/template/script/template/skill/TestSkillTemplate.java @@ -1,4 +1,3 @@ - /* * This file is part of l2jserver . * @@ -14,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . -*/ + */ package script.template.skill; import com.google.inject.Inject; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java index 7b1cbc40f..db2537404 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterSelectPacket.java @@ -64,11 +64,11 @@ public class CharacterSelectPacket extends AbstractClientPacket { public void process(final Lineage2Connection conn) { final List chars = characterDao.selectByAccount(conn .getSession().getAccountID()); - + // FIXME better handling! this will throw an exception sooner or later final L2Character character = chars.get(slot); conn.setCharacterID(character.getID()); - + conn.write(new CharacterSelectedPacket(chars.get(slot))); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java index 24daf304d..30bb02990 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java @@ -140,14 +140,14 @@ public class UserInformationPacket extends AbstractServerPacket { writePaperdollItemID(buffer, character, LEFT_FINGER); writePaperdollItemID(buffer, character, HEAD); buffer.writeInt(246); - //writePaperdollItemID(buffer, character, RIGHT_HAND); + // writePaperdollItemID(buffer, character, RIGHT_HAND); writePaperdollItemID(buffer, character, LEFT_HAND); writePaperdollItemID(buffer, character, GLOVES); writePaperdollItemID(buffer, character, CHEST); writePaperdollItemID(buffer, character, LEGS); writePaperdollItemID(buffer, character, FEET); writePaperdollItemID(buffer, character, CLOAK); - ///writePaperdollItemID(buffer, character, RIGHT_HAND); + // /writePaperdollItemID(buffer, character, RIGHT_HAND); buffer.writeInt(246); writePaperdollItemID(buffer, character, HAIR1); writePaperdollItemID(buffer, character, HAIR2); diff --git a/src/main/java/com/l2jserver/model/AbstractModel.java b/src/main/java/com/l2jserver/model/AbstractModel.java index da909b0ea..3e76d03be 100644 --- a/src/main/java/com/l2jserver/model/AbstractModel.java +++ b/src/main/java/com/l2jserver/model/AbstractModel.java @@ -35,11 +35,11 @@ public class AbstractModel> implements Model { @Override public void setID(T ID) { - if(this.id != null) + if (this.id != null) throw new IllegalStateException("ID is already set"); this.id = ID; } - + @Override public int hashCode() { final int prime = 31; diff --git a/src/main/java/com/l2jserver/model/game/Shortcut.java b/src/main/java/com/l2jserver/model/game/Shortcut.java index 8f5bfa346..83cd6313e 100644 --- a/src/main/java/com/l2jserver/model/game/Shortcut.java +++ b/src/main/java/com/l2jserver/model/game/Shortcut.java @@ -36,7 +36,7 @@ public class Shortcut { * {@link ShortcutType#SKILL}) */ private SkillTemplateID skillID; - + /** * The shortcut item id (only if type is {@link ShortcutType#ITEM}) */ @@ -116,8 +116,7 @@ public class Shortcut { * @param characterType * the character type */ - public Shortcut(CharacterID characterID, ItemID itemID, - int characterType) { + public Shortcut(CharacterID characterID, ItemID itemID, int characterType) { this.type = ShortcutType.ITEM; this.characterID = characterID; this.itemID = itemID; @@ -159,8 +158,8 @@ public class Shortcut { * @param characterType * the character type */ - public Shortcut(CharacterID characterID, ShortcutType type, - int slot, int page, int characterType) { + public Shortcut(CharacterID characterID, ShortcutType type, int slot, + int page, int characterType) { this.characterID = characterID; this.slot = slot; this.page = page; diff --git a/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java b/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java index c1b1b8899..6f93b1c6d 100644 --- a/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java @@ -23,8 +23,7 @@ import com.l2jserver.model.template.ActorTemplate; import com.l2jserver.service.game.template.TemplateService; /** - * An {@link TemplateID} instance representing an {@link ActorTemplate} - * object + * An {@link TemplateID} instance representing an {@link ActorTemplate} object * * @author Rogiel */ @@ -35,8 +34,7 @@ public class ActorTemplateID> extends TemplateID { private final TemplateService templateService; @Inject - protected ActorTemplateID(@Assisted int id, - TemplateService templateService) { + protected ActorTemplateID(@Assisted int id, TemplateService templateService) { super(id); this.templateService = templateService; } diff --git a/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java b/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java index a1dd28f0a..7b541201b 100644 --- a/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java @@ -23,15 +23,13 @@ import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.service.game.template.TemplateService; /** - * An {@link TemplateID} instance representing an {@link NPCTemplate} - * object + * An {@link TemplateID} instance representing an {@link NPCTemplate} object * * @author Rogiel */ public class NPCTemplateID extends ActorTemplateID { @Inject - protected NPCTemplateID(@Assisted int id, - TemplateService templateService) { + protected NPCTemplateID(@Assisted int id, TemplateService templateService) { super(id, templateService); } } diff --git a/src/main/java/com/l2jserver/model/template/item/RecipeTemplate.java b/src/main/java/com/l2jserver/model/template/item/RecipeTemplate.java index 98cae4f7c..217bc0ffb 100644 --- a/src/main/java/com/l2jserver/model/template/item/RecipeTemplate.java +++ b/src/main/java/com/l2jserver/model/template/item/RecipeTemplate.java @@ -26,9 +26,16 @@ import com.l2jserver.model.world.Item; * @author Rogiel */ public abstract class RecipeTemplate extends ItemTemplate { - private ItemTemplateID item; + protected ItemTemplateID item; public RecipeTemplate(ItemTemplateID id) { super(id); } + + /** + * @return the item + */ + public ItemTemplateID getItem() { + return item; + } } diff --git a/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java b/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java index fb68b3e61..a7caf31fd 100644 --- a/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java +++ b/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java @@ -16,24 +16,15 @@ */ package com.l2jserver.model.world.actor.event; -import com.l2jserver.service.game.world.event.WorldEvent; -import com.l2jserver.service.game.world.event.WorldListener; +import com.l2jserver.service.game.world.event.FilteredWorldListener; /** * This listener will filter to only dispatch {@link ActorEvent} events. * * @author Rogiel */ -public abstract class ActorListener implements WorldListener { - @Override - public boolean dispatch(WorldEvent e) { - if (!(e instanceof ActorEvent)) - return false; - return dispatch((ActorEvent) e); +public abstract class ActorListener extends FilteredWorldListener { + public ActorListener() { + super(ActorEvent.class); } - - /** - * @see WorldListener#dispatch(WorldEvent) - */ - protected abstract boolean dispatch(ActorEvent e); } diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterClass.java b/src/main/java/com/l2jserver/model/world/character/CharacterClass.java index 406c5a546..2e3e91504 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterClass.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterClass.java @@ -34,8 +34,8 @@ public enum CharacterClass { 0x09, ROGUE), // 3rd classes DUELIST(0x58, GLADIATOR), DREADNOUGHT(0x59, WARLORD), PHOENIX_KNIGHT(0x5a, - PALADIN), HELL_KNIGHT(0x5b, DARK_AVENGER), SAGITTARIUS(0x5c, HAWKEYE), ADVENTURER( - 0x5d, TREASURE_HUNTER), + PALADIN), HELL_KNIGHT(0x5b, DARK_AVENGER), SAGITTARIUS(0x5c, + HAWKEYE), ADVENTURER(0x5d, TREASURE_HUNTER), /** * Human mystic diff --git a/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java b/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java index 5d2825d4d..65c584aa9 100644 --- a/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java +++ b/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java @@ -16,24 +16,16 @@ */ package com.l2jserver.model.world.character.event; -import com.l2jserver.service.game.world.event.WorldEvent; -import com.l2jserver.service.game.world.event.WorldListener; +import com.l2jserver.service.game.world.event.FilteredWorldListener; /** * This listener will filter to only dispatch {@link CharacterEvent} events. * * @author Rogiel */ -public abstract class CharacterListener implements WorldListener { - @Override - public boolean dispatch(WorldEvent e) { - if (!(e instanceof CharacterEvent)) - return false; - return dispatch((CharacterEvent) e); +public abstract class CharacterListener extends + FilteredWorldListener { + public CharacterListener() { + super(CharacterEvent.class); } - - /** - * @see WorldListener#dispatch(WorldEvent) - */ - protected abstract boolean dispatch(CharacterEvent e); -} +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/model/world/clan/ClanListener.java b/src/main/java/com/l2jserver/model/world/clan/ClanListener.java index 8b9acdfb8..45e1edcbe 100644 --- a/src/main/java/com/l2jserver/model/world/clan/ClanListener.java +++ b/src/main/java/com/l2jserver/model/world/clan/ClanListener.java @@ -16,24 +16,15 @@ */ package com.l2jserver.model.world.clan; -import com.l2jserver.service.game.world.event.WorldEvent; -import com.l2jserver.service.game.world.event.WorldListener; +import com.l2jserver.service.game.world.event.FilteredWorldListener; /** * This listener will filter to only dispatch {@link ClanEvent} events. * * @author Rogiel */ -public abstract class ClanListener implements WorldListener { - @Override - public boolean dispatch(WorldEvent e) { - if (!(e instanceof ClanEvent)) - return false; - return dispatch((ClanEvent) e); +public abstract class ClanListener extends FilteredWorldListener { + public ClanListener() { + super(ClanEvent.class); } - - /** - * @see WorldListener#dispatch(WorldEvent) - */ - protected abstract boolean dispatch(ClanEvent e); } diff --git a/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java b/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java index 82cd61177..746e02fd6 100644 --- a/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java +++ b/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java @@ -29,5 +29,8 @@ public interface SpawnEvent extends WorldEvent { @Override Spawnable getObject(); + /** + * @return the spawning coordinate + */ Coordinate getCoordinate(); } \ No newline at end of file diff --git a/src/main/java/com/l2jserver/model/world/item/ItemListener.java b/src/main/java/com/l2jserver/model/world/item/ItemListener.java index 1fac3b58b..c5ab92751 100644 --- a/src/main/java/com/l2jserver/model/world/item/ItemListener.java +++ b/src/main/java/com/l2jserver/model/world/item/ItemListener.java @@ -16,24 +16,15 @@ */ package com.l2jserver.model.world.item; -import com.l2jserver.service.game.world.event.WorldEvent; -import com.l2jserver.service.game.world.event.WorldListener; +import com.l2jserver.service.game.world.event.FilteredWorldListener; /** * This listener will filter to only dispatch {@link ItemEvent} events. * * @author Rogiel */ -public abstract class ItemListener implements WorldListener { - @Override - public boolean dispatch(WorldEvent e) { - if (!(e instanceof ItemEvent)) - return false; - return dispatch((ItemEvent) e); +public abstract class ItemListener extends FilteredWorldListener { + public ItemListener() { + super(ItemEvent.class); } - - /** - * @see WorldListener#dispatch(WorldEvent) - */ - protected abstract boolean dispatch(ItemEvent e); } diff --git a/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java b/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java index 4f0db7df0..5cd405a3a 100644 --- a/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java +++ b/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java @@ -16,24 +16,15 @@ */ package com.l2jserver.model.world.player.event; -import com.l2jserver.service.game.world.event.WorldEvent; -import com.l2jserver.service.game.world.event.WorldListener; +import com.l2jserver.service.game.world.event.FilteredWorldListener; /** - * Listener for {@link PlayerEvent} + * This listener will filter to only dispatch {@link PlayerEvent} events. * * @author Rogiel */ -public abstract class PlayerListener implements WorldListener { - @Override - public boolean dispatch(WorldEvent e) { - if (!(e instanceof PlayerEvent)) - return false; - return dispatch((PlayerEvent) e); +public abstract class PlayerListener extends FilteredWorldListener { + public PlayerListener() { + super(PlayerEvent.class); } - - /** - * @see WorldListener#dispatch(WorldEvent) - */ - protected abstract boolean dispatch(PlayerEvent e); -} +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/admin/GMService.java b/src/main/java/com/l2jserver/service/admin/GMService.java index 17224ea64..00673b43e 100644 --- a/src/main/java/com/l2jserver/service/admin/GMService.java +++ b/src/main/java/com/l2jserver/service/admin/GMService.java @@ -24,5 +24,5 @@ import com.l2jserver.service.Service; * @author Rogiel */ public interface GMService extends Service { - + } diff --git a/src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java b/src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java index ee56330a4..4d039830f 100644 --- a/src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java +++ b/src/main/java/com/l2jserver/service/blowfish/SecureBlowfishKeygenService.java @@ -20,7 +20,6 @@ import org.apache.commons.math.random.RandomData; import org.apache.commons.math.random.RandomDataImpl; import com.l2jserver.service.AbstractService; -import com.l2jserver.service.Service; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStopException; diff --git a/src/main/java/com/l2jserver/service/cache/EhCacheService.java b/src/main/java/com/l2jserver/service/cache/EhCacheService.java index 24e9ab00f..0fe6ed490 100644 --- a/src/main/java/com/l2jserver/service/cache/EhCacheService.java +++ b/src/main/java/com/l2jserver/service/cache/EhCacheService.java @@ -83,14 +83,11 @@ public class EhCacheService extends AbstractService implements CacheService { @Override public Cache createCache(String name, int size) { - Cache cache = new Cache( - new CacheConfiguration(name, size) - .memoryStoreEvictionPolicy( - MemoryStoreEvictionPolicy.LRU) - .overflowToDisk(true).eternal(false) - .timeToLiveSeconds(60).timeToIdleSeconds(30) - .diskPersistent(false) - .diskExpiryThreadIntervalSeconds(0)); + Cache cache = new Cache(new CacheConfiguration(name, size) + .memoryStoreEvictionPolicy(MemoryStoreEvictionPolicy.LRU) + .overflowToDisk(true).eternal(false).timeToLiveSeconds(60) + .timeToIdleSeconds(30).diskPersistent(false) + .diskExpiryThreadIntervalSeconds(0)); register(cache); return cache; } diff --git a/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java b/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java index 03c9e8c66..8c8056ae1 100644 --- a/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java +++ b/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java @@ -42,12 +42,12 @@ public class DB4ODatabaseService extends AbstractService implements @Override public void updateCache(Object key, Object value) { // TODO Auto-generated method stub - + } @Override public void removeCache(Object key) { // TODO Auto-generated method stub - + } } diff --git a/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java b/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java index 8bd6ab0dd..54e510778 100644 --- a/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java @@ -27,7 +27,7 @@ public class GameTimeServiceImpl extends AbstractService implements GameTimeService { @Override public int getGameTime() { - //TODO implement this! + // TODO implement this! return (int) (System.currentTimeMillis() / 1000); } } diff --git a/src/main/java/com/l2jserver/service/game/region/Region.java b/src/main/java/com/l2jserver/service/game/region/Region.java index f50931014..178bda51c 100644 --- a/src/main/java/com/l2jserver/service/game/region/Region.java +++ b/src/main/java/com/l2jserver/service/game/region/Region.java @@ -18,7 +18,7 @@ package com.l2jserver.service.game.region; /** * @author Rogiel - * + * */ public interface Region { diff --git a/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java b/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java index c0e237875..d14cdbd29 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java +++ b/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java b/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java index b5dc8c827..4bfda891b 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java +++ b/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java @@ -14,76 +14,76 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.service.game.scripting; - -import java.io.File; - -/** - * This interface reperesents common functionality list that should be available - * for any commpiler that is going to be used with scripting engine. For - * instance, groovy can be used, hoever it produces by far not the best bytecode - * so by default javac from sun is used. - * - * @author Rogiel - */ -public interface ScriptCompiler { - /** - * Sets parent class loader for this compiler.
- *
- * Warning, for now only - * - * @param classLoader - * ScriptClassLoader that will be used as parent - */ - void setParentClassLoader(ScriptClassLoader classLoader); - - /** - * List of jar files that are required for compilation - * - * @param files - * list of jar files - */ - void setLibraires(Iterable files); - - /** - * Compiles single class that is represented as string - * - * @param className - * class name - * @param sourceCode - * class sourse code - * @return {@link CompilationResult} - */ - CompilationResult compile(String className, String sourceCode); - - /** - * Compiles classes that are represented as strings - * - * @param className - * class names - * @param sourceCode - * class sources - * @return {@link CompilationResult} - * @throws IllegalArgumentException - * if number of class names != number of sources - */ - CompilationResult compile(String[] className, String[] sourceCode) - throws IllegalArgumentException; - - /** - * Compiles list of files - * - * @param compilationUnits - * list of files - * @return {@link CompilationResult} - */ - CompilationResult compile(Iterable compilationUnits); - - /** - * Returns array of supported file types. This files will be threated as - * source files. - * - * @return array of supported file types. - */ - String[] getSupportedFileTypes(); -} +package com.l2jserver.service.game.scripting; + +import java.io.File; + +/** + * This interface reperesents common functionality list that should be available + * for any commpiler that is going to be used with scripting engine. For + * instance, groovy can be used, hoever it produces by far not the best bytecode + * so by default javac from sun is used. + * + * @author Rogiel + */ +public interface ScriptCompiler { + /** + * Sets parent class loader for this compiler.
+ *
+ * Warning, for now only + * + * @param classLoader + * ScriptClassLoader that will be used as parent + */ + void setParentClassLoader(ScriptClassLoader classLoader); + + /** + * List of jar files that are required for compilation + * + * @param files + * list of jar files + */ + void setLibraires(Iterable files); + + /** + * Compiles single class that is represented as string + * + * @param className + * class name + * @param sourceCode + * class sourse code + * @return {@link CompilationResult} + */ + CompilationResult compile(String className, String sourceCode); + + /** + * Compiles classes that are represented as strings + * + * @param className + * class names + * @param sourceCode + * class sources + * @return {@link CompilationResult} + * @throws IllegalArgumentException + * if number of class names != number of sources + */ + CompilationResult compile(String[] className, String[] sourceCode) + throws IllegalArgumentException; + + /** + * Compiles list of files + * + * @param compilationUnits + * list of files + * @return {@link CompilationResult} + */ + CompilationResult compile(Iterable compilationUnits); + + /** + * Returns array of supported file types. This files will be threated as + * source files. + * + * @return array of supported file types. + */ + String[] getSupportedFileTypes(); +} diff --git a/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java b/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java index 480af9c4d..380dbc23f 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java +++ b/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java b/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java index f08e4429c..09d382c7f 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java +++ b/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java @@ -14,32 +14,32 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.service.game.scripting.classlistener; - -/** - * This interface implements listener that is called post class load/before - * class unload.
- * Default implementation is: {@link DefaultClassListener} - * - * @author Rogiel - */ -public interface ClassListener { - - /** - * This method is invoked after classes were loaded. As areguments are - * passes all loaded classes - * - * @param classes - * classes that were loaded - */ - public void postLoad(Class... classes); - - /** - * This method is invoked before class unloading. As argument are passes all - * loaded classes - * - * @param classes - * classes that were loaded - */ - public void preUnload(Class... classes); -} +package com.l2jserver.service.game.scripting.classlistener; + +/** + * This interface implements listener that is called post class load/before + * class unload.
+ * Default implementation is: {@link DefaultClassListener} + * + * @author Rogiel + */ +public interface ClassListener { + + /** + * This method is invoked after classes were loaded. As areguments are + * passes all loaded classes + * + * @param classes + * classes that were loaded + */ + public void postLoad(Class... classes); + + /** + * This method is invoked before class unloading. As argument are passes all + * loaded classes + * + * @param classes + * classes that were loaded + */ + public void preUnload(Class... classes); +} diff --git a/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java b/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java index 8cada1df9..6dd212d0e 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java +++ b/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.classlistener; import java.lang.reflect.Modifier; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java b/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java index 2d09bd924..af1f8bef7 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/BinaryClass.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/BinaryClass.java index 71a289cb7..7bc0d90e2 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/BinaryClass.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/BinaryClass.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.ByteArrayInputStream; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java index 15bf9d6d4..31bef3f29 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ErrorListener.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ErrorListener.java index 8b2e99352..b837ca064 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ErrorListener.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ErrorListener.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.util.Locale; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromFile.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromFile.java index f2579e3b7..e6e962e39 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromFile.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromFile.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromString.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromString.java index b719b26c1..b7fbcce6f 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromString.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/JavaSourceFromString.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.net.URI; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptClassLoaderImpl.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptClassLoaderImpl.java index 0ea5ff5ca..f1a95df1c 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptClassLoaderImpl.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptClassLoaderImpl.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptCompilerImpl.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptCompilerImpl.java index 78e98e213..b2ba42668 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptCompilerImpl.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ScriptCompilerImpl.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLConnection.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLConnection.java index f65d3ca22..3b1787a3a 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLConnection.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLConnection.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.ByteArrayInputStream; diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLStreamHandler.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLStreamHandler.java index ebd6f2d76..e577e9f54 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLStreamHandler.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/VirtualClassURLStreamHandler.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.impl.javacc; import java.io.IOException; diff --git a/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java b/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java index 71841228e..f9457bf15 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java +++ b/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.scriptmanager; import java.io.File; diff --git a/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java b/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java index 74e15dada..cbc8c79f0 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java +++ b/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.service.game.scripting.scriptmanager; import java.util.Set; diff --git a/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java b/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java new file mode 100644 index 000000000..4486fd2da --- /dev/null +++ b/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java @@ -0,0 +1,43 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.game.world.event; + +/** + * This listener will filter to only dispatch an certain type events. + * + * @author Rogiel + */ +public abstract class FilteredWorldListener implements WorldListener { + private final Class type; + + public FilteredWorldListener(Class type) { + this.type = type; + } + + @Override + @SuppressWarnings("unchecked") + public boolean dispatch(WorldEvent e) { + if (!type.isInstance(e)) + return false; + return dispatch((T) e); + } + + /** + * @see WorldListener#dispatch(WorldEvent) + */ + protected abstract boolean dispatch(T e); +} diff --git a/src/main/java/com/l2jserver/service/threading/ThreadService.java b/src/main/java/com/l2jserver/service/threading/ThreadService.java new file mode 100644 index 000000000..f7ad07250 --- /dev/null +++ b/src/main/java/com/l2jserver/service/threading/ThreadService.java @@ -0,0 +1,27 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.service.threading; + +/** + * This service is responsible for scheduling tasks and executing them in + * parallel. + * + * @author Rogiel + */ +public interface ThreadService { + +} diff --git a/src/main/java/com/l2jserver/util/ClassUtils.java b/src/main/java/com/l2jserver/util/ClassUtils.java index b79dfe1cc..35eaa9ea0 100644 --- a/src/main/java/com/l2jserver/util/ClassUtils.java +++ b/src/main/java/com/l2jserver/util/ClassUtils.java @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . - */ + */ package com.l2jserver.util; /** diff --git a/src/main/java/com/l2jserver/util/PrimeFinder.java b/src/main/java/com/l2jserver/util/PrimeFinder.java index 26b2f30d7..862b8ac9f 100644 --- a/src/main/java/com/l2jserver/util/PrimeFinder.java +++ b/src/main/java/com/l2jserver/util/PrimeFinder.java @@ -7,22 +7,22 @@ // supporting documentation. CERN makes no representations about the // suitability of this software for any purpose. It is provided "as is" // without expressed or implied warranty. -/* - * This file is part of l2jserver . - * - * l2jserver is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * l2jserver is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with l2jserver. If not, see . - */ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ package com.l2jserver.util; import java.util.Arrays; diff --git a/src/tool/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java b/src/tool/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java index ebbe128aa..3da373f68 100644 --- a/src/tool/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java +++ b/src/tool/java/com/l2jserver/tool/conversor/itemtemplate/ItemValueXml.java @@ -28,26 +28,32 @@ public class ItemValueXml { private String name; @XmlAttribute(name = "val") private String value; + /** * @return the name */ public String getName() { return name; } + /** - * @param name the name to set + * @param name + * the name to set */ public void setName(String name) { this.name = name; } + /** * @return the value */ public String getValue() { return value; } + /** - * @param value the value to set + * @param value + * the value to set */ public void setValue(String value) { this.value = value;