diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml b/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml new file mode 100644 index 000000000..a20786506 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + + l2jserver2-gameserver + com.l2jserver + 0.0.2-SNAPSHOT + .. + + l2jserver2-gameserver-core + + + + + org.apache.maven.plugins + maven-assembly-plugin + + true + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + src/main/generated + + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + + + generate-sources + + generate + + + + + org.jvnet.jaxb2_commons + jaxb2-basics + 0.5.3 + + + + + -extension + -Xinheritance + + data/template + + *.xsd + + src/main/generated + com.l2jserver.model.template + + + + + + + \ No newline at end of file diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode new file mode 100755 index 000000000..dcd7b06c0 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java new file mode 100755 index 000000000..479214f8f --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java @@ -0,0 +1,48 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for AbstractTemplate complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="AbstractTemplate">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AbstractTemplate") +@XmlSeeAlso({ + ItemTemplate.class, + ActorTemplate.class, + SkillTemplate.class, + com.l2jserver.model.template.Teleports.Teleport.class +}) +public abstract class AbstractTemplate + implements Template +{ + + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java new file mode 100755 index 000000000..560a28705 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java @@ -0,0 +1,44 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for ActorTemplate complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="ActorTemplate">
+ *   <complexContent>
+ *     <extension base="{}AbstractTemplate">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ActorTemplate") +@XmlSeeAlso({ + CharacterTemplate.class, + NPCTemplate.class +}) +public abstract class ActorTemplate + extends AbstractTemplate +{ + + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java new file mode 100644 index 000000000..a6275ac77 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java @@ -0,0 +1,148 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for CalculatorFunction complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="CalculatorFunction">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="set" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         <element name="add" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         <element name="subtract" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         <element name="random" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "CalculatorFunction", propOrder = { + "set", + "add", + "subtract", + "random" +}) +public class CalculatorFunction { + + protected CalculatorFunctionOperation set; + protected CalculatorFunctionOperation add; + protected CalculatorFunctionOperation subtract; + protected CalculatorFunctionOperation random; + + /** + * Gets the value of the set property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getSet() { + return set; + } + + /** + * Sets the value of the set property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setSet(CalculatorFunctionOperation value) { + this.set = value; + } + + /** + * Gets the value of the add property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setAdd(CalculatorFunctionOperation value) { + this.add = value; + } + + /** + * Gets the value of the subtract property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getSubtract() { + return subtract; + } + + /** + * Sets the value of the subtract property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setSubtract(CalculatorFunctionOperation value) { + this.subtract = value; + } + + /** + * Gets the value of the random property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getRandom() { + return random; + } + + /** + * Sets the value of the random property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setRandom(CalculatorFunctionOperation value) { + this.random = value; + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java new file mode 100755 index 000000000..87c5c37b1 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java @@ -0,0 +1,86 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import java.math.BigInteger; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for CalculatorFunctionOperation complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="CalculatorFunctionOperation">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "CalculatorFunctionOperation") +public class CalculatorFunctionOperation { + + @XmlAttribute(name = "order", required = true) + protected BigInteger order; + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the order property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getOrder() { + return order; + } + + /** + * Sets the value of the order property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setOrder(BigInteger value) { + this.order = value; + } + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java new file mode 100755 index 000000000..1bff029d4 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java @@ -0,0 +1,1895 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import com.l2jserver.model.id.template.CharacterTemplateID; +import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter; + + +/** + *

Java class for character element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="character">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}ActorTemplate">
+ *         <sequence>
+ *           <element name="stats">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="hp">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="mp">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="cp">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="attack">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <element name="physical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="magical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </sequence>
+ *                             <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="defense">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <element name="physical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="magical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </sequence>
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="move">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="base">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                   </sequence>
+ *                   <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="collision">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="male">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="female">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *         </sequence>
+ *         <attribute name="class" use="required" type="{http://schemas.l2jserver2.com/character}CharacterTemplateID" />
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "stats", + "collision" +}) +@XmlRootElement(name = "character", namespace = "http://schemas.l2jserver2.com/character") +public class CharacterTemplate + extends ActorTemplate +{ + + @XmlElement(required = true) + protected CharacterTemplate.Stats stats; + @XmlElement(required = true) + protected CharacterTemplate.Collision collision; + @XmlAttribute(name = "class", required = true) + @XmlJavaTypeAdapter(CharacterTemplateIDAdapter.class) + protected CharacterTemplateID id; + + /** + * Gets the value of the stats property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats } + * + */ + public CharacterTemplate.Stats getStats() { + return stats; + } + + /** + * Sets the value of the stats property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats } + * + */ + public void setStats(CharacterTemplate.Stats value) { + this.stats = value; + } + + /** + * Gets the value of the collision property. + * + * @return + * possible object is + * {@link CharacterTemplate.Collision } + * + */ + public CharacterTemplate.Collision getCollision() { + return collision; + } + + /** + * Sets the value of the collision property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Collision } + * + */ + public void setCollision(CharacterTemplate.Collision value) { + this.collision = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public CharacterTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(CharacterTemplateID value) { + this.id = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="male">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="female">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "male", + "female" + }) + public static class Collision { + + @XmlElement(required = true) + protected CharacterTemplate.Collision.Male male; + @XmlElement(required = true) + protected CharacterTemplate.Collision.Female female; + + /** + * Gets the value of the male property. + * + * @return + * possible object is + * {@link CharacterTemplate.Collision.Male } + * + */ + public CharacterTemplate.Collision.Male getMale() { + return male; + } + + /** + * Sets the value of the male property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Collision.Male } + * + */ + public void setMale(CharacterTemplate.Collision.Male value) { + this.male = value; + } + + /** + * Gets the value of the female property. + * + * @return + * possible object is + * {@link CharacterTemplate.Collision.Female } + * + */ + public CharacterTemplate.Collision.Female getFemale() { + return female; + } + + /** + * Sets the value of the female property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Collision.Female } + * + */ + public void setFemale(CharacterTemplate.Collision.Female value) { + this.female = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Female { + + @XmlAttribute(name = "radius", required = true) + protected double radius; + @XmlAttribute(name = "heigth", required = true) + protected double heigth; + + /** + * Gets the value of the radius property. + * + */ + public double getRadius() { + return radius; + } + + /** + * Sets the value of the radius property. + * + */ + public void setRadius(double value) { + this.radius = value; + } + + /** + * Gets the value of the heigth property. + * + */ + public double getHeigth() { + return heigth; + } + + /** + * Sets the value of the heigth property. + * + */ + public void setHeigth(double value) { + this.heigth = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Male { + + @XmlAttribute(name = "radius", required = true) + protected double radius; + @XmlAttribute(name = "heigth", required = true) + protected double heigth; + + /** + * Gets the value of the radius property. + * + */ + public double getRadius() { + return radius; + } + + /** + * Sets the value of the radius property. + * + */ + public void setRadius(double value) { + this.radius = value; + } + + /** + * Gets the value of the heigth property. + * + */ + public double getHeigth() { + return heigth; + } + + /** + * Sets the value of the heigth property. + * + */ + public void setHeigth(double value) { + this.heigth = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="hp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="mp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="cp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="attack">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="physical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="magical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="defense">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="physical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="magical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="move">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="base">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *       </sequence>
+     *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "hp", + "mp", + "cp", + "attack", + "defense", + "move", + "base", + "maxload" + }) + public static class Stats { + + @XmlElement(required = true) + protected CharacterTemplate.Stats.Hp hp; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Mp mp; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Cp cp; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Attack attack; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Defense defense; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Move move; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Base base; + protected int maxload; + @XmlAttribute(name = "level", required = true) + protected int level; + @XmlAttribute(name = "crafter", required = true) + protected boolean crafter; + + /** + * Gets the value of the hp property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Hp } + * + */ + public CharacterTemplate.Stats.Hp getHp() { + return hp; + } + + /** + * Sets the value of the hp property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Hp } + * + */ + public void setHp(CharacterTemplate.Stats.Hp value) { + this.hp = value; + } + + /** + * Gets the value of the mp property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Mp } + * + */ + public CharacterTemplate.Stats.Mp getMp() { + return mp; + } + + /** + * Sets the value of the mp property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Mp } + * + */ + public void setMp(CharacterTemplate.Stats.Mp value) { + this.mp = value; + } + + /** + * Gets the value of the cp property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Cp } + * + */ + public CharacterTemplate.Stats.Cp getCp() { + return cp; + } + + /** + * Sets the value of the cp property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Cp } + * + */ + public void setCp(CharacterTemplate.Stats.Cp value) { + this.cp = value; + } + + /** + * Gets the value of the attack property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Attack } + * + */ + public CharacterTemplate.Stats.Attack getAttack() { + return attack; + } + + /** + * Sets the value of the attack property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Attack } + * + */ + public void setAttack(CharacterTemplate.Stats.Attack value) { + this.attack = value; + } + + /** + * Gets the value of the defense property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Defense } + * + */ + public CharacterTemplate.Stats.Defense getDefense() { + return defense; + } + + /** + * Sets the value of the defense property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Defense } + * + */ + public void setDefense(CharacterTemplate.Stats.Defense value) { + this.defense = value; + } + + /** + * Gets the value of the move property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Move } + * + */ + public CharacterTemplate.Stats.Move getMove() { + return move; + } + + /** + * Sets the value of the move property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Move } + * + */ + public void setMove(CharacterTemplate.Stats.Move value) { + this.move = value; + } + + /** + * Gets the value of the base property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Base } + * + */ + public CharacterTemplate.Stats.Base getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Base } + * + */ + public void setBase(CharacterTemplate.Stats.Base value) { + this.base = value; + } + + /** + * Gets the value of the maxload property. + * + */ + public int getMaxload() { + return maxload; + } + + /** + * Sets the value of the maxload property. + * + */ + public void setMaxload(int value) { + this.maxload = value; + } + + /** + * Gets the value of the level property. + * + */ + public int getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + */ + public void setLevel(int value) { + this.level = value; + } + + /** + * Gets the value of the crafter property. + * + */ + public boolean isCrafter() { + return crafter; + } + + /** + * Sets the value of the crafter property. + * + */ + public void setCrafter(boolean value) { + this.crafter = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="physical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="magical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Attack { + + @XmlElement(required = true) + protected CharacterTemplate.Stats.Attack.Physical physical; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Attack.Magical magical; + @XmlAttribute(name = "evasion", required = true) + protected int evasion; + @XmlAttribute(name = "critical", required = true) + protected int critical; + @XmlAttribute(name = "accuracy", required = true) + protected int accuracy; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Attack.Physical } + * + */ + public CharacterTemplate.Stats.Attack.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Attack.Physical } + * + */ + public void setPhysical(CharacterTemplate.Stats.Attack.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Attack.Magical } + * + */ + public CharacterTemplate.Stats.Attack.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Attack.Magical } + * + */ + public void setMagical(CharacterTemplate.Stats.Attack.Magical value) { + this.magical = value; + } + + /** + * Gets the value of the evasion property. + * + */ + public int getEvasion() { + return evasion; + } + + /** + * Sets the value of the evasion property. + * + */ + public void setEvasion(int value) { + this.evasion = value; + } + + /** + * Gets the value of the critical property. + * + */ + public int getCritical() { + return critical; + } + + /** + * Sets the value of the critical property. + * + */ + public void setCritical(int value) { + this.critical = value; + } + + /** + * Gets the value of the accuracy property. + * + */ + public int getAccuracy() { + return accuracy; + } + + /** + * Sets the value of the accuracy property. + * + */ + public void setAccuracy(int value) { + this.accuracy = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Base { + + @XmlAttribute(name = "int", required = true) + protected int _int; + @XmlAttribute(name = "str", required = true) + protected int str; + @XmlAttribute(name = "con", required = true) + protected int con; + @XmlAttribute(name = "men", required = true) + protected int men; + @XmlAttribute(name = "dex", required = true) + protected int dex; + @XmlAttribute(name = "wit", required = true) + protected int wit; + + /** + * Gets the value of the int property. + * + */ + public int getInt() { + return _int; + } + + /** + * Sets the value of the int property. + * + */ + public void setInt(int value) { + this._int = value; + } + + /** + * Gets the value of the str property. + * + */ + public int getStr() { + return str; + } + + /** + * Sets the value of the str property. + * + */ + public void setStr(int value) { + this.str = value; + } + + /** + * Gets the value of the con property. + * + */ + public int getCon() { + return con; + } + + /** + * Sets the value of the con property. + * + */ + public void setCon(int value) { + this.con = value; + } + + /** + * Gets the value of the men property. + * + */ + public int getMen() { + return men; + } + + /** + * Sets the value of the men property. + * + */ + public void setMen(int value) { + this.men = value; + } + + /** + * Gets the value of the dex property. + * + */ + public int getDex() { + return dex; + } + + /** + * Sets the value of the dex property. + * + */ + public void setDex(int value) { + this.dex = value; + } + + /** + * Gets the value of the wit property. + * + */ + public int getWit() { + return wit; + } + + /** + * Sets the value of the wit property. + * + */ + public void setWit(int value) { + this.wit = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Cp { + + @XmlAttribute(name = "base", required = true) + protected double base; + @XmlAttribute(name = "modifier", required = true) + protected double modifier; + @XmlAttribute(name = "add", required = true) + protected double add; + + /** + * Gets the value of the base property. + * + */ + public double getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + */ + public void setBase(double value) { + this.base = value; + } + + /** + * Gets the value of the modifier property. + * + */ + public double getModifier() { + return modifier; + } + + /** + * Sets the value of the modifier property. + * + */ + public void setModifier(double value) { + this.modifier = value; + } + + /** + * Gets the value of the add property. + * + */ + public double getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + */ + public void setAdd(double value) { + this.add = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="physical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="magical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Defense { + + @XmlElement(required = true) + protected CharacterTemplate.Stats.Defense.Physical physical; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Defense.Magical magical; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Defense.Physical } + * + */ + public CharacterTemplate.Stats.Defense.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Defense.Physical } + * + */ + public void setPhysical(CharacterTemplate.Stats.Defense.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Defense.Magical } + * + */ + public CharacterTemplate.Stats.Defense.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Defense.Magical } + * + */ + public void setMagical(CharacterTemplate.Stats.Defense.Magical value) { + this.magical = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Hp { + + @XmlAttribute(name = "base", required = true) + protected double base; + @XmlAttribute(name = "modifier", required = true) + protected double modifier; + @XmlAttribute(name = "add", required = true) + protected double add; + + /** + * Gets the value of the base property. + * + */ + public double getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + */ + public void setBase(double value) { + this.base = value; + } + + /** + * Gets the value of the modifier property. + * + */ + public double getModifier() { + return modifier; + } + + /** + * Sets the value of the modifier property. + * + */ + public void setModifier(double value) { + this.modifier = value; + } + + /** + * Gets the value of the add property. + * + */ + public double getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + */ + public void setAdd(double value) { + this.add = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Move { + + @XmlAttribute(name = "run", required = true) + protected double run; + @XmlAttribute(name = "walk", required = true) + protected double walk; + + /** + * Gets the value of the run property. + * + */ + public double getRun() { + return run; + } + + /** + * Sets the value of the run property. + * + */ + public void setRun(double value) { + this.run = value; + } + + /** + * Gets the value of the walk property. + * + */ + public double getWalk() { + return walk; + } + + /** + * Sets the value of the walk property. + * + */ + public void setWalk(double value) { + this.walk = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Mp { + + @XmlAttribute(name = "base", required = true) + protected double base; + @XmlAttribute(name = "modifier", required = true) + protected double modifier; + @XmlAttribute(name = "add", required = true) + protected double add; + + /** + * Gets the value of the base property. + * + */ + public double getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + */ + public void setBase(double value) { + this.base = value; + } + + /** + * Gets the value of the modifier property. + * + */ + public double getModifier() { + return modifier; + } + + /** + * Sets the value of the modifier property. + * + */ + public void setModifier(double value) { + this.modifier = value; + } + + /** + * Gets the value of the add property. + * + */ + public double getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + */ + public void setAdd(double value) { + this.add = value; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java new file mode 100755 index 000000000..181e2511e --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java @@ -0,0 +1,97 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for Coordinate complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="Coordinate">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *       </sequence>
+ *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="z" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Coordinate") +public class Coordinate { + + @XmlAttribute(name = "x", required = true) + protected int x; + @XmlAttribute(name = "y", required = true) + protected int y; + @XmlAttribute(name = "z", required = true) + protected int z; + + /** + * Gets the value of the x property. + * + */ + public int getX() { + return x; + } + + /** + * Sets the value of the x property. + * + */ + public void setX(int value) { + this.x = value; + } + + /** + * Gets the value of the y property. + * + */ + public int getY() { + return y; + } + + /** + * Sets the value of the y property. + * + */ + public void setY(int value) { + this.y = value; + } + + /** + * Gets the value of the z property. + * + */ + public int getZ() { + return z; + } + + /** + * Sets the value of the z property. + * + */ + public void setZ(int value) { + this.z = value; + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java new file mode 100755 index 000000000..be9978f14 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java @@ -0,0 +1,1188 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import com.l2jserver.model.id.template.ItemTemplateID; +import com.l2jserver.model.template.item.ArmorType; +import com.l2jserver.model.template.item.ItemMaterial; +import com.l2jserver.model.template.item.ItemType; +import com.l2jserver.model.template.item.WeaponType; +import com.l2jserver.util.jaxb.ArmorTypeAdapter; +import com.l2jserver.util.jaxb.ItemMaterialAdapter; +import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; +import com.l2jserver.util.jaxb.ItemTypeAdapter; +import com.l2jserver.util.jaxb.WeaponTypeAdapter; + + +/** + *

Java class for item element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="item">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}AbstractTemplate">
+ *         <sequence>
+ *           <element name="attributes">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="cost">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="controller">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="effect">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <attribute name="type">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <enumeration value="IMMEDIATE"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </attribute>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <choice minOccurs="0">
+ *             <element name="etcItem">
+ *               <complexType>
+ *                 <complexContent>
+ *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
+ *                   </restriction>
+ *                 </complexContent>
+ *               </complexType>
+ *             </element>
+ *             <element name="weapon">
+ *               <complexType>
+ *                 <complexContent>
+ *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                     <sequence>
+ *                       <element name="physicalDamage" type="{}CalculatorFunction"/>
+ *                       <element name="magicalDamage" type="{}CalculatorFunction"/>
+ *                       <element name="criticalChance" type="{}CalculatorFunction"/>
+ *                       <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
+ *                     </sequence>
+ *                     <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
+ *                   </restriction>
+ *                 </complexContent>
+ *               </complexType>
+ *             </element>
+ *             <element name="armor">
+ *               <complexType>
+ *                 <complexContent>
+ *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                     <sequence>
+ *                       <element name="cost">
+ *                         <complexType>
+ *                           <complexContent>
+ *                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                               <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                             </restriction>
+ *                           </complexContent>
+ *                         </complexType>
+ *                       </element>
+ *                       <element name="equipment">
+ *                         <complexType>
+ *                           <complexContent>
+ *                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                               <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                             </restriction>
+ *                           </complexContent>
+ *                         </complexType>
+ *                       </element>
+ *                     </sequence>
+ *                     <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
+ *                   </restriction>
+ *                 </complexContent>
+ *               </complexType>
+ *             </element>
+ *           </choice>
+ *         </sequence>
+ *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="icon" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "attributes", + "controller", + "effect", + "etcItem", + "weapon", + "armor" +}) +@XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item") +public class ItemTemplate + extends AbstractTemplate +{ + + @XmlElement(required = true) + protected ItemTemplate.Attributes attributes; + @XmlElement(required = true) + protected ItemTemplate.Controller controller; + @XmlElement(required = true) + protected ItemTemplate.Effect effect; + protected ItemTemplate.EtcItem etcItem; + protected ItemTemplate.Weapon weapon; + protected ItemTemplate.Armor armor; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID id; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "icon") + protected String icon; + + /** + * Gets the value of the attributes property. + * + * @return + * possible object is + * {@link ItemTemplate.Attributes } + * + */ + public ItemTemplate.Attributes getAttributes() { + return attributes; + } + + /** + * Sets the value of the attributes property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Attributes } + * + */ + public void setAttributes(ItemTemplate.Attributes value) { + this.attributes = value; + } + + /** + * Gets the value of the controller property. + * + * @return + * possible object is + * {@link ItemTemplate.Controller } + * + */ + public ItemTemplate.Controller getController() { + return controller; + } + + /** + * Sets the value of the controller property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Controller } + * + */ + public void setController(ItemTemplate.Controller value) { + this.controller = value; + } + + /** + * Gets the value of the effect property. + * + * @return + * possible object is + * {@link ItemTemplate.Effect } + * + */ + public ItemTemplate.Effect getEffect() { + return effect; + } + + /** + * Sets the value of the effect property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Effect } + * + */ + public void setEffect(ItemTemplate.Effect value) { + this.effect = value; + } + + /** + * Gets the value of the etcItem property. + * + * @return + * possible object is + * {@link ItemTemplate.EtcItem } + * + */ + public ItemTemplate.EtcItem getEtcItem() { + return etcItem; + } + + /** + * Sets the value of the etcItem property. + * + * @param value + * allowed object is + * {@link ItemTemplate.EtcItem } + * + */ + public void setEtcItem(ItemTemplate.EtcItem value) { + this.etcItem = value; + } + + /** + * Gets the value of the weapon property. + * + * @return + * possible object is + * {@link ItemTemplate.Weapon } + * + */ + public ItemTemplate.Weapon getWeapon() { + return weapon; + } + + /** + * Sets the value of the weapon property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Weapon } + * + */ + public void setWeapon(ItemTemplate.Weapon value) { + this.weapon = value; + } + + /** + * Gets the value of the armor property. + * + * @return + * possible object is + * {@link ItemTemplate.Armor } + * + */ + public ItemTemplate.Armor getArmor() { + return armor; + } + + /** + * Sets the value of the armor property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Armor } + * + */ + public void setArmor(ItemTemplate.Armor value) { + this.armor = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(ItemTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the icon property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIcon() { + return icon; + } + + /** + * Sets the value of the icon property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIcon(String value) { + this.icon = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="cost">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="equipment">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cost", + "equipment" + }) + public static class Armor { + + @XmlElement(required = true) + protected ItemTemplate.Armor.Cost cost; + @XmlElement(required = true) + protected ItemTemplate.Armor.Equipment equipment; + @XmlAttribute(name = "weigth") + @XmlSchemaType(name = "anySimpleType") + protected String weigth; + @XmlAttribute(name = "type") + @XmlJavaTypeAdapter(ArmorTypeAdapter.class) + protected ArmorType type; + + /** + * Gets the value of the cost property. + * + * @return + * possible object is + * {@link ItemTemplate.Armor.Cost } + * + */ + public ItemTemplate.Armor.Cost getCost() { + return cost; + } + + /** + * Sets the value of the cost property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Armor.Cost } + * + */ + public void setCost(ItemTemplate.Armor.Cost value) { + this.cost = value; + } + + /** + * Gets the value of the equipment property. + * + * @return + * possible object is + * {@link ItemTemplate.Armor.Equipment } + * + */ + public ItemTemplate.Armor.Equipment getEquipment() { + return equipment; + } + + /** + * Sets the value of the equipment property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Armor.Equipment } + * + */ + public void setEquipment(ItemTemplate.Armor.Equipment value) { + this.equipment = value; + } + + /** + * Gets the value of the weigth property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getWeigth() { + return weigth; + } + + /** + * Sets the value of the weigth property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setWeigth(String value) { + this.weigth = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public ArmorType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(ArmorType value) { + this.type = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Cost { + + @XmlAttribute(name = "adena") + @XmlSchemaType(name = "anySimpleType") + protected String adena; + + /** + * Gets the value of the adena property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdena() { + return adena; + } + + /** + * Sets the value of the adena property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdena(String value) { + this.adena = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Equipment { + + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="cost">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cost" + }) + public static class Attributes { + + @XmlElement(required = true) + protected ItemTemplate.Attributes.Cost cost; + @XmlAttribute(name = "weigth") + protected Integer weigth; + @XmlAttribute(name = "material") + @XmlJavaTypeAdapter(ItemMaterialAdapter.class) + protected ItemMaterial material; + + /** + * Gets the value of the cost property. + * + * @return + * possible object is + * {@link ItemTemplate.Attributes.Cost } + * + */ + public ItemTemplate.Attributes.Cost getCost() { + return cost; + } + + /** + * Sets the value of the cost property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Attributes.Cost } + * + */ + public void setCost(ItemTemplate.Attributes.Cost value) { + this.cost = value; + } + + /** + * Gets the value of the weigth property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getWeigth() { + return weigth; + } + + /** + * Sets the value of the weigth property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setWeigth(Integer value) { + this.weigth = value; + } + + /** + * Gets the value of the material property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemMaterial getMaterial() { + return material; + } + + /** + * Sets the value of the material property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMaterial(ItemMaterial value) { + this.material = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Cost { + + @XmlAttribute(name = "adena") + protected Integer adena; + + /** + * Gets the value of the adena property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getAdena() { + return adena; + } + + /** + * Sets the value of the adena property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setAdena(Integer value) { + this.adena = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Controller { + + @XmlAttribute(name = "defaultAction") + @XmlSchemaType(name = "anySimpleType") + protected String defaultAction; + + /** + * Gets the value of the defaultAction property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDefaultAction() { + return defaultAction; + } + + /** + * Sets the value of the defaultAction property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDefaultAction(String value) { + this.defaultAction = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="type">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *             <enumeration value="IMMEDIATE"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Effect { + + @XmlAttribute(name = "type") + protected String type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class EtcItem { + + @XmlAttribute(name = "type") + @XmlJavaTypeAdapter(ItemTypeAdapter.class) + protected ItemType type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(ItemType value) { + this.type = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="physicalDamage" type="{}CalculatorFunction"/>
+     *         <element name="magicalDamage" type="{}CalculatorFunction"/>
+     *         <element name="criticalChance" type="{}CalculatorFunction"/>
+     *         <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
+     *       </sequence>
+     *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physicalDamage", + "magicalDamage", + "criticalChance", + "physicalAttackSpeed" + }) + public static class Weapon { + + @XmlElement(required = true) + protected CalculatorFunction physicalDamage; + @XmlElement(required = true) + protected CalculatorFunction magicalDamage; + @XmlElement(required = true) + protected CalculatorFunction criticalChance; + @XmlElement(required = true) + protected CalculatorFunction physicalAttackSpeed; + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + @XmlAttribute(name = "type") + @XmlJavaTypeAdapter(WeaponTypeAdapter.class) + protected WeaponType type; + + /** + * Gets the value of the physicalDamage property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getPhysicalDamage() { + return physicalDamage; + } + + /** + * Sets the value of the physicalDamage property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setPhysicalDamage(CalculatorFunction value) { + this.physicalDamage = value; + } + + /** + * Gets the value of the magicalDamage property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getMagicalDamage() { + return magicalDamage; + } + + /** + * Sets the value of the magicalDamage property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setMagicalDamage(CalculatorFunction value) { + this.magicalDamage = value; + } + + /** + * Gets the value of the criticalChance property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getCriticalChance() { + return criticalChance; + } + + /** + * Sets the value of the criticalChance property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setCriticalChance(CalculatorFunction value) { + this.criticalChance = value; + } + + /** + * Gets the value of the physicalAttackSpeed property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getPhysicalAttackSpeed() { + return physicalAttackSpeed; + } + + /** + * Sets the value of the physicalAttackSpeed property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setPhysicalAttackSpeed(CalculatorFunction value) { + this.physicalAttackSpeed = value; + } + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public WeaponType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(WeaponType value) { + this.type = value; + } + + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java new file mode 100755 index 000000000..4de802be6 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java @@ -0,0 +1,3322 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import com.l2jserver.model.id.template.ItemTemplateID; +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.id.template.SkillTemplateID; +import com.l2jserver.model.template.actor.ActorSex; +import com.l2jserver.model.template.npc.NPCRace; +import com.l2jserver.util.jaxb.ActorSexAdapter; +import com.l2jserver.util.jaxb.ClassAdapter; +import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; +import com.l2jserver.util.jaxb.NPCRaceAdapter; +import com.l2jserver.util.jaxb.NPCTemplateIDAdapter; +import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; + + +/** + *

Java class for npc element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="npc">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}ActorTemplate">
+ *         <sequence>
+ *           <element name="info">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="name" minOccurs="0">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                             <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="title" minOccurs="0">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                     <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
+ *                     <element name="sex" type="{}ActorSexType" minOccurs="0"/>
+ *                     <element name="stats">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <element name="hp">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="mp">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="attack" minOccurs="0">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                         <element name="physical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                         <element name="magical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                       </sequence>
+ *                                       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="defense" minOccurs="0">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                         <element name="physical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                         <element name="magical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                       </sequence>
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="move" minOccurs="0">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="base">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </sequence>
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *                     <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                     <element name="item" minOccurs="0">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *                             <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="collision" minOccurs="0">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="ai" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                   </sequence>
+ *                   <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="talk" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="chat" maxOccurs="unbounded">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="droplist" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="item" maxOccurs="unbounded">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *                             <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="category" use="required">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <enumeration value="DROP"/>
+ *                                   <enumeration value="SPOIL"/>
+ *                                   <enumeration value="UNK_1"/>
+ *                                   <enumeration value="UNK_2"/>
+ *                                   <enumeration value="UNK_3"/>
+ *                                   <enumeration value="UNK_4"/>
+ *                                   <enumeration value="UNK_5"/>
+ *                                   <enumeration value="UNK_6"/>
+ *                                   <enumeration value="UNK_7"/>
+ *                                   <enumeration value="UNK_8"/>
+ *                                   <enumeration value="UNK_9"/>
+ *                                   <enumeration value="UNK_10"/>
+ *                                   <enumeration value="UNK_11"/>
+ *                                   <enumeration value="UNK_12"/>
+ *                                   <enumeration value="UNK_13"/>
+ *                                   <enumeration value="UNK_14"/>
+ *                                   <enumeration value="UNK_15"/>
+ *                                   <enumeration value="UNK_16"/>
+ *                                   <enumeration value="UNK_17"/>
+ *                                   <enumeration value="UNK_18"/>
+ *                                   <enumeration value="UNK_19"/>
+ *                                   <enumeration value="UNK_20"/>
+ *                                   <enumeration value="UNK_21"/>
+ *                                   <enumeration value="UNK_22"/>
+ *                                   <enumeration value="UNK_23"/>
+ *                                   <enumeration value="UNK_24"/>
+ *                                   <enumeration value="UNK_25"/>
+ *                                   <enumeration value="UNK_26"/>
+ *                                   <enumeration value="UNK_27"/>
+ *                                   <enumeration value="UNK_28"/>
+ *                                   <enumeration value="UNK_29"/>
+ *                                   <enumeration value="UNK_30"/>
+ *                                   <enumeration value="UNK_31"/>
+ *                                   <enumeration value="UNK_32"/>
+ *                                   <enumeration value="UNK_33"/>
+ *                                   <enumeration value="UNK_34"/>
+ *                                   <enumeration value="UNK_35"/>
+ *                                   <enumeration value="UNK_36"/>
+ *                                   <enumeration value="UNK_100"/>
+ *                                   <enumeration value="UNK_101"/>
+ *                                   <enumeration value="UNK_102"/>
+ *                                   <enumeration value="UNK_200"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </attribute>
+ *                             <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="skills" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="skill" maxOccurs="unbounded">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+ *                             <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *         </sequence>
+ *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/npc}NPCTemplateID" />
+ *         <attribute name="controller" use="required">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             </restriction>
+ *           </simpleType>
+ *         </attribute>
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "info", + "ai", + "talk", + "droplist", + "skills" +}) +@XmlRootElement(name = "npc", namespace = "http://schemas.l2jserver2.com/npc") +public class NPCTemplate + extends ActorTemplate +{ + + @XmlElement(required = true) + protected NPCTemplate.Info info; + protected NPCTemplate.Ai ai; + protected NPCTemplate.Talk talk; + protected NPCTemplate.Droplist droplist; + protected NPCTemplate.Skills skills; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(NPCTemplateIDAdapter.class) + protected NPCTemplateID id; + @XmlAttribute(name = "controller", required = true) + @XmlJavaTypeAdapter(ClassAdapter.class) + protected Class controller; + + /** + * Gets the value of the info property. + * + * @return + * possible object is + * {@link NPCTemplate.Info } + * + */ + public NPCTemplate.Info getInfo() { + return info; + } + + /** + * Sets the value of the info property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info } + * + */ + public void setInfo(NPCTemplate.Info value) { + this.info = value; + } + + /** + * Gets the value of the ai property. + * + * @return + * possible object is + * {@link NPCTemplate.Ai } + * + */ + public NPCTemplate.Ai getAi() { + return ai; + } + + /** + * Sets the value of the ai property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Ai } + * + */ + public void setAi(NPCTemplate.Ai value) { + this.ai = value; + } + + /** + * Gets the value of the talk property. + * + * @return + * possible object is + * {@link NPCTemplate.Talk } + * + */ + public NPCTemplate.Talk getTalk() { + return talk; + } + + /** + * Sets the value of the talk property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Talk } + * + */ + public void setTalk(NPCTemplate.Talk value) { + this.talk = value; + } + + /** + * Gets the value of the droplist property. + * + * @return + * possible object is + * {@link NPCTemplate.Droplist } + * + */ + public NPCTemplate.Droplist getDroplist() { + return droplist; + } + + /** + * Sets the value of the droplist property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Droplist } + * + */ + public void setDroplist(NPCTemplate.Droplist value) { + this.droplist = value; + } + + /** + * Gets the value of the skills property. + * + * @return + * possible object is + * {@link NPCTemplate.Skills } + * + */ + public NPCTemplate.Skills getSkills() { + return skills; + } + + /** + * Sets the value of the skills property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Skills } + * + */ + public void setSkills(NPCTemplate.Skills value) { + this.skills = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public NPCTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(NPCTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the controller property. + * + * @return + * possible object is + * {@link String } + * + */ + public Class getController() { + return controller; + } + + /** + * Sets the value of the controller property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setController(Class value) { + this.controller = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *       </sequence>
+     *       <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Ai { + + @XmlAttribute(name = "script", required = true) + protected String script; + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="item" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+     *                 <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="category" use="required">
+     *                   <simpleType>
+     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                       <enumeration value="DROP"/>
+     *                       <enumeration value="SPOIL"/>
+     *                       <enumeration value="UNK_1"/>
+     *                       <enumeration value="UNK_2"/>
+     *                       <enumeration value="UNK_3"/>
+     *                       <enumeration value="UNK_4"/>
+     *                       <enumeration value="UNK_5"/>
+     *                       <enumeration value="UNK_6"/>
+     *                       <enumeration value="UNK_7"/>
+     *                       <enumeration value="UNK_8"/>
+     *                       <enumeration value="UNK_9"/>
+     *                       <enumeration value="UNK_10"/>
+     *                       <enumeration value="UNK_11"/>
+     *                       <enumeration value="UNK_12"/>
+     *                       <enumeration value="UNK_13"/>
+     *                       <enumeration value="UNK_14"/>
+     *                       <enumeration value="UNK_15"/>
+     *                       <enumeration value="UNK_16"/>
+     *                       <enumeration value="UNK_17"/>
+     *                       <enumeration value="UNK_18"/>
+     *                       <enumeration value="UNK_19"/>
+     *                       <enumeration value="UNK_20"/>
+     *                       <enumeration value="UNK_21"/>
+     *                       <enumeration value="UNK_22"/>
+     *                       <enumeration value="UNK_23"/>
+     *                       <enumeration value="UNK_24"/>
+     *                       <enumeration value="UNK_25"/>
+     *                       <enumeration value="UNK_26"/>
+     *                       <enumeration value="UNK_27"/>
+     *                       <enumeration value="UNK_28"/>
+     *                       <enumeration value="UNK_29"/>
+     *                       <enumeration value="UNK_30"/>
+     *                       <enumeration value="UNK_31"/>
+     *                       <enumeration value="UNK_32"/>
+     *                       <enumeration value="UNK_33"/>
+     *                       <enumeration value="UNK_34"/>
+     *                       <enumeration value="UNK_35"/>
+     *                       <enumeration value="UNK_36"/>
+     *                       <enumeration value="UNK_100"/>
+     *                       <enumeration value="UNK_101"/>
+     *                       <enumeration value="UNK_102"/>
+     *                       <enumeration value="UNK_200"/>
+     *                     </restriction>
+     *                   </simpleType>
+     *                 </attribute>
+     *                 <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "item" + }) + public static class Droplist { + + @XmlElement(required = true) + protected List item; + + /** + * Gets the value of the item property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the item property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getItem().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link NPCTemplate.Droplist.Item } + * + * + */ + public List getItem() { + if (item == null) { + item = new ArrayList(); + } + return this.item; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+         *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="category" use="required">
+         *         <simpleType>
+         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *             <enumeration value="DROP"/>
+         *             <enumeration value="SPOIL"/>
+         *             <enumeration value="UNK_1"/>
+         *             <enumeration value="UNK_2"/>
+         *             <enumeration value="UNK_3"/>
+         *             <enumeration value="UNK_4"/>
+         *             <enumeration value="UNK_5"/>
+         *             <enumeration value="UNK_6"/>
+         *             <enumeration value="UNK_7"/>
+         *             <enumeration value="UNK_8"/>
+         *             <enumeration value="UNK_9"/>
+         *             <enumeration value="UNK_10"/>
+         *             <enumeration value="UNK_11"/>
+         *             <enumeration value="UNK_12"/>
+         *             <enumeration value="UNK_13"/>
+         *             <enumeration value="UNK_14"/>
+         *             <enumeration value="UNK_15"/>
+         *             <enumeration value="UNK_16"/>
+         *             <enumeration value="UNK_17"/>
+         *             <enumeration value="UNK_18"/>
+         *             <enumeration value="UNK_19"/>
+         *             <enumeration value="UNK_20"/>
+         *             <enumeration value="UNK_21"/>
+         *             <enumeration value="UNK_22"/>
+         *             <enumeration value="UNK_23"/>
+         *             <enumeration value="UNK_24"/>
+         *             <enumeration value="UNK_25"/>
+         *             <enumeration value="UNK_26"/>
+         *             <enumeration value="UNK_27"/>
+         *             <enumeration value="UNK_28"/>
+         *             <enumeration value="UNK_29"/>
+         *             <enumeration value="UNK_30"/>
+         *             <enumeration value="UNK_31"/>
+         *             <enumeration value="UNK_32"/>
+         *             <enumeration value="UNK_33"/>
+         *             <enumeration value="UNK_34"/>
+         *             <enumeration value="UNK_35"/>
+         *             <enumeration value="UNK_36"/>
+         *             <enumeration value="UNK_100"/>
+         *             <enumeration value="UNK_101"/>
+         *             <enumeration value="UNK_102"/>
+         *             <enumeration value="UNK_200"/>
+         *           </restriction>
+         *         </simpleType>
+         *       </attribute>
+         *       <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Item { + + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID id; + @XmlAttribute(name = "min", required = true) + protected int min; + @XmlAttribute(name = "max", required = true) + protected int max; + @XmlAttribute(name = "category", required = true) + protected NPCTemplate.Droplist.Item.DropCategory category; + @XmlAttribute(name = "chance", required = true) + protected int chance; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(ItemTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the min property. + * + */ + public int getMin() { + return min; + } + + /** + * Sets the value of the min property. + * + */ + public void setMin(int value) { + this.min = value; + } + + /** + * Gets the value of the max property. + * + */ + public int getMax() { + return max; + } + + /** + * Sets the value of the max property. + * + */ + public void setMax(int value) { + this.max = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link NPCTemplate.Droplist.Item.DropCategory } + * + */ + public NPCTemplate.Droplist.Item.DropCategory getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Droplist.Item.DropCategory } + * + */ + public void setCategory(NPCTemplate.Droplist.Item.DropCategory value) { + this.category = value; + } + + /** + * Gets the value of the chance property. + * + */ + public int getChance() { + return chance; + } + + /** + * Sets the value of the chance property. + * + */ + public void setChance(int value) { + this.chance = value; + } + + + /** + *

Java class for null. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+             * <simpleType>
+             *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *     <enumeration value="DROP"/>
+             *     <enumeration value="SPOIL"/>
+             *     <enumeration value="UNK_1"/>
+             *     <enumeration value="UNK_2"/>
+             *     <enumeration value="UNK_3"/>
+             *     <enumeration value="UNK_4"/>
+             *     <enumeration value="UNK_5"/>
+             *     <enumeration value="UNK_6"/>
+             *     <enumeration value="UNK_7"/>
+             *     <enumeration value="UNK_8"/>
+             *     <enumeration value="UNK_9"/>
+             *     <enumeration value="UNK_10"/>
+             *     <enumeration value="UNK_11"/>
+             *     <enumeration value="UNK_12"/>
+             *     <enumeration value="UNK_13"/>
+             *     <enumeration value="UNK_14"/>
+             *     <enumeration value="UNK_15"/>
+             *     <enumeration value="UNK_16"/>
+             *     <enumeration value="UNK_17"/>
+             *     <enumeration value="UNK_18"/>
+             *     <enumeration value="UNK_19"/>
+             *     <enumeration value="UNK_20"/>
+             *     <enumeration value="UNK_21"/>
+             *     <enumeration value="UNK_22"/>
+             *     <enumeration value="UNK_23"/>
+             *     <enumeration value="UNK_24"/>
+             *     <enumeration value="UNK_25"/>
+             *     <enumeration value="UNK_26"/>
+             *     <enumeration value="UNK_27"/>
+             *     <enumeration value="UNK_28"/>
+             *     <enumeration value="UNK_29"/>
+             *     <enumeration value="UNK_30"/>
+             *     <enumeration value="UNK_31"/>
+             *     <enumeration value="UNK_32"/>
+             *     <enumeration value="UNK_33"/>
+             *     <enumeration value="UNK_34"/>
+             *     <enumeration value="UNK_35"/>
+             *     <enumeration value="UNK_36"/>
+             *     <enumeration value="UNK_100"/>
+             *     <enumeration value="UNK_101"/>
+             *     <enumeration value="UNK_102"/>
+             *     <enumeration value="UNK_200"/>
+             *   </restriction>
+             * </simpleType>
+             * 
+ * + */ + @XmlType(name = "") + @XmlEnum + public enum DropCategory { + + DROP, + SPOIL, + UNK_1, + UNK_2, + UNK_3, + UNK_4, + UNK_5, + UNK_6, + UNK_7, + UNK_8, + UNK_9, + UNK_10, + UNK_11, + UNK_12, + UNK_13, + UNK_14, + UNK_15, + UNK_16, + UNK_17, + UNK_18, + UNK_19, + UNK_20, + UNK_21, + UNK_22, + UNK_23, + UNK_24, + UNK_25, + UNK_26, + UNK_27, + UNK_28, + UNK_29, + UNK_30, + UNK_31, + UNK_32, + UNK_33, + UNK_34, + UNK_35, + UNK_36, + UNK_100, + UNK_101, + UNK_102, + UNK_200; + + public String value() { + return name(); + } + + public static NPCTemplate.Droplist.Item.DropCategory fromValue(String v) { + return valueOf(v); + } + + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="name" minOccurs="0">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *                 <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="title" minOccurs="0">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
+     *         <element name="sex" type="{}ActorSexType" minOccurs="0"/>
+     *         <element name="stats">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="hp">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="mp">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="attack" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="physical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                             <element name="magical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                           </sequence>
+     *                           <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="defense" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="physical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                             <element name="magical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="move" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="base">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
+     *         <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="item" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+     *                 <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="collision" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *       <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *       <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "name", + "title", + "level", + "race", + "sex", + "stats", + "experience", + "sp", + "item", + "collision" + }) + public static class Info { + + protected NPCTemplate.Info.Name name; + protected NPCTemplate.Info.Title title; + protected int level; + @XmlElement(type = String.class) + @XmlJavaTypeAdapter(NPCRaceAdapter.class) + protected NPCRace race; + @XmlElement(type = String.class) + @XmlJavaTypeAdapter(ActorSexAdapter.class) + protected ActorSex sex; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats stats; + protected long experience; + protected int sp; + protected NPCTemplate.Info.Item item; + protected NPCTemplate.Info.Collision collision; + @XmlAttribute(name = "attackable", required = true) + protected boolean attackable; + @XmlAttribute(name = "targetable", required = true) + protected boolean targetable; + @XmlAttribute(name = "aggressive", required = true) + protected boolean aggressive; + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Name } + * + */ + public NPCTemplate.Info.Name getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Name } + * + */ + public void setName(NPCTemplate.Info.Name value) { + this.name = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Title } + * + */ + public NPCTemplate.Info.Title getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Title } + * + */ + public void setTitle(NPCTemplate.Info.Title value) { + this.title = value; + } + + /** + * Gets the value of the level property. + * + */ + public int getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + */ + public void setLevel(int value) { + this.level = value; + } + + /** + * Gets the value of the race property. + * + * @return + * possible object is + * {@link String } + * + */ + public NPCRace getRace() { + return race; + } + + /** + * Sets the value of the race property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRace(NPCRace value) { + this.race = value; + } + + /** + * Gets the value of the sex property. + * + * @return + * possible object is + * {@link String } + * + */ + public ActorSex getSex() { + return sex; + } + + /** + * Sets the value of the sex property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSex(ActorSex value) { + this.sex = value; + } + + /** + * Gets the value of the stats property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats } + * + */ + public NPCTemplate.Info.Stats getStats() { + return stats; + } + + /** + * Sets the value of the stats property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats } + * + */ + public void setStats(NPCTemplate.Info.Stats value) { + this.stats = value; + } + + /** + * Gets the value of the experience property. + * + */ + public long getExperience() { + return experience; + } + + /** + * Sets the value of the experience property. + * + */ + public void setExperience(long value) { + this.experience = value; + } + + /** + * Gets the value of the sp property. + * + */ + public int getSp() { + return sp; + } + + /** + * Sets the value of the sp property. + * + */ + public void setSp(int value) { + this.sp = value; + } + + /** + * Gets the value of the item property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Item } + * + */ + public NPCTemplate.Info.Item getItem() { + return item; + } + + /** + * Sets the value of the item property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Item } + * + */ + public void setItem(NPCTemplate.Info.Item value) { + this.item = value; + } + + /** + * Gets the value of the collision property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Collision } + * + */ + public NPCTemplate.Info.Collision getCollision() { + return collision; + } + + /** + * Sets the value of the collision property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Collision } + * + */ + public void setCollision(NPCTemplate.Info.Collision value) { + this.collision = value; + } + + /** + * Gets the value of the attackable property. + * + */ + public boolean isAttackable() { + return attackable; + } + + /** + * Sets the value of the attackable property. + * + */ + public void setAttackable(boolean value) { + this.attackable = value; + } + + /** + * Gets the value of the targetable property. + * + */ + public boolean isTargetable() { + return targetable; + } + + /** + * Sets the value of the targetable property. + * + */ + public void setTargetable(boolean value) { + this.targetable = value; + } + + /** + * Gets the value of the aggressive property. + * + */ + public boolean isAggressive() { + return aggressive; + } + + /** + * Sets the value of the aggressive property. + * + */ + public void setAggressive(boolean value) { + this.aggressive = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Collision { + + @XmlAttribute(name = "radius", required = true) + protected double radius; + @XmlAttribute(name = "heigth", required = true) + protected double heigth; + + /** + * Gets the value of the radius property. + * + */ + public double getRadius() { + return radius; + } + + /** + * Sets the value of the radius property. + * + */ + public void setRadius(double value) { + this.radius = value; + } + + /** + * Gets the value of the heigth property. + * + */ + public double getHeigth() { + return heigth; + } + + /** + * Sets the value of the heigth property. + * + */ + public void setHeigth(double value) { + this.heigth = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+         *       <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Item { + + @XmlAttribute(name = "rightHand") + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID rightHand; + @XmlAttribute(name = "leftHand") + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID leftHand; + + /** + * Gets the value of the rightHand property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getRightHand() { + return rightHand; + } + + /** + * Sets the value of the rightHand property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRightHand(ItemTemplateID value) { + this.rightHand = value; + } + + /** + * Gets the value of the leftHand property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getLeftHand() { + return leftHand; + } + + /** + * Sets the value of the leftHand property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLeftHand(ItemTemplateID value) { + this.leftHand = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *       <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Name { + + @XmlValue + protected String value; + @XmlAttribute(name = "send") + protected Boolean send; + @XmlAttribute(name = "display") + protected Boolean display; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the send property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isSend() { + return send; + } + + /** + * Sets the value of the send property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setSend(Boolean value) { + this.send = value; + } + + /** + * Gets the value of the display property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isDisplay() { + return display; + } + + /** + * Sets the value of the display property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setDisplay(Boolean value) { + this.display = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="hp">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="mp">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="attack" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="physical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                   <element name="magical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                 </sequence>
+         *                 <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="defense" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="physical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                   <element name="magical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="move" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="base">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "hp", + "mp", + "attack", + "defense", + "move", + "base" + }) + public static class Stats { + + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Hp hp; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Mp mp; + protected NPCTemplate.Info.Stats.Attack attack; + protected NPCTemplate.Info.Stats.Defense defense; + protected NPCTemplate.Info.Stats.Move move; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Base base; + + /** + * Gets the value of the hp property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Hp } + * + */ + public NPCTemplate.Info.Stats.Hp getHp() { + return hp; + } + + /** + * Sets the value of the hp property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Hp } + * + */ + public void setHp(NPCTemplate.Info.Stats.Hp value) { + this.hp = value; + } + + /** + * Gets the value of the mp property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Mp } + * + */ + public NPCTemplate.Info.Stats.Mp getMp() { + return mp; + } + + /** + * Sets the value of the mp property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Mp } + * + */ + public void setMp(NPCTemplate.Info.Stats.Mp value) { + this.mp = value; + } + + /** + * Gets the value of the attack property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Attack } + * + */ + public NPCTemplate.Info.Stats.Attack getAttack() { + return attack; + } + + /** + * Sets the value of the attack property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Attack } + * + */ + public void setAttack(NPCTemplate.Info.Stats.Attack value) { + this.attack = value; + } + + /** + * Gets the value of the defense property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Defense } + * + */ + public NPCTemplate.Info.Stats.Defense getDefense() { + return defense; + } + + /** + * Sets the value of the defense property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Defense } + * + */ + public void setDefense(NPCTemplate.Info.Stats.Defense value) { + this.defense = value; + } + + /** + * Gets the value of the move property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Move } + * + */ + public NPCTemplate.Info.Stats.Move getMove() { + return move; + } + + /** + * Sets the value of the move property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Move } + * + */ + public void setMove(NPCTemplate.Info.Stats.Move value) { + this.move = value; + } + + /** + * Gets the value of the base property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Base } + * + */ + public NPCTemplate.Info.Stats.Base getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Base } + * + */ + public void setBase(NPCTemplate.Info.Stats.Base value) { + this.base = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="physical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="magical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *       </sequence>
+             *       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Attack { + + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Attack.Physical physical; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Attack.Magical magical; + @XmlAttribute(name = "range", required = true) + protected int range; + @XmlAttribute(name = "evasion", required = true) + protected int evasion; + @XmlAttribute(name = "critical", required = true) + protected int critical; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Attack.Physical } + * + */ + public NPCTemplate.Info.Stats.Attack.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Attack.Physical } + * + */ + public void setPhysical(NPCTemplate.Info.Stats.Attack.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Attack.Magical } + * + */ + public NPCTemplate.Info.Stats.Attack.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Attack.Magical } + * + */ + public void setMagical(NPCTemplate.Info.Stats.Attack.Magical value) { + this.magical = value; + } + + /** + * Gets the value of the range property. + * + */ + public int getRange() { + return range; + } + + /** + * Sets the value of the range property. + * + */ + public void setRange(int value) { + this.range = value; + } + + /** + * Gets the value of the evasion property. + * + */ + public int getEvasion() { + return evasion; + } + + /** + * Sets the value of the evasion property. + * + */ + public void setEvasion(int value) { + this.evasion = value; + } + + /** + * Gets the value of the critical property. + * + */ + public int getCritical() { + return critical; + } + + /** + * Sets the value of the critical property. + * + */ + public void setCritical(int value) { + this.critical = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Base { + + @XmlAttribute(name = "int", required = true) + protected int _int; + @XmlAttribute(name = "str", required = true) + protected int str; + @XmlAttribute(name = "con", required = true) + protected int con; + @XmlAttribute(name = "men", required = true) + protected int men; + @XmlAttribute(name = "dex", required = true) + protected int dex; + @XmlAttribute(name = "wit", required = true) + protected int wit; + + /** + * Gets the value of the int property. + * + */ + public int getInt() { + return _int; + } + + /** + * Sets the value of the int property. + * + */ + public void setInt(int value) { + this._int = value; + } + + /** + * Gets the value of the str property. + * + */ + public int getStr() { + return str; + } + + /** + * Sets the value of the str property. + * + */ + public void setStr(int value) { + this.str = value; + } + + /** + * Gets the value of the con property. + * + */ + public int getCon() { + return con; + } + + /** + * Sets the value of the con property. + * + */ + public void setCon(int value) { + this.con = value; + } + + /** + * Gets the value of the men property. + * + */ + public int getMen() { + return men; + } + + /** + * Sets the value of the men property. + * + */ + public void setMen(int value) { + this.men = value; + } + + /** + * Gets the value of the dex property. + * + */ + public int getDex() { + return dex; + } + + /** + * Sets the value of the dex property. + * + */ + public void setDex(int value) { + this.dex = value; + } + + /** + * Gets the value of the wit property. + * + */ + public int getWit() { + return wit; + } + + /** + * Sets the value of the wit property. + * + */ + public void setWit(int value) { + this.wit = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="physical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="magical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Defense { + + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Defense.Physical physical; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Defense.Magical magical; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Defense.Physical } + * + */ + public NPCTemplate.Info.Stats.Defense.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Defense.Physical } + * + */ + public void setPhysical(NPCTemplate.Info.Stats.Defense.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Defense.Magical } + * + */ + public NPCTemplate.Info.Stats.Defense.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Defense.Magical } + * + */ + public void setMagical(NPCTemplate.Info.Stats.Defense.Magical value) { + this.magical = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Hp { + + @XmlAttribute(name = "max", required = true) + protected double max; + @XmlAttribute(name = "regen", required = true) + protected double regen; + + /** + * Gets the value of the max property. + * + */ + public double getMax() { + return max; + } + + /** + * Sets the value of the max property. + * + */ + public void setMax(double value) { + this.max = value; + } + + /** + * Gets the value of the regen property. + * + */ + public double getRegen() { + return regen; + } + + /** + * Sets the value of the regen property. + * + */ + public void setRegen(double value) { + this.regen = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Move { + + @XmlAttribute(name = "run", required = true) + protected double run; + @XmlAttribute(name = "walk", required = true) + protected double walk; + + /** + * Gets the value of the run property. + * + */ + public double getRun() { + return run; + } + + /** + * Sets the value of the run property. + * + */ + public void setRun(double value) { + this.run = value; + } + + /** + * Gets the value of the walk property. + * + */ + public double getWalk() { + return walk; + } + + /** + * Sets the value of the walk property. + * + */ + public void setWalk(double value) { + this.walk = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Mp { + + @XmlAttribute(name = "max", required = true) + protected double max; + @XmlAttribute(name = "regen", required = true) + protected double regen; + + /** + * Gets the value of the max property. + * + */ + public double getMax() { + return max; + } + + /** + * Sets the value of the max property. + * + */ + public void setMax(double value) { + this.max = value; + } + + /** + * Gets the value of the regen property. + * + */ + public double getRegen() { + return regen; + } + + /** + * Sets the value of the regen property. + * + */ + public void setRegen(double value) { + this.regen = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Title { + + @XmlValue + protected String value; + @XmlAttribute(name = "send") + protected Boolean send; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the send property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isSend() { + return send; + } + + /** + * Sets the value of the send property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setSend(Boolean value) { + this.send = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="skill" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+     *                 <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "skill" + }) + public static class Skills { + + @XmlElement(required = true) + protected List skill; + + /** + * Gets the value of the skill property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the skill property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getSkill().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link NPCTemplate.Skills.Skill } + * + * + */ + public List getSkill() { + if (skill == null) { + skill = new ArrayList(); + } + return this.skill; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+         *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Skill { + + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) + protected SkillTemplateID id; + @XmlAttribute(name = "level", required = true) + protected int level; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public SkillTemplateID getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(SkillTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the level property. + * + */ + public int getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + */ + public void setLevel(int value) { + this.level = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="chat" maxOccurs="unbounded">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "chat" + }) + public static class Talk { + + @XmlElement(required = true) + protected List chat; + @XmlAttribute(name = "default", required = true) + protected String _default; + + /** + * Gets the value of the chat property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the chat property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getChat().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link NPCTemplate.Talk.Chat } + * + * + */ + public List getChat() { + if (chat == null) { + chat = new ArrayList(); + } + return this.chat; + } + + /** + * Gets the value of the default property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDefault() { + return _default; + } + + /** + * Sets the value of the default property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDefault(String value) { + this._default = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Chat { + + @XmlValue + protected String value; + @XmlAttribute(name = "id", required = true) + protected String id; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java new file mode 100755 index 000000000..39ffc9bc9 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java @@ -0,0 +1,535 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.l2jserver.model.template package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link NPCTemplate } + * + */ + public NPCTemplate createNPCTemplate() { + return new NPCTemplate(); + } + + /** + * Create an instance of {@link NPCTemplate.Droplist } + * + */ + public NPCTemplate.Droplist createNPCTemplateDroplist() { + return new NPCTemplate.Droplist(); + } + + /** + * Create an instance of {@link NPCTemplate.Droplist.Item } + * + */ + public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() { + return new NPCTemplate.Droplist.Item(); + } + + /** + * Create an instance of {@link Teleports } + * + */ + public Teleports createTeleports() { + return new Teleports(); + } + + /** + * Create an instance of {@link Zones } + * + */ + public Zones createZones() { + return new Zones(); + } + + /** + * Create an instance of {@link ZoneType } + * + */ + public ZoneType createZoneType() { + return new ZoneType(); + } + + /** + * Create an instance of {@link Zones.Castle } + * + */ + public Zones.Castle createZonesCastle() { + return new Zones.Castle(); + } + + /** + * Create an instance of {@link Teleports.Teleport } + * + */ + public Teleports.Teleport createTeleportsTeleport() { + return new Teleports.Teleport(); + } + + /** + * Create an instance of {@link NPCTemplate.Skills } + * + */ + public NPCTemplate.Skills createNPCTemplateSkills() { + return new NPCTemplate.Skills(); + } + + /** + * Create an instance of {@link NPCTemplate.Talk } + * + */ + public NPCTemplate.Talk createNPCTemplateTalk() { + return new NPCTemplate.Talk(); + } + + /** + * Create an instance of {@link NPCTemplate.Info } + * + */ + public NPCTemplate.Info createNPCTemplateInfo() { + return new NPCTemplate.Info(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats } + * + */ + public NPCTemplate.Info.Stats createNPCTemplateInfoStats() { + return new NPCTemplate.Info.Stats(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Defense } + * + */ + public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() { + return new NPCTemplate.Info.Stats.Defense(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Attack } + * + */ + public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() { + return new NPCTemplate.Info.Stats.Attack(); + } + + /** + * Create an instance of {@link ItemTemplate } + * + */ + public ItemTemplate createItemTemplate() { + return new ItemTemplate(); + } + + /** + * Create an instance of {@link ItemTemplate.Armor } + * + */ + public ItemTemplate.Armor createItemTemplateArmor() { + return new ItemTemplate.Armor(); + } + + /** + * Create an instance of {@link ItemTemplate.Attributes } + * + */ + public ItemTemplate.Attributes createItemTemplateAttributes() { + return new ItemTemplate.Attributes(); + } + + /** + * Create an instance of {@link CharacterTemplate } + * + */ + public CharacterTemplate createCharacterTemplate() { + return new CharacterTemplate(); + } + + /** + * Create an instance of {@link CharacterTemplate.Collision } + * + */ + public CharacterTemplate.Collision createCharacterTemplateCollision() { + return new CharacterTemplate.Collision(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats } + * + */ + public CharacterTemplate.Stats createCharacterTemplateStats() { + return new CharacterTemplate.Stats(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Defense } + * + */ + public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() { + return new CharacterTemplate.Stats.Defense(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Attack } + * + */ + public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() { + return new CharacterTemplate.Stats.Attack(); + } + + /** + * Create an instance of {@link CalculatorFunction } + * + */ + public CalculatorFunction createCalculatorFunction() { + return new CalculatorFunction(); + } + + /** + * Create an instance of {@link Coordinate } + * + */ + public Coordinate createCoordinate() { + return new Coordinate(); + } + + /** + * Create an instance of {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation createCalculatorFunctionOperation() { + return new CalculatorFunctionOperation(); + } + + /** + * Create an instance of {@link SkillTemplate } + * + */ + public SkillTemplate createSkillTemplate() { + return new SkillTemplate(); + } + + /** + * Create an instance of {@link ZoneType.Point } + * + */ + public ZoneType.Point createZoneTypePoint() { + return new ZoneType.Point(); + } + + /** + * Create an instance of {@link Zones.Castle.Siege } + * + */ + public Zones.Castle.Siege createZonesCastleSiege() { + return new Zones.Castle.Siege(); + } + + /** + * Create an instance of {@link Teleports.Teleport.Restrictions } + * + */ + public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() { + return new Teleports.Teleport.Restrictions(); + } + + /** + * Create an instance of {@link NPCTemplate.Ai } + * + */ + public NPCTemplate.Ai createNPCTemplateAi() { + return new NPCTemplate.Ai(); + } + + /** + * Create an instance of {@link NPCTemplate.Skills.Skill } + * + */ + public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() { + return new NPCTemplate.Skills.Skill(); + } + + /** + * Create an instance of {@link NPCTemplate.Talk.Chat } + * + */ + public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() { + return new NPCTemplate.Talk.Chat(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Name } + * + */ + public NPCTemplate.Info.Name createNPCTemplateInfoName() { + return new NPCTemplate.Info.Name(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Title } + * + */ + public NPCTemplate.Info.Title createNPCTemplateInfoTitle() { + return new NPCTemplate.Info.Title(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Item } + * + */ + public NPCTemplate.Info.Item createNPCTemplateInfoItem() { + return new NPCTemplate.Info.Item(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Collision } + * + */ + public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() { + return new NPCTemplate.Info.Collision(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Hp } + * + */ + public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() { + return new NPCTemplate.Info.Stats.Hp(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Mp } + * + */ + public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() { + return new NPCTemplate.Info.Stats.Mp(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Move } + * + */ + public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() { + return new NPCTemplate.Info.Stats.Move(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Base } + * + */ + public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() { + return new NPCTemplate.Info.Stats.Base(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical } + * + */ + public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() { + return new NPCTemplate.Info.Stats.Defense.Physical(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical } + * + */ + public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() { + return new NPCTemplate.Info.Stats.Defense.Magical(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical } + * + */ + public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() { + return new NPCTemplate.Info.Stats.Attack.Physical(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical } + * + */ + public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() { + return new NPCTemplate.Info.Stats.Attack.Magical(); + } + + /** + * Create an instance of {@link ItemTemplate.Controller } + * + */ + public ItemTemplate.Controller createItemTemplateController() { + return new ItemTemplate.Controller(); + } + + /** + * Create an instance of {@link ItemTemplate.Effect } + * + */ + public ItemTemplate.Effect createItemTemplateEffect() { + return new ItemTemplate.Effect(); + } + + /** + * Create an instance of {@link ItemTemplate.EtcItem } + * + */ + public ItemTemplate.EtcItem createItemTemplateEtcItem() { + return new ItemTemplate.EtcItem(); + } + + /** + * Create an instance of {@link ItemTemplate.Weapon } + * + */ + public ItemTemplate.Weapon createItemTemplateWeapon() { + return new ItemTemplate.Weapon(); + } + + /** + * Create an instance of {@link ItemTemplate.Armor.Cost } + * + */ + public ItemTemplate.Armor.Cost createItemTemplateArmorCost() { + return new ItemTemplate.Armor.Cost(); + } + + /** + * Create an instance of {@link ItemTemplate.Armor.Equipment } + * + */ + public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() { + return new ItemTemplate.Armor.Equipment(); + } + + /** + * Create an instance of {@link ItemTemplate.Attributes.Cost } + * + */ + public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() { + return new ItemTemplate.Attributes.Cost(); + } + + /** + * Create an instance of {@link CharacterTemplate.Collision.Male } + * + */ + public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() { + return new CharacterTemplate.Collision.Male(); + } + + /** + * Create an instance of {@link CharacterTemplate.Collision.Female } + * + */ + public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() { + return new CharacterTemplate.Collision.Female(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Hp } + * + */ + public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() { + return new CharacterTemplate.Stats.Hp(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Mp } + * + */ + public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() { + return new CharacterTemplate.Stats.Mp(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Cp } + * + */ + public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() { + return new CharacterTemplate.Stats.Cp(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Move } + * + */ + public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() { + return new CharacterTemplate.Stats.Move(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Base } + * + */ + public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() { + return new CharacterTemplate.Stats.Base(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical } + * + */ + public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() { + return new CharacterTemplate.Stats.Defense.Physical(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical } + * + */ + public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() { + return new CharacterTemplate.Stats.Defense.Magical(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical } + * + */ + public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() { + return new CharacterTemplate.Stats.Attack.Physical(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical } + * + */ + public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() { + return new CharacterTemplate.Stats.Attack.Magical(); + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java new file mode 100755 index 000000000..1fd60b063 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java @@ -0,0 +1,163 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import com.l2jserver.model.id.template.SkillTemplateID; +import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; + + +/** + *

Java class for skill element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="skill">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}AbstractTemplate">
+ *         <sequence>
+ *           <element name="maximumLevel" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         </sequence>
+ *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+ *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="delay" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *         <attribute name="cooldown" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "maximumLevel" +}) +@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill") +public class SkillTemplate + extends AbstractTemplate +{ + + protected int maximumLevel; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) + protected SkillTemplateID id; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "delay", required = true) + protected int delay; + @XmlAttribute(name = "cooldown", required = true) + protected int cooldown; + + /** + * Gets the value of the maximumLevel property. + * + */ + public int getMaximumLevel() { + return maximumLevel; + } + + /** + * Sets the value of the maximumLevel property. + * + */ + public void setMaximumLevel(int value) { + this.maximumLevel = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public SkillTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(SkillTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the delay property. + * + */ + public int getDelay() { + return delay; + } + + /** + * Sets the value of the delay property. + * + */ + public void setDelay(int value) { + this.delay = value; + } + + /** + * Gets the value of the cooldown property. + * + */ + public int getCooldown() { + return cooldown; + } + + /** + * Sets the value of the cooldown property. + * + */ + public void setCooldown(int value) { + this.cooldown = value; + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java new file mode 100755 index 000000000..0095c3186 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java @@ -0,0 +1,381 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import com.l2jserver.model.id.template.TeleportationTemplateID; +import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="teleport" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <extension base="{}AbstractTemplate">
+ *                 <sequence>
+ *                   <element name="point" type="{}Coordinate" minOccurs="0"/>
+ *                   <element name="restrictions" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="restriction" maxOccurs="unbounded">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <enumeration value="NOBLE"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+ *                 <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *               </extension>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "teleport" +}) +@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport") +public class Teleports { + + @XmlElement(required = true) + protected List teleport; + + /** + * Gets the value of the teleport property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the teleport property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getTeleport().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Teleports.Teleport } + * + * + */ + public List getTeleport() { + if (teleport == null) { + teleport = new ArrayList(); + } + return this.teleport; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <extension base="{}AbstractTemplate">
+     *       <sequence>
+     *         <element name="point" type="{}Coordinate" minOccurs="0"/>
+     *         <element name="restrictions" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="restriction" maxOccurs="unbounded">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <enumeration value="NOBLE"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+     *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *     </extension>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "point", + "restrictions" + }) + public static class Teleport + extends AbstractTemplate + { + + protected Coordinate point; + protected Teleports.Teleport.Restrictions restrictions; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class) + protected TeleportationTemplateID id; + @XmlAttribute(name = "name") + protected String name; + @XmlAttribute(name = "item") + protected Integer item; + @XmlAttribute(name = "price", required = true) + protected int price; + + /** + * Gets the value of the point property. + * + * @return + * possible object is + * {@link Coordinate } + * + */ + public Coordinate getPoint() { + return point; + } + + /** + * Sets the value of the point property. + * + * @param value + * allowed object is + * {@link Coordinate } + * + */ + public void setPoint(Coordinate value) { + this.point = value; + } + + /** + * Gets the value of the restrictions property. + * + * @return + * possible object is + * {@link Teleports.Teleport.Restrictions } + * + */ + public Teleports.Teleport.Restrictions getRestrictions() { + return restrictions; + } + + /** + * Sets the value of the restrictions property. + * + * @param value + * allowed object is + * {@link Teleports.Teleport.Restrictions } + * + */ + public void setRestrictions(Teleports.Teleport.Restrictions value) { + this.restrictions = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public TeleportationTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(TeleportationTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the item property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getItem() { + return item; + } + + /** + * Sets the value of the item property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setItem(Integer value) { + this.item = value; + } + + /** + * Gets the value of the price property. + * + */ + public int getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + */ + public void setPrice(int value) { + this.price = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="restriction" maxOccurs="unbounded">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <enumeration value="NOBLE"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "restriction" + }) + public static class Restrictions { + + @XmlElement(required = true) + protected List restriction; + + /** + * Gets the value of the restriction property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the restriction property. + * + *

+ * For example, to add a new item, do as follows: + *

+             *    getRestriction().add(newItem);
+             * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getRestriction() { + if (restriction == null) { + restriction = new ArrayList(); + } + return this.restriction; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java new file mode 100755 index 000000000..42e4f962d --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java @@ -0,0 +1,180 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for ZoneType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="ZoneType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="point" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                 </sequence>
+ *                 <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ZoneType", namespace = "zones", propOrder = { + "point" +}) +public class ZoneType { + + @XmlElement(required = true) + protected List point; + @XmlAttribute(name = "id", required = true) + protected String id; + + /** + * Gets the value of the point property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the point property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPoint().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ZoneType.Point } + * + * + */ + public List getPoint() { + if (point == null) { + point = new ArrayList(); + } + return this.point; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *       </sequence>
+     *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Point { + + @XmlAttribute(name = "x", required = true) + protected int x; + @XmlAttribute(name = "y", required = true) + protected int y; + + /** + * Gets the value of the x property. + * + */ + public int getX() { + return x; + } + + /** + * Sets the value of the x property. + * + */ + public void setX(int value) { + this.x = value; + } + + /** + * Gets the value of the y property. + * + */ + public int getY() { + return y; + } + + /** + * Sets the value of the y property. + * + */ + public void setY(int value) { + this.y = value; + } + + } + +} diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java new file mode 100755 index 000000000..6127895da --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java @@ -0,0 +1,211 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.01.19 at 03:37:11 PM BRST +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="castle">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="siege">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="zone" type="{zones}ZoneType"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "castle" +}) +@XmlRootElement(name = "zones", namespace = "zones") +public class Zones { + + @XmlElement(required = true) + protected Zones.Castle castle; + + /** + * Gets the value of the castle property. + * + * @return + * possible object is + * {@link Zones.Castle } + * + */ + public Zones.Castle getCastle() { + return castle; + } + + /** + * Sets the value of the castle property. + * + * @param value + * allowed object is + * {@link Zones.Castle } + * + */ + public void setCastle(Zones.Castle value) { + this.castle = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="siege">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="zone" type="{zones}ZoneType"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "siege" + }) + public static class Castle { + + @XmlElement(required = true) + protected Zones.Castle.Siege siege; + + /** + * Gets the value of the siege property. + * + * @return + * possible object is + * {@link Zones.Castle.Siege } + * + */ + public Zones.Castle.Siege getSiege() { + return siege; + } + + /** + * Sets the value of the siege property. + * + * @param value + * allowed object is + * {@link Zones.Castle.Siege } + * + */ + public void setSiege(Zones.Castle.Siege value) { + this.siege = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="zone" type="{zones}ZoneType"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "zone" + }) + public static class Siege { + + @XmlElement(required = true) + protected ZoneType zone; + + /** + * Gets the value of the zone property. + * + * @return + * possible object is + * {@link ZoneType } + * + */ + public ZoneType getZone() { + return zone; + } + + /** + * Sets the value of the zone property. + * + * @param value + * allowed object is + * {@link ZoneType } + * + */ + public void setZone(ZoneType value) { + this.zone = value; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/GeneralConfiguration.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/GeneralConfiguration.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/GeneralConfiguration.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/GeneralConfiguration.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java index 5543ac1a8..bef3a527b --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JConstant.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java @@ -16,7 +16,8 @@ */ package com.l2jserver; -import com.l2jserver.game.net.ProtocolVersion; +import com.l2jserver.service.network.model.ProtocolVersion; + /** * Constant values for this L2J compilation diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServerMain.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/L2JGameServerMain.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/AI.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/AI.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/AI.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/AI.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/AbstractDesire.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/AbstractDesire.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/AbstractDesire.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/AbstractDesire.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/AttackDesire.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/AttackDesire.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/AttackDesire.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/AttackDesire.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/Desire.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/Desire.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/Desire.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/Desire.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/DesireQueue.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/DesireQueue.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/DesireQueue.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/DesireQueue.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/MoveDesire.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/MoveDesire.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/ai/desires/MoveDesire.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/game/ai/desires/MoveDesire.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/CharacterDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/CharacterDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterShortcutDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/CharacterShortcutDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/CharacterShortcutDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/CharacterShortcutDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ClanDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/ClanDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ClanDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/ClanDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ItemDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/ItemDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/ItemDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/ItemDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/NPCDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/NPCDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/NPCDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/NPCDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/PetDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/PetDAO.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/dao/PetDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/dao/PetDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Castle.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/Castle.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Castle.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/Castle.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterFriend.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/CharacterFriend.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterFriend.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/CharacterFriend.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterShortcut.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/CharacterShortcut.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/CharacterShortcut.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/CharacterShortcut.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Fort.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/Fort.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Fort.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/Fort.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Skill.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/Skill.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/game/Skill.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/game/Skill.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AccountID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/AccountID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/AccountID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/AccountID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CastleID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CastleID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CastleID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CastleID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ChatMessageID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/ChatMessageID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ChatMessageID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/ChatMessageID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FortID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/FortID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FortID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/FortID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FriendID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/FriendID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/FriendID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/FriendID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ObjectID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/ObjectID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/ObjectID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/ObjectID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/SkillID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/SkillID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/SkillID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/SkillID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/TemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/TemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/TemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/TemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ActorID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/ActorID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ActorID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/ActorID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/CharacterID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/CharacterID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/CharacterID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/CharacterID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ClanID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/ClanID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ClanID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/ClanID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ItemID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/ItemID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/ItemID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/ItemID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/NPCID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/NPCID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/NPCID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/NPCID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/PetID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/PetID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/PetID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/PetID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterable.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/CharacterIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ClanIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/NPCIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/ObjectIDResolver.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/object/provider/PetIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/AccountIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/CastleIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CharacterShortcutIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/CharacterShortcutIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CharacterShortcutIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/CharacterShortcutIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/ChatMessageIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/CompoundIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/FortIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/FriendIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/IDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/IDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/CharacterTemplateIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/ItemTemplateIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/NPCTemplateIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/SkillTemplateIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/TeleportationTemplateIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/provider/TemplateIDProvider.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/AttackHit.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/AttackHit.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/AttackHit.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/AttackHit.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/ChatMessage.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/ChatMessage.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/ChatMessage.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/ChatMessage.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/AttackCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorContext.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/AttackCalculatorFunction.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AugmentTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/AugmentTemplate.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/Template.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/Template.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/Template.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/Template.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/actor/ActorSex.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/actor/ActorSex.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/actor/ActorSex.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/actor/ActorSex.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterClass.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/character/CharacterClass.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterClass.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/character/CharacterClass.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterRace.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/character/CharacterRace.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/character/CharacterRace.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/character/CharacterRace.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ArmorType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/ArmorType.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ArmorType.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/ArmorType.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/ItemMaterial.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/ItemType.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/ItemType.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/ItemType.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/WeaponType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/WeaponType.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/item/WeaponType.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/item/WeaponType.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCRace.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/npc/NPCRace.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/NPCRace.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/npc/NPCRace.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/AbstractObject.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/AbstractObject.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/AbstractObject.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/AbstractObject.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Actor.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Actor.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Clan.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Clan.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Clan.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Clan.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Item.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Item.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Item.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Item.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/L2Character.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/L2Character.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/L2Character.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/L2Character.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/NPC.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/NPC.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/NPC.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/NPC.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Pet.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Pet.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Pet.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Pet.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Player.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Player.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/Player.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Player.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/PositionableObject.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/PositionableObject.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/PositionableObject.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/PositionableObject.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/WorldObject.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/WorldObject.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/WorldObject.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/WorldObject.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorContext.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorFormula.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/AttackAccuracyBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/AttackEvasionBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalAttackSpeedBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalCriticalRateBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MagicalDefenseBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumHPBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/MaximumMPBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalAttackSpeedBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalCriticalRateBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/PhysicalDefenseBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/RunSpeedBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/WalkSpeedBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorAttackHitEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorDieEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorSpawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorTeleportingEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/event/ActorUnspawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/stat/BaseStats.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/StatType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/stat/StatType.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/StatType.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/stat/StatType.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterAppearance.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterFriendList.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterInventory.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterStats.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/CharacterStats.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorFunction.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumMPAddCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackAccuracyCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseAttackEvasionCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseCPCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseConcentrationCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseDexterityCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseHPCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseIntelligenceCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMPCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalAttackSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalCriticalRateCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMagicalDefenseCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseMentalityCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalAttackSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalDefenseCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseRunSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseStrengthCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWalkSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBaseWitnessCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterAttackEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterCreateShortcutEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterCreateShortcutEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterCreateShortcutEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterCreateShortcutEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterDeleteShortcutEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterDeleteShortcutEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterDeleteShortcutEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterDeleteShortcutEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterEnterWorldEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterLeaveWorldEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListShortcutEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterListShortcutEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListShortcutEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterListShortcutEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterMoveEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterRunningEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStartMovingEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterStartMovingEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStartMovingEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterStartMovingEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterStopMoveEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetDeselectedEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/event/CharacterWalkingEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/clan/ClanEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/clan/ClanListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/clan/ClanListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/clan/ClanMembers.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/event/SpawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/event/UnspawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemDropEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/NPCController.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCController.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/NPCController.java index 89638a31f..dd4df80a6 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCController.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/NPCController.java @@ -16,9 +16,9 @@ */ package com.l2jserver.model.world.npc; -import com.l2jserver.game.net.SystemMessage; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.NPC; +import com.l2jserver.service.network.model.SystemMessage; import com.l2jserver.util.exception.L2Exception; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/NPCStats.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/NPCStats.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorFunction.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/NPCFormula.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseAttackEvasionCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseConcentrationCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseDexterityCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseHPCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseIntelligenceCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMPCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalAttackSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalCriticalRateCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMagicalDefenseCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseMentalityCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalAttackSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalCriticalRateCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBasePhysicalDefenseCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseRunSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseStrengthCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWalkSpeedCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/calculator/base/NPCBaseWitnessCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/MonsterController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/MonsterController.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/MonsterController.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/MonsterController.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/SimpleNPCController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/SimpleNPCController.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/SimpleNPCController.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/SimpleNPCController.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCDieEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCSpawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCTalkEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCTalkEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCTalkEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCTalkEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/event/NPCUnspawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerSpawnEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/player/event/PlayerTeleportedEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/GameServerDAOResolver.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/GameServerJDBCDatabaseService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/GameServerOrientDatabaseService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/OrientDBDAOModule.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterFriendDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterFriendDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterFriendDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterFriendDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterShortcutDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterShortcutDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterShortcutDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBCharacterShortcutDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBChatMessageDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBChatMessageDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBChatMessageDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBChatMessageDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBClanDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBClanDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBClanDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBClanDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBNPCDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBNPCDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBNPCDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBNPCDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterShortcutDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterShortcutDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterShortcutDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterShortcutDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLChatMessageDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLChatMessageDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLChatMessageDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLChatMessageDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLClanDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLClanDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLClanDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLClanDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLItemDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLItemDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLItemDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLItemDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLNPCDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLNPCDAO.java similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/dao/sql/SQLNPCDAO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLNPCDAO.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/CharacterFriendMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/CharacterFriendMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/CharacterFriendMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/CharacterFriendMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/CharacterMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/CharacterMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/CharacterMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/CharacterMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/CharacterShortcutMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/CharacterShortcutMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/CharacterShortcutMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/CharacterShortcutMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/ChatMessageMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/ChatMessageMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/ChatMessageMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/ChatMessageMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/ClanMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/ClanMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/ClanMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/ClanMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/ItemMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/ItemMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/ItemMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/ItemMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/NPCMapper.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/NPCMapper.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/mapper/NPCMapper.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/mapper/NPCMapper.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QActorSkill.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QActorSkill.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QActorSkill.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QActorSkill.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QCharacter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QCharacter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QClan.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QClan.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QItem.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QItem.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QLogChat.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QLogChat.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QNPC.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/model/QNPC.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/DuelService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/DuelService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/GameTimeService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/GameTimeService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/LotteryService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/LotteryService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/LotteryService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/LotteryService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PKService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/PKService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PKService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/PKService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PvPService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/PvPService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/PvPService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/PvPService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java index 4eddd1dc4..811fd69a2 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java @@ -16,10 +16,10 @@ */ package com.l2jserver.service.game.admin; -import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.Service; import com.l2jserver.service.ServiceException; +import com.l2jserver.service.network.model.Lineage2Client; /** * This service handles administrators in the server diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java index 3649e035f..f36d8a23e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java @@ -22,16 +22,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.AbstractService; -import com.l2jserver.service.game.admin.panel.AdminHomeTemplate; import com.l2jserver.service.game.spawn.CharacterAlreadyTeleportingServiceException; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnService; +import com.l2jserver.service.network.model.Lineage2Client; import com.l2jserver.util.geometry.Coordinate; /** @@ -82,7 +80,6 @@ public class AdministratorServiceImpl extends AbstractService implements Integer.parseInt(args[2]))); break; default: - conn.write(new SM_HTML(null, new AdminHomeTemplate())); break; } } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/GMService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/GMService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/GMService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/GMService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/panel/AdminHomeTemplate.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/admin/panel/TeleportTemplate.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIScript.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIScript.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIScript.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIScript.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/CastleService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/castle/CastleService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/CastleService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/castle/CastleService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/SiegeService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/castle/SiegeService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/castle/SiegeService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/castle/SiegeService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ActorIsNotAttackableServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacteCreationNotAllowedException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacteCreationNotAllowedException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacteCreationNotAllowedException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacteCreationNotAllowedException.java diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAction.java new file mode 100644 index 000000000..ad185835d --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAction.java @@ -0,0 +1,58 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 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. + * + * l2jserver2 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 l2jserver2. If not, see . + */ +package com.l2jserver.service.game.character; + +/** + * The character action type + * + * @author Rogiel + */ +public enum CharacterAction { + /** + * If the player has clicked with the left mouse button. + */ + CLICK(0), + /** + * If the player has clicked with the right mouse button. + */ + RIGHT_CLICK(1); + + /** + * The action id + */ + public final int id; + + /** + * @param id + * the action id + */ + CharacterAction(int id) { + this.id = id; + } + + /** + * @param id + * the action id + * @return the {@link CharacterAction} represented by id + */ + public static CharacterAction fromID(int id) { + for (final CharacterAction action : values()) + if (action.id == id) + return action; + return null; + } +} \ No newline at end of file diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidAppearanceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidRaceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidRaceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidRaceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidRaceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidSexException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidSexException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterInvalidSexException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterInvalidSexException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceConfiguration.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterServiceConfiguration.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceConfiguration.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterServiceConfiguration.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutSlotEmptyServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutSlotEmptyServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutSlotEmptyServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutSlotEmptyServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutSlotNotFreeServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutSlotNotFreeServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/ShortcutSlotNotFreeServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/ShortcutSlotNotFreeServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/CannotChatToSelfChatServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatChannel.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatChannelFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatChannelListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatLoggingService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatMessageType.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java index d8fbb4bde..11d13b8aa --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java @@ -16,8 +16,6 @@ */ package com.l2jserver.service.game.chat; -import com.l2jserver.game.net.packet.client.CM_CHAR_CHAT; -import com.l2jserver.game.net.packet.server.SM_ACTOR_CHAT; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ClanID; import com.l2jserver.model.server.ChatMessage; @@ -54,8 +52,8 @@ import com.l2jserver.service.Service; * {@link ChatBanActiveChatServiceException} will be thrown. * *

Packets

- * Messages are received (from the clients) with {@link CM_CHAR_CHAT} and sent (to - * the clients) with {@link SM_ACTOR_CHAT}. + * Messages are received (from the clients) with CM_CHAR_CHAT and sent (to + * the clients) with SM_ACTOR_CHAT. * * @author Rogiel */ diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatTargetOfflineServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/PrivateChatChannel.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/PublicChatChannel.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/TargetNotFoundChatServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/ClanService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/clan/ClanService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/ClanService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/clan/ClanService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/FortService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/clan/FortService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/clan/FortService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/clan/FortService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemAlreadyOnGroundServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemAlreadyOnGroundServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemAlreadyOnGroundServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemAlreadyOnGroundServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemNotOnGroundServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemNotOnGroundServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemNotOnGroundServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemNotOnGroundServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemService.java old mode 100644 new mode 100755 similarity index 99% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemService.java index 7c7efdb15..3a2b812ed --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemService.java @@ -16,13 +16,13 @@ */ package com.l2jserver.service.game.item; -import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; import com.l2jserver.model.dao.ItemDAO; import com.l2jserver.model.template.ItemTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.Service; +import com.l2jserver.service.game.character.CharacterAction; import com.l2jserver.service.game.spawn.AlreadySpawnedServiceException; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceConfiguration.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceConfiguration.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceConfiguration.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceConfiguration.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java old mode 100644 new mode 100755 similarity index 99% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java index 708e29bf5..58767e2e7 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java @@ -21,7 +21,6 @@ import java.util.List; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; import com.l2jserver.model.Model.ObjectDesire; import com.l2jserver.model.dao.ItemDAO; import com.l2jserver.model.id.object.ItemID; @@ -40,6 +39,7 @@ import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStopException; import com.l2jserver.service.core.threading.AsyncFuture; import com.l2jserver.service.database.DatabaseService; +import com.l2jserver.service.game.character.CharacterAction; import com.l2jserver.service.game.spawn.AlreadySpawnedServiceException; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/NonStackableItemsServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/NonStackableItemsServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/NonStackableItemsServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/NonStackableItemsServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/NotEnoughItemsServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/NotEnoughItemsServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/item/NotEnoughItemsServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/NotEnoughItemsServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/GeoDataMapService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/MapService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/MapService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/MapService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/MapService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/Tile.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/Tile.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/Tile.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/Tile.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/AbstractPath.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/Path.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/Path.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/Path.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/Path.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/PathingService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/ActionServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCService.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCService.java index 8b8371da6..2b114ef7d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCService.java @@ -16,8 +16,6 @@ */ package com.l2jserver.service.game.npc; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; @@ -26,6 +24,8 @@ import com.l2jserver.model.world.npc.NPCController.NPCControllerException; import com.l2jserver.service.Service; import com.l2jserver.service.core.threading.AsyncFuture; import com.l2jserver.service.game.character.CannotSetTargetServiceException; +import com.l2jserver.service.game.character.CharacterAction; +import com.l2jserver.service.network.model.SystemMessage; import com.l2jserver.util.geometry.Point3D; import com.l2jserver.util.html.markup.HtmlTemplate; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java old mode 100644 new mode 100755 similarity index 99% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java index bc45c8383..4017ec069 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; -import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; import com.l2jserver.model.dao.NPCDAO; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.Actor; @@ -48,6 +47,7 @@ import com.l2jserver.service.core.threading.ThreadService; import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.game.AttackService; import com.l2jserver.service.game.character.CannotSetTargetServiceException; +import com.l2jserver.service.game.character.CharacterAction; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.spawn.AlreadySpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/npc/NotAttackableNPCServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/Region.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/region/Region.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/Region.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/region/Region.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/RegionService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/region/RegionService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/region/RegionService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/region/RegionService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/CompilationResult.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptClassLoader.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptCompiler.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptContext.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptingService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/ScriptingServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/ClassListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/Loader.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/classlistener/Unloader.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/BinaryClass.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/BinaryClass.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/BinaryClass.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/BinaryClass.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ErrorListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ErrorListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ErrorListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ErrorListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromByteArray.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromByteArray.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromByteArray.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromByteArray.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromFile.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromFile.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromFile.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/JavaSourceFromFile.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ScriptContextImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKClassFileManager.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKClassFileManager.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKClassFileManager.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKClassFileManager.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLConnection.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLConnection.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLConnection.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLConnection.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLStreamHandler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLStreamHandler.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLStreamHandler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKVirtualClassURLStreamHandler.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptInfo.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/scriptmanager/ScriptList.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/CharacterAlreadyTeleportingServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/CharacterNotTeleportingServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnPointNotFoundServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceException.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/TemplateService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/TemplateService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/TemplateService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/TemplateService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateServiceConfiguration.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/XMLTemplateServiceConfiguration.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateServiceConfiguration.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/XMLTemplateServiceConfiguration.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldIDService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldIDService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldIDService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldIDService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldService.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldService.java index af276cb70..a2f5f8870 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldService.java @@ -19,7 +19,6 @@ package com.l2jserver.service.game.world; import java.util.Iterator; import java.util.List; -import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.PositionableObject; @@ -28,6 +27,7 @@ import com.l2jserver.service.Service; import com.l2jserver.service.game.world.event.WorldEventDispatcherService; import com.l2jserver.service.game.world.filter.WorldObjectFilter; import com.l2jserver.service.network.broadcast.BroadcastService; +import com.l2jserver.service.network.model.Lineage2Client; /** * One of the most important services in the whole server. It is responsible for diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/WorldServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/FilteredWorldListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/TypedWorldListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEvent.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceConfiguration.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceConfiguration.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceConfiguration.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceConfiguration.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceImpl.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherServiceImpl.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventFuture.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldListener.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/ExcludeFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/FilterIterator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/NotFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/WorldObjectFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/CharacterBroadcastFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/IDFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/InstanceFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListUpdateFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java index a50f4f113..2717dfd45 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java @@ -17,13 +17,13 @@ package com.l2jserver.service.network; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.Lineage2Session; -import com.l2jserver.game.net.packet.ClientPacket; -import com.l2jserver.game.net.packet.ServerPacket; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.Service; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Session; +import com.l2jserver.service.network.model.packet.ClientPacket; +import com.l2jserver.service.network.model.packet.ServerPacket; /** * The network service is responsible for communicating the server with the game diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkServiceConfiguration.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkServiceConfiguration.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkServiceConfiguration.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkServiceConfiguration.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java index 0837ea1f5..736436c3f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java @@ -18,9 +18,9 @@ package com.l2jserver.service.network.gameguard; import java.util.concurrent.Future; -import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.Service; +import com.l2jserver.service.network.model.Lineage2Client; /** * This service is responsible for querying and validating GameGuard packets diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/keygen/BlowfishKeygenService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java new file mode 100755 index 000000000..a4d3bd3d9 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java @@ -0,0 +1,264 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver2 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 License for more details. + * + * You should have received a copy of the GNU General License + * along with l2jserver2. If not, see . + */ +package com.l2jserver.service.network.model; + +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelFuture; + +import com.l2jserver.model.id.object.CharacterID; +import com.l2jserver.model.world.Item; +import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.packet.ServerPacket; +import com.l2jserver.util.html.markup.HtmlTemplate; + +/** + * This object connects the model (structure objects normally stored in the + * database) to the controller (protocol stuff). + *

+ * This class also provides handy methods for {@link #write(ServerPacket) + * writing} packets. + * + * @author Rogiel + */ +public interface Lineage2Client { + /** + * @return the character + */ + boolean hasCharacter(); + + /** + * @return the character ID + */ + CharacterID getCharacterID(); + + /** + * @return the character + */ + L2Character getCharacter() ; + + /** + * @param characterID + * the character ID to set + */ + void setCharacterID(CharacterID characterID); + + /** + * @return the session + */ + Lineage2Session getSession(); + + /** + * @param session + * the session to set + */ + void setSession(Lineage2Session session); + + /** + * @return the version + */ + ProtocolVersion getVersion(); + + /** + * @param version + * the version to set + */ + void setVersion(ProtocolVersion version); + + /** + * Check if the client supports an given version of the protocol. Note that + * if the protocol is not known false will always be returned. + * + * @param version + * the protocol version to test for support + * @return true if version is supported by the client + * @see ProtocolVersion#supports(ProtocolVersion) + */ + boolean supports(ProtocolVersion version); + + /** + * Get the channel + * + * @return the channel + */ + Channel getChannel(); + + /** + * Test if the client is still open. + *

+ * Please note that the channel can be open but disconnected! + * + * @return true if the client is still open + * @see Channel#isOpen() + */ + boolean isOpen(); + + /** + * Test if the client is still connected + *

+ * Please note that the channel can be open but disconnected! + * + * @return true if the client is still connected + * @see Channel#isConnected() + */ + boolean isConnected(); + + /** + * Writes an packet to this client + *

+ * Please note that this method will not block for the packets to be + * sent. It is possible to check if the packet was sent successfully using + * the {@link ChannelFuture}. + * + * @param packet + * the packet + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture write(ServerPacket packet); + + /** + * Sends a string message to this client + * + * @param message + * the message + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture sendMessage(String message); + + /** + * Sends a {@link SystemMessage} to this client + * + * @param message + * the {@link SystemMessage} + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture sendSystemMessage(SystemMessage message); + + /** + * Sends a {@link SystemMessage} to this client + * + * @param message + * the {@link SystemMessage} + * @param args + * the arguments of the message, they will be automatically + * detected and inserted. See SM_SYSTEM_MESSAGE for more + * about supported formats. + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + * @see SystemMessage + */ + ChannelFuture sendSystemMessage(SystemMessage message, + Object... args); + + /** + * Sends a SM_ACTION_FAILED to the client. + *

+ * This is an convenience method for

+ * conn.write(ActionFailedPacket.SHARED_INSTANCE);
+ * + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture sendActionFailed(); + + /** + * Sends a SM_HTML packet to the client. In the packet, the NPC will + * be null. If you wish to send the HTML with an NPC, you should send the + * packet directly. + *

+ * This is an convenience method for

+ * conn.write(new SM_HTML(null, template));
+ * + * @param template + * the HTML template to be sent + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture sendHTML(HtmlTemplate template); + + /** + * Sends a SM_COMMUNITY_HTML packet to the client. HTML code is not + * displayed in the regular chat window, they will appear in a large one. + *

+ * This is an convenience method for

+ * conn.write(new SM_COMMUNITY_HTML(template));
+ * + * @param template + * the HTML template to be sent + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture sendCommunityHTML(HtmlTemplate template); + + /** + * Sends the whole user inventory to the client. This is a very bandwidth + * consuming process and should be avoided. + * + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture updateEntireInventoryItems(); + + /** + * Removes items from the game client UI. + * + * @param items + * the list of items to be removed + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture removeInventoryItems(Item... items); + + /** + * Updates items in the game client UI. + * + * @param items + * the list of items to be updated + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture updateInventoryItems(Item... items); + + /** + * Adds items in the game client UI. + * + * @param items + * the list of items to be added + * @return the {@link ChannelFuture} that will be notified once the packet + * has been written. + */ + ChannelFuture addInventoryItems(Item... items); + + /** + * Disconnects this client, without closing the channel. + * + * @return the {@link ChannelFuture} + */ + ChannelFuture disconnect(); + + /** + * Closes the channel of this client. + * + * @return the {@link ChannelFuture} + */ + ChannelFuture close(); + + @Override + String toString(); +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2CryptographyKey.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2CryptographyKey.java index 4529ec39b..19809a36e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2CryptographyKey.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2CryptographyKey.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net; +package com.l2jserver.service.network.model; import java.util.Arrays; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Session.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Session.java index 625104ab1..6af9b9969 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Session.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net; +package com.l2jserver.service.network.model; import com.l2jserver.model.id.AccountID; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java index d1988d42b..2586ee061 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/ProtocolVersion.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/ProtocolVersion.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net; +package com.l2jserver.service.network.model; /** * Represents the protocol version used by the client diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/SystemMessage.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java old mode 100644 new mode 100755 similarity index 99% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/SystemMessage.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java index d86f2854c..d9fbef2f8 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/SystemMessage.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java @@ -14,9 +14,8 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.game.net; +package com.l2jserver.service.network.model; -import com.l2jserver.game.net.packet.server.SM_SYSTEM_MESSAGE; /** * @author Rogiel @@ -15210,10 +15209,6 @@ public enum SystemMessage { * The system message integer id */ public final int id; - /** - * The cached {@link SM_SYSTEM_MESSAGE} packet - */ - public final SM_SYSTEM_MESSAGE packet; /** * @param id @@ -15221,6 +15216,5 @@ public enum SystemMessage { */ SystemMessage(int id) { this.id = id; - this.packet = new SM_SYSTEM_MESSAGE(this); } } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/AbstractClientPacket.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/AbstractClientPacket.java index a16276ba9..95ff92c6f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractClientPacket.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/AbstractClientPacket.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net.packet; +package com.l2jserver.service.network.model.packet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/AbstractServerPacket.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/AbstractServerPacket.java index 5095d6797..a4e2d28ab --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/AbstractServerPacket.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/AbstractServerPacket.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net.packet; +package com.l2jserver.service.network.model.packet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/ClientPacket.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/ClientPacket.java index c5f3aec09..6047d148d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ClientPacket.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/ClientPacket.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net.packet; +package com.l2jserver.service.network.model.packet; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Client; /** * Each implementation is an packet sent by the game client. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/Packet.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/Packet.java index 17a2ebb35..377ab777e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/Packet.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/Packet.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net.packet; +package com.l2jserver.service.network.model.packet; /** * An simple packet. This must not be used directly, use {@link ClientPacket} or diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/ServerPacket.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/ServerPacket.java index fbec3b50e..67bd1cd2a --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/ServerPacket.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/packet/ServerPacket.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver2. If not, see . */ -package com.l2jserver.game.net.packet; +package com.l2jserver.service.network.model.packet; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Client; /** * Each implementation is an packet sent by the game server. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/MathUtil.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/MathUtil.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/MathUtil.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/MathUtil.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/AbstractDoubleFunction.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Calculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/Calculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Calculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/Calculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/CalculatorContext.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Function.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/Function.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/Function.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/Function.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/AbstractArea.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/AbstractArea.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/AbstractArea.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/AbstractArea.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Area.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Area.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Area.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Area.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Coordinate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Coordinate.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/CylinderArea.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/CylinderArea.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/CylinderArea.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/CylinderArea.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Point.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Point.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Point.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Point.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Point3D.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Point3D.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/Point3D.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Point3D.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/PolygonArea.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/PolygonArea.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/PolygonArea.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/PolygonArea.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/RectangleArea.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/RectangleArea.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/geometry/RectangleArea.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/RectangleArea.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BodyTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2BodyTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BodyTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2BodyTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BrTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2BrTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2BrTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2BrTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2CenterTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2CenterTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2CenterTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2CenterTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2DivTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2DivTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2DivTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2DivTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2FontTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2FontTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2FontTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2FontTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HeadTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2HeadTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HeadTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2HeadTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HtmlTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2HtmlTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2HtmlTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2HtmlTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2ImageTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2ImageTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2ImageTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2ImageTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2LinkTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2LinkTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2LinkTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2LinkTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2NewLineTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2NewLineTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2NewLineTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2NewLineTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2TitleTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2TitleTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/L2TitleTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/L2TitleTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/html/markup/MarkupTag.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ActorSexAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ActorSexAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ActorSexAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ActorSexAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ArmorTypeAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ArmorTypeAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ArmorTypeAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ArmorTypeAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterClassAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterClassAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterClassAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterClassAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ClassAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ClassAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ClassAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ClassAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemMaterialAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ItemMaterialAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemMaterialAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ItemMaterialAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTypeAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ItemTypeAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/ItemTypeAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/ItemTypeAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/MapAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCRaceAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/NPCRaceAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCRaceAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/NPCRaceAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/WeaponTypeAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/WeaponTypeAdapter.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/util/jaxb/WeaponTypeAdapter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/WeaponTypeAdapter.java diff --git a/l2jserver2-gameserver/src/main/uml/AIService.ecore b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/AIService.ecore old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/uml/AIService.ecore rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/AIService.ecore diff --git a/l2jserver2-gameserver/src/main/uml/AIService.ecorediag b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/AIService.ecorediag old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/uml/AIService.ecorediag rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/AIService.ecorediag diff --git a/l2jserver2-gameserver/src/main/uml/GameServerModel.ecore b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/GameServerModel.ecore old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/uml/GameServerModel.ecore rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/GameServerModel.ecore diff --git a/l2jserver2-gameserver/src/main/uml/GameServerModel.ecorediag b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/GameServerModel.ecorediag old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/uml/GameServerModel.ecorediag rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/uml/GameServerModel.ecorediag diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java diff --git a/l2jserver2-gameserver/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/util/calculator/CalculatorTest.java diff --git a/l2jserver2-gameserver/src/test/resources/scripting/ScriptingCompilerTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/resources/scripting/ScriptingCompilerTest.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/resources/scripting/ScriptingCompilerTest.java rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/resources/scripting/ScriptingCompilerTest.java diff --git a/l2jserver2-gameserver/src/test/resources/scripting/testcase.xml b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/resources/scripting/testcase.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/resources/scripting/testcase.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/resources/scripting/testcase.xml diff --git a/l2jserver2-gameserver/src/test/resources/test-config.xml b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/resources/test-config.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/test/resources/test-config.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/resources/test-config.xml diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/pom.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/pom.xml new file mode 100644 index 000000000..a38126152 --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + l2jserver2-gameserver + com.l2jserver + 0.0.2-SNAPSHOT + .. + + l2jserver2-gameserver-freya + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + src/main/assembly/distribution-mysql5-bin.xml + src/main/assembly/distribution-orientdb-bin.xml + src/main/assembly/distribution-h2-bin.xml + src/main/assembly/distribution-derby-bin.xml + src/main/assembly/distribution-src.xml + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + com.l2jserver.L2JGameServerMain + + + + + + + + + + com.l2jserver + l2jserver2-gameserver-core + 0.0.2-SNAPSHOT + + + \ No newline at end of file diff --git a/l2jserver2-gameserver/src/main/assembly/distribution-bin.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml old mode 100644 new mode 100755 similarity index 84% rename from l2jserver2-gameserver/src/main/assembly/distribution-bin.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml index 9b1ec268c..55bebe842 --- a/l2jserver2-gameserver/src/main/assembly/distribution-bin.xml +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"> - ${project.basedir}/distribution + ${project.parent.basedir}/distribution / @@ -16,7 +16,7 @@ 0755 - ${project.build.directory}/${project.artifactId}-${project.version}-data.zip + ${project.parent.build.directory}/${project.parent.artifactId}-${project.version}-data.zip / data.zip diff --git a/l2jserver2-gameserver/src/main/assembly/distribution-derby-bin.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-derby-bin.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/assembly/distribution-derby-bin.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-derby-bin.xml diff --git a/l2jserver2-gameserver/src/main/assembly/distribution-h2-bin.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-h2-bin.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/assembly/distribution-h2-bin.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-h2-bin.xml diff --git a/l2jserver2-gameserver/src/main/assembly/distribution-mysql5-bin.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-mysql5-bin.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/assembly/distribution-mysql5-bin.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-mysql5-bin.xml diff --git a/l2jserver2-gameserver/src/main/assembly/distribution-orientdb-bin.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-orientdb-bin.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/assembly/distribution-orientdb-bin.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-orientdb-bin.xml diff --git a/l2jserver2-gameserver/src/main/assembly/distribution-src.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-src.xml old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/assembly/distribution-src.xml rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-src.xml diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java index ed5aa5547..14fc0fd99 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java @@ -23,7 +23,6 @@ import com.l2jserver.game.net.codec.Lineage2Decrypter; import com.l2jserver.game.net.codec.Lineage2Encrypter; import com.l2jserver.game.net.codec.Lineage2PacketReader; import com.l2jserver.game.net.codec.Lineage2PacketWriter; -import com.l2jserver.game.net.packet.ServerPacket; import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED; import com.l2jserver.game.net.packet.server.SM_CHAR_INVENTORY; import com.l2jserver.game.net.packet.server.SM_CHAR_INVENTORY_UPDATE; @@ -37,6 +36,11 @@ import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.template.ItemTemplate; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Session; +import com.l2jserver.service.network.model.ProtocolVersion; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.ServerPacket; import com.l2jserver.util.html.markup.HtmlTemplate; /** @@ -48,7 +52,7 @@ import com.l2jserver.util.html.markup.HtmlTemplate; * * @author Rogiel */ -public class Lineage2Client { +public class FreyaLineage2Client implements Lineage2Client { /** * The connection channel */ @@ -73,7 +77,7 @@ public class Lineage2Client { * @param channel * the channel */ - public Lineage2Client(Channel channel) { + public FreyaLineage2Client(Channel channel) { this.channel = channel; } @@ -145,7 +149,7 @@ public class Lineage2Client { * @param version * the protocol version to test for support * @return true if version is supported by the client - * @see com.l2jserver.game.net.ProtocolVersion#supports(com.l2jserver.game.net.ProtocolVersion) + * @see com.l2jserver.service.network.model.net.ProtocolVersion#supports(com.l2jserver.service.network.model.net.ProtocolVersion) */ public boolean supports(ProtocolVersion version) { if (version == null) @@ -223,7 +227,7 @@ public class Lineage2Client { * has been written. */ public ChannelFuture sendSystemMessage(SystemMessage message) { - return write(message.packet); + return write(new SM_SYSTEM_MESSAGE(message)); } /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java index db00b22dd..58df7d888 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2Decrypter.java @@ -21,7 +21,7 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; -import com.l2jserver.game.net.Lineage2CryptographyKey; +import com.l2jserver.service.network.model.Lineage2CryptographyKey; /** * Decrypts encrypted Lineage II packets diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java index 5df8c7580..39786496e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2Encrypter.java @@ -21,7 +21,7 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; -import com.l2jserver.game.net.Lineage2CryptographyKey; +import com.l2jserver.service.network.model.Lineage2CryptographyKey; /** * Encrypts Lineage II packets diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java old mode 100644 new mode 100755 similarity index 100% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameEncoder.java diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java index 390ab271c..c4ffbf21a --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketReader.java @@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.google.inject.Injector; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.ClientPacket; import com.l2jserver.game.net.packet.client.CM_ACTION_USE; import com.l2jserver.game.net.packet.client.CM_ADMIN_COMMAND; import com.l2jserver.game.net.packet.client.CM_AUTH_LOGIN; @@ -56,6 +54,8 @@ import com.l2jserver.game.net.packet.client.CM_LOGOUT; import com.l2jserver.game.net.packet.client.CM_PROTOCOL_VERSION; import com.l2jserver.game.net.packet.client.CM_REQUEST_CHAR_TEMPLATE; import com.l2jserver.game.net.packet.client.CM_RESTART; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.ClientPacket; /** * This decoder reads an frame and decodes the packet in it. Each packet has an diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java index c851786f5..12225669b --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java @@ -24,8 +24,8 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.ServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.ServerPacket; /** * This encoder writes the frame content and encodes the packet in it. Each diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java index e731c1cd5..cf05c74bb --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java @@ -26,9 +26,10 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelHandler; import com.google.common.base.Throwables; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.ClientPacket; +import com.l2jserver.game.net.FreyaLineage2Client; import com.l2jserver.service.network.NettyNetworkService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.ClientPacket; import com.l2jserver.util.html.markup.HtmlTemplate; import com.l2jserver.util.html.markup.MarkupTag; @@ -50,7 +51,7 @@ public class Lineage2PacketHandler extends SimpleChannelHandler { /** * The Lineage 2 connection */ - private Lineage2Client connection; + private FreyaLineage2Client connection; /** * Creates a new instance of the packet handler @@ -69,7 +70,7 @@ public class Lineage2PacketHandler extends SimpleChannelHandler { @Override public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception { - connection = new Lineage2Client(e.getChannel()); + connection = new FreyaLineage2Client(e.getChannel()); connection.getPacketWriter().setConnection(connection); timeoutHandler.setConnection(connection); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2TimeoutHandler.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/handler/Lineage2TimeoutHandler.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2TimeoutHandler.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/handler/Lineage2TimeoutHandler.java index de4e18cfe..0af6f1838 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/handler/Lineage2TimeoutHandler.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/handler/Lineage2TimeoutHandler.java @@ -20,7 +20,7 @@ import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.timeout.IdleStateAwareChannelHandler; import org.jboss.netty.handler.timeout.IdleStateEvent; -import com.l2jserver.game.net.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Client; /** * @author Rogiel diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java index 4af6914d6..831f11c1e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ACTION_USE.java @@ -19,13 +19,13 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.L2Character.CharacterMoveType; import com.l2jserver.service.game.character.CharacterAlreadyRunningServiceException; import com.l2jserver.service.game.character.CharacterAlreadyWalkingServiceException; import com.l2jserver.service.game.character.CharacterService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * This packet notifies the server which character the player has chosen to use. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java index a65e5ed9e..1caa61c3c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java @@ -19,10 +19,10 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.service.ServiceException; import com.l2jserver.service.game.admin.AdministratorService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java index 9221e898a..e71029907 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java @@ -21,14 +21,14 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.Lineage2Session; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.AccountID; import com.l2jserver.model.id.provider.AccountIDProvider; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Session; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java index 69a7caf1a..3cfec1de2 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java @@ -23,8 +23,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.object.NPCID; import com.l2jserver.model.id.object.provider.ObjectIDResolver; @@ -33,6 +31,8 @@ import com.l2jserver.model.world.npc.NPCController.NPCControllerException; import com.l2jserver.service.game.character.CannotSetTargetServiceException; import com.l2jserver.service.game.npc.ActionServiceException; import com.l2jserver.service.game.npc.NPCService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java old mode 100644 new mode 100755 similarity index 82% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java index c23f21d73..c98693b0c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java @@ -19,9 +19,6 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.object.ItemID; import com.l2jserver.model.id.object.NPCID; @@ -30,11 +27,15 @@ import com.l2jserver.model.world.Item; import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.npc.NPCController.NPCControllerException; import com.l2jserver.service.game.character.CannotSetTargetServiceException; +import com.l2jserver.service.game.character.CharacterAction; import com.l2jserver.service.game.item.ItemNotOnGroundServiceException; import com.l2jserver.service.game.item.ItemService; import com.l2jserver.service.game.npc.ActionServiceException; import com.l2jserver.service.game.npc.NPCService; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.geometry.Coordinate; /** @@ -75,47 +76,6 @@ public class CM_CHAR_ACTION extends AbstractClientPacket { */ private CharacterAction action; - /** - * The character action type - * - * @author Rogiel - */ - public enum CharacterAction { - /** - * If the player has clicked with the left mouse button. - */ - CLICK(0), - /** - * If the player has clicked with the right mouse button. - */ - RIGHT_CLICK(1); - - /** - * The action id - */ - public final int id; - - /** - * @param id - * the action id - */ - CharacterAction(int id) { - this.id = id; - } - - /** - * @param id - * the action id - * @return the {@link CharacterAction} represented by id - */ - public static CharacterAction fromID(int id) { - for (final CharacterAction action : values()) - if (action.id == id) - return action; - return null; - } - } - /** * @param idResolver the id resolver * @param npcService the npc service diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java index ab597a7a7..57b1a9b3d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java @@ -19,10 +19,10 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.service.game.spawn.CharacterNotTeleportingServiceException; import com.l2jserver.service.game.spawn.SpawnService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Completes the creation of an character. Creates the object, inserts into the diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java index 1ebc6015d..21ff1ca73 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java @@ -21,8 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.object.ActorID; @@ -33,6 +31,8 @@ import com.l2jserver.service.game.character.ActorIsNotAttackableServiceException import com.l2jserver.service.game.character.CannotSetTargetServiceException; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.npc.NotAttackableNPCServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.geometry.Coordinate; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java index 69970a951..e7a41846f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java @@ -19,9 +19,6 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_ACTION_FAILED; import com.l2jserver.service.game.chat.CannotChatToSelfChatServiceException; import com.l2jserver.service.game.chat.ChatBanActiveChatServiceException; @@ -29,6 +26,9 @@ import com.l2jserver.service.game.chat.ChatMessageType; import com.l2jserver.service.game.chat.ChatService; import com.l2jserver.service.game.chat.ChatTargetOfflineServiceException; import com.l2jserver.service.game.chat.TargetNotFoundChatServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java index 4286e1c4c..3d989831d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java @@ -25,8 +25,6 @@ import static com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL.Reason.RE import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_OK; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.template.character.CharacterClass; @@ -43,6 +41,8 @@ import com.l2jserver.service.game.character.CharacterInvalidSexException; import com.l2jserver.service.game.character.CharacterNameAlreadyExistsException; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.character.TooManyCharactersException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java index a2afb0618..8ffd7de5c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java @@ -21,11 +21,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_STOP; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.game.character.CharacterService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.geometry.Coordinate; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java old mode 100644 new mode 100755 similarity index 90% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java index 91829039e..27feb8fae --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_OPEN_MAP; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Executes an bypass command diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java index ab096a967..761dcbbce --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java @@ -19,9 +19,9 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.service.game.character.CharacterService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.geometry.Point3D; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java index 7a5088fd3..bdfeaf66d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_REQ_INVENTORY.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_INVENTORY; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Completes the creation of an character. Creates the object, inserts into the diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java index 0cb084b5f..d513fbe15 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java @@ -21,11 +21,11 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_SELECTED; import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * This packet notifies the server which character the player has chosen to use. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_CREATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_CREATE.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_CREATE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_CREATE.java index 2e110a8fb..d796481af --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_CREATE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_CREATE.java @@ -19,8 +19,6 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.game.CharacterShortcut.ShortcutActorType; import com.l2jserver.model.game.CharacterShortcut.ShortcutType; import com.l2jserver.model.id.object.ItemID; @@ -29,6 +27,8 @@ import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.game.character.ShortcutService; import com.l2jserver.service.game.character.ShortcutSlotNotFreeServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Completes the creation of an character. Creates the object, inserts into the diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_REMOVE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_REMOVE.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_REMOVE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_REMOVE.java index 8612212d9..e4d4648dd --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_REMOVE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SHORTCUT_REMOVE.java @@ -19,10 +19,10 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.service.game.character.ShortcutService; import com.l2jserver.service.game.character.ShortcutSlotEmptyServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Completes the creation of an character. Creates the object, inserts into the diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_TARGET_UNSELECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_TARGET_UNSELECT.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_TARGET_UNSELECT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_TARGET_UNSELECT.java index ba375121c..cd28a1eb1 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_TARGET_UNSELECT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_TARGET_UNSELECT.java @@ -19,11 +19,11 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.service.game.character.CannotSetTargetServiceException; import com.l2jserver.service.game.character.CharacterService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * This packet cancels the target selection diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java index 256a98214..67b63a03c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java @@ -21,12 +21,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.spawn.AlreadySpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * The client is requesting a logout. Currently, when this packet is received diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java index 27042d90f..c6cdd64de --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_ALL_FORTRESS_INFO.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_FORT_INFO; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * The client is requesting the manor list. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java old mode 100644 new mode 100755 similarity index 90% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java index 49156eeeb..c0e826251 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_KEY_MAPPING.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * The client is requesting a the key mappings. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java index 8dcceec97..69674c64c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_MANOR_LIST; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * The client is requesting the manor list. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java index d2760fe61..9a1df84bc --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java @@ -21,9 +21,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.service.network.gameguard.GameGuardService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * The client is requesting a logout. Currently, when this packet is received diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java index f3ae98441..bc3946627 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java @@ -21,11 +21,11 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Requests the list of characters to be displayed in the lobby. The list of diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java index cce0d8aff..8d613df0f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java @@ -19,15 +19,15 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.id.object.ItemID; import com.l2jserver.model.id.object.provider.ItemIDProvider; import com.l2jserver.model.world.Item; import com.l2jserver.service.game.item.ItemService; import com.l2jserver.service.game.item.NonStackableItemsServiceException; import com.l2jserver.service.game.item.NotEnoughItemsServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * This packet drops items on the ground. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java index b1f20303a..fb474f2e8 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java @@ -19,9 +19,6 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.model.id.object.ItemID; import com.l2jserver.model.id.object.provider.ItemIDProvider; import com.l2jserver.model.world.Item; @@ -31,6 +28,9 @@ import com.l2jserver.service.game.item.NonStackableItemsServiceException; import com.l2jserver.service.game.item.NotEnoughItemsServiceException; import com.l2jserver.service.game.spawn.AlreadySpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; import com.l2jserver.util.geometry.Point3D; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java index fabf62106..ae22273bd --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java @@ -20,8 +20,8 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * The client is requesting a logout. Currently, when this packet is received diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java old mode 100644 new mode 100755 similarity index 87% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java index c92839116..604e4dc35 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java @@ -24,12 +24,13 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.l2jserver.L2JConstant; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.Lineage2CryptographyKey; -import com.l2jserver.game.net.ProtocolVersion; -import com.l2jserver.game.net.packet.AbstractClientPacket; +import com.l2jserver.game.net.FreyaLineage2Client; import com.l2jserver.game.net.packet.server.SM_KEY; import com.l2jserver.service.network.keygen.BlowfishKeygenService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2CryptographyKey; +import com.l2jserver.service.network.model.ProtocolVersion; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * In this packet the client is informing its protocol version. It is possible @@ -83,8 +84,10 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket { // generate a new key final Lineage2CryptographyKey inKey = new Lineage2CryptographyKey( keygen.generate()); + + final FreyaLineage2Client client = (FreyaLineage2Client) conn; - conn.getDecrypter().enable(inKey); + client.getDecrypter().enable(inKey); final Lineage2CryptographyKey outKey = inKey.copy(); log.debug("Decrypter has been enabled"); @@ -113,8 +116,8 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket { throws Exception { log.debug("Encrypter has been enabled"); // enable encrypter - conn.getEncrypter().setKey(outKey); - conn.getEncrypter().setEnabled(true); + client.getEncrypter().setKey(outKey); + client.getEncrypter().setEnabled(true); } }); } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java index 9d8771860..90e41a3c1 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java @@ -21,13 +21,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_TEMPLATE; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; import com.l2jserver.model.template.CharacterTemplate; import com.l2jserver.model.template.character.CharacterClass; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Requests the creation of a new Character. The list of character templates is diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java index e0e8368ab..0b4a91d78 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java @@ -19,13 +19,13 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; import com.l2jserver.game.net.packet.server.SM_CHAR_RESTART; import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractClientPacket; /** * Requests the list of characters to be displayed in the lobby. The list of diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java index efb18487c..dae4152dd --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTION_FAILED.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet responds to the Restart request diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java index 1395aa123..5db0cef87 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_ATTACK.java @@ -21,10 +21,10 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.server.AttackHit; import com.l2jserver.model.world.Actor; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.factory.CollectionFactory; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java index 8881897a7..3ed260050 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java @@ -18,11 +18,11 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.game.chat.ChatMessageType; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_DIE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_DIE.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_DIE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_DIE.java index d31f59ad7..ead169c47 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_DIE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_DIE.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.server.AttackHit; import com.l2jserver.model.world.Actor; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet informs the client of an attack issued diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java index 928648135..e679ddde6 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Actor; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.geometry.Coordinate; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java index 63d13a0c2..75c948d27 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Actor; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet notifies the client that the chosen character has been diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_STATUS_UPDATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_STATUS_UPDATE.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_STATUS_UPDATE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_STATUS_UPDATE.java index c0ae6d17f..f1ee9c9bd --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_STATUS_UPDATE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_STATUS_UPDATE.java @@ -21,9 +21,9 @@ import java.util.Map.Entry; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Actor; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.factory.CollectionFactory; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java index 7ca89ab9b..5545cc924 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_FAIL.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * An packet informing that the character could not be created. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java index 679cc28cb..0ca302d24 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_CREATE_OK.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * An packet informing that the character was created with success. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_ENTER_WORLD.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_ENTER_WORLD.java old mode 100644 new mode 100755 similarity index 96% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_ENTER_WORLD.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_ENTER_WORLD.java index fcdf19ae0..b6702b760 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_ENTER_WORLD.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_ENTER_WORLD.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.ActorExperience; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java old mode 100644 new mode 100755 similarity index 99% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java index e5a853cd7..b1f30ca92 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java @@ -44,13 +44,13 @@ import static com.l2jserver.model.world.character.CharacterInventory.InventoryPa import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.ActorExperience; import com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java index 35cef5702..9dbbb647a --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_BROADCAST.java @@ -39,13 +39,13 @@ import static com.l2jserver.model.world.character.CharacterInventory.InventoryPa import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.L2Character.CharacterMoveType; import com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java index 78381469c..2cb948568 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This is an message informing the client of extra informations from a player diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java index ee9e188ff..7bf9efc4a --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java @@ -18,11 +18,11 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.character.CharacterInventory; import com.l2jserver.model.world.character.CharacterInventory.ItemLocation; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet send the inventory to the client diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY_UPDATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY_UPDATE.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY_UPDATE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY_UPDATE.java index 1d6618d85..8164ea657 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY_UPDATE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY_UPDATE.java @@ -21,10 +21,10 @@ import java.util.Map.Entry; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.character.CharacterInventory.ItemLocation; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.factory.CollectionFactory; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java index 32858d26b..5e5c2744e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_LIST.java @@ -16,7 +16,6 @@ */ package com.l2jserver.game.net.packet.server; -import static com.l2jserver.game.net.ProtocolVersion.FREYA; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.BELT; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.CHEST; import static com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll.CLOAK; @@ -46,12 +45,12 @@ import java.util.Collection; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.Lineage2Session; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.character.CharacterInventory.InventoryPaperdoll; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2Session; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** @@ -232,15 +231,13 @@ public class SM_CHAR_LIST extends AbstractServerPacket { buffer.writeInt(0x00); // Freya by Vistall: - if (conn.supports(FREYA)) { - // npdid - 16024 Tame Tiny Baby Kookaburra - buffer.writeInt(16024); // A9E89C - buffer.writeInt(0); // level - buffer.writeInt(0); // ? - buffer.writeInt(0); // food? - 1200 - buffer.writeDouble(0); // max Hp - buffer.writeDouble(0); // cur Hp - } + // npdid - 16024 Tame Tiny Baby Kookaburra + buffer.writeInt(16024); // A9E89C + buffer.writeInt(0); // level + buffer.writeInt(0); // ? + buffer.writeInt(0); // food? - 1200 + buffer.writeDouble(0); // max Hp + buffer.writeDouble(0); // cur Hp } } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java index da77b6c97..bb808c36f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet updates the movement type diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java old mode 100644 new mode 100755 similarity index 91% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java index dfcf9de94..f668aad2c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * An packet authorizing the client to open the map diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java index 64c185cf0..e88c4255f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_RESTART.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet responds to the Restart request diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java index 3eacefdb7..8f4cce1c8 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.actor.ActorExperience; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_LIST.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_LIST.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_LIST.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_LIST.java index 9e4851478..f4d382aa5 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_LIST.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_LIST.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.game.CharacterShortcut; import com.l2jserver.model.world.character.CharacterShortcutContainer; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet sends to the client his shortcut list diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_REGISTER.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_REGISTER.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_REGISTER.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_REGISTER.java index 741b24372..06b8cfcaa --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_REGISTER.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SHORTCUT_REGISTER.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.game.CharacterShortcut; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet informs the client that a new shortcut has been created diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java index 19f6e5111..34cab75b8 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * An packet that sends all character templates to the client. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET.java index 1bffb16ce..cb60e4278 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Actor; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet notifies the client that the chosen character has been diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java index fdb9e2a52..3f7370b49 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet notifies the client that the chosen character has been diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java index 1543a3110..0db79584f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.geometry.Point3D; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java old mode 100644 new mode 100755 similarity index 94% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java index 8173bfc54..dc9ef6ea4 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TEMPLATE.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.template.CharacterTemplate; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * An packet that sends all character templates to the client. diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java index 3fde27956..18b679b1d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java @@ -19,8 +19,8 @@ package com.l2jserver.game.net.packet.server; import org.htmlparser.tags.Html; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; import com.l2jserver.util.html.markup.HtmlTemplate; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java index afb546bc8..90515570f --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_FORT_INFO.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java index 5b6af68a8..1c01a879c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_GG_QUERY.java @@ -19,8 +19,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; import com.google.common.base.Preconditions; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet send the GameGuard query to the client. The client will send an diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java index 0279f6b76..823432492 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_HTML.java @@ -19,9 +19,9 @@ package com.l2jserver.game.net.packet.server; import org.htmlparser.tags.Html; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.NPC; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; import com.l2jserver.util.html.markup.HtmlTemplate; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java index 77b750763..df160af47 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.Item; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet sends an item that is dropped on the ground diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_PICK.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_PICK.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_PICK.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_PICK.java index 6938a321d..f76ce18e2 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_PICK.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_PICK.java @@ -18,11 +18,11 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.server.AttackHit; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet makes an character pick up an item diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java old mode 100644 new mode 100755 similarity index 93% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java index fc823abf8..bd09dde0c --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_KEY.java @@ -20,9 +20,9 @@ import java.util.Arrays; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.Lineage2CryptographyKey; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.Lineage2CryptographyKey; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet send the encryptation keys for the client. After this message all diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java index c827b369f..42cfa6257 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java @@ -18,8 +18,8 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java index 13f29c4c9..2287e2998 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.NPC; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java old mode 100644 new mode 100755 similarity index 92% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java index 323936b50..3f6f0ef9e --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_OBJECT_REMOVE.java @@ -18,9 +18,9 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.world.PositionableObject; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; /** * This packet informs the client that an certain object has disappeared from diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java old mode 100644 new mode 100755 similarity index 95% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java index 5d545ed0d..2e4c5fc5d --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java @@ -18,10 +18,10 @@ package com.l2jserver.game.net.packet.server; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.NPC; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; /** diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java index 5d20698e1..f279a1582 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SYSTEM_MESSAGE.java @@ -20,9 +20,6 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; -import com.l2jserver.game.net.packet.AbstractServerPacket; import com.l2jserver.model.game.Castle; import com.l2jserver.model.game.Fort; import com.l2jserver.model.game.Skill; @@ -31,6 +28,9 @@ import com.l2jserver.model.template.SkillTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Item; import com.l2jserver.model.world.NPC; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; +import com.l2jserver.service.network.model.packet.AbstractServerPacket; import com.l2jserver.util.BufferUtils; import com.l2jserver.util.factory.CollectionFactory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/NettyNetworkService.java old mode 100644 new mode 100755 similarity index 97% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/NettyNetworkService.java index 812406501..8c12dbd02 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NettyNetworkService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/NettyNetworkService.java @@ -35,9 +35,7 @@ import com.google.common.base.Preconditions; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; -import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.Lineage2PipelineFactory; -import com.l2jserver.game.net.packet.ServerPacket; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.service.AbstractConfigurableService; import com.l2jserver.service.AbstractService.Depends; @@ -47,6 +45,8 @@ import com.l2jserver.service.core.threading.ThreadPoolPriority; import com.l2jserver.service.core.threading.ThreadService; import com.l2jserver.service.game.world.WorldService; import com.l2jserver.service.network.keygen.BlowfishKeygenService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.packet.ServerPacket; import com.l2jserver.util.ThreadPoolUtils; import com.l2jserver.util.factory.CollectionFactory; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java old mode 100644 new mode 100755 similarity index 99% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java index 3ab01d4a4..bb940979b --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java @@ -21,8 +21,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; -import com.l2jserver.game.net.SystemMessage; import com.l2jserver.game.net.packet.server.SM_ACTOR_ATTACK; import com.l2jserver.game.net.packet.server.SM_ACTOR_CHAT; import com.l2jserver.game.net.packet.server.SM_ACTOR_DIE; @@ -86,6 +84,8 @@ import com.l2jserver.service.game.world.event.WorldListener; import com.l2jserver.service.game.world.filter.impl.KnownListFilter; import com.l2jserver.service.game.world.filter.impl.KnownListUpdateFilter; import com.l2jserver.service.network.NetworkService; +import com.l2jserver.service.network.model.Lineage2Client; +import com.l2jserver.service.network.model.SystemMessage; import com.l2jserver.util.geometry.Point3D; /** diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java new file mode 100755 index 000000000..736436c3f --- /dev/null +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java @@ -0,0 +1,67 @@ +/* + * This file is part of l2jserver2 . + * + * l2jserver2 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. + * + * l2jserver2 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 l2jserver2. If not, see . + */ +package com.l2jserver.service.network.gameguard; + +import java.util.concurrent.Future; + +import com.l2jserver.model.world.L2Character; +import com.l2jserver.service.Service; +import com.l2jserver.service.network.model.Lineage2Client; + +/** + * This service is responsible for querying and validating GameGuard packets + * + * @author Rogiel + */ +public interface GameGuardService extends Service { + /** + * Queries the client GameGuard for an response + * + * @param character + * the lineage 2 character + * @return an future that will be used to obtain validation status + */ + Future query(L2Character character); + + /** + * The Game guard key state + * + * @author Rogiel + */ + public enum GameGuardResponse { + /** + * Key is valid + */ + VALID, + /** + * Key is not valid + */ + INVALID; + } + + /** + * Sets the game guard key for the given connection. Future will be notified + * of the key state (valid or invalid). + * + * @param conn + * the connection + * @param key + * the key + * @return the validation state + */ + GameGuardResponse key(Lineage2Client conn, byte[] key); +} diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java old mode 100644 new mode 100755 similarity index 98% rename from l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java rename to l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java index f27f4721a..425d8e1a0 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java @@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory; import com.google.common.util.concurrent.AbstractFuture; import com.google.inject.Inject; -import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.server.SM_GG_QUERY; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.AbstractService; @@ -37,6 +36,7 @@ import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStopException; import com.l2jserver.service.game.chat.ChatService; import com.l2jserver.service.network.NetworkService; +import com.l2jserver.service.network.model.Lineage2Client; import com.l2jserver.util.factory.CollectionFactory; /** diff --git a/l2jserver2-gameserver/pom.xml b/l2jserver2-gameserver/pom.xml index 6cfc0ce47..3a395e755 100644 --- a/l2jserver2-gameserver/pom.xml +++ b/l2jserver2-gameserver/pom.xml @@ -8,11 +8,17 @@ .. l2jserver2-gameserver + pom L2JServer 2 game server This game server is responsible for communicating the game client with the game virtual world. It provides data storage and processing along with broadcasting positioning data to other connected clients. 2011 - + + + l2jserver2-gameserver-core + l2jserver2-gameserver-freya + + @@ -21,90 +27,9 @@ src/main/assembly/distribution-pack-data.xml - src/main/assembly/distribution-mysql5-bin.xml - src/main/assembly/distribution-orientdb-bin.xml - src/main/assembly/distribution-h2-bin.xml - src/main/assembly/distribution-derby-bin.xml - src/main/assembly/distribution-src.xml - - - org.apache.maven.plugins - maven-deploy-plugin - - ${project.artifactId} - mysql5-bin - zip - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - libs/ - com.l2jserver.L2JGameServerMain - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - src/main/generated - - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - generate-sources - - generate - - - - - org.jvnet.jaxb2_commons - jaxb2-basics - 0.5.3 - - - - - -extension - -Xinheritance - - data/template - - *.xsd - - src/main/generated - com.l2jserver.model.template - - - - diff --git a/l2jserver2-gameserver/src/main/generated/META-INF/sun-jaxb.episode b/l2jserver2-gameserver/src/main/generated/META-INF/sun-jaxb.episode index dcd7b06c0..bd027847c 100644 --- a/l2jserver2-gameserver/src/main/generated/META-INF/sun-jaxb.episode +++ b/l2jserver2-gameserver/src/main/generated/META-INF/sun-jaxb.episode @@ -2,26 +2,16 @@ - - - - - - - - - - - - - + + + @@ -38,26 +28,26 @@ Generated on: 2012.01.19 at 03:37:11 PM BRST + + + + + + + + - + + + - - - - - - - - - - - - - + + + @@ -65,5 +55,29 @@ Generated on: 2012.01.19 at 03:37:11 PM BRST + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java index 479214f8f..137b579bb 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java @@ -1,48 +1,48 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for AbstractTemplate complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="AbstractTemplate">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AbstractTemplate") -@XmlSeeAlso({ - ItemTemplate.class, - ActorTemplate.class, - SkillTemplate.class, - com.l2jserver.model.template.Teleports.Teleport.class -}) -public abstract class AbstractTemplate - implements Template -{ - - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for AbstractTemplate complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="AbstractTemplate">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AbstractTemplate") +@XmlSeeAlso({ + ItemTemplate.class, + ActorTemplate.class, + SkillTemplate.class, + com.l2jserver.model.template.Teleports.Teleport.class +}) +public abstract class AbstractTemplate + implements Template +{ + + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ActorTemplate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ActorTemplate.java index 560a28705..ea1528703 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ActorTemplate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ActorTemplate.java @@ -1,44 +1,44 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for ActorTemplate complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="ActorTemplate">
- *   <complexContent>
- *     <extension base="{}AbstractTemplate">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ActorTemplate") -@XmlSeeAlso({ - CharacterTemplate.class, - NPCTemplate.class -}) -public abstract class ActorTemplate - extends AbstractTemplate -{ - - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for ActorTemplate complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="ActorTemplate">
+ *   <complexContent>
+ *     <extension base="{}AbstractTemplate">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ActorTemplate") +@XmlSeeAlso({ + CharacterTemplate.class, + NPCTemplate.class +}) +public abstract class ActorTemplate + extends AbstractTemplate +{ + + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java index a6275ac77..809cd3852 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java @@ -1,148 +1,148 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for CalculatorFunction complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="CalculatorFunction">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="set" type="{}CalculatorFunctionOperation" minOccurs="0"/>
- *         <element name="add" type="{}CalculatorFunctionOperation" minOccurs="0"/>
- *         <element name="subtract" type="{}CalculatorFunctionOperation" minOccurs="0"/>
- *         <element name="random" type="{}CalculatorFunctionOperation" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CalculatorFunction", propOrder = { - "set", - "add", - "subtract", - "random" -}) -public class CalculatorFunction { - - protected CalculatorFunctionOperation set; - protected CalculatorFunctionOperation add; - protected CalculatorFunctionOperation subtract; - protected CalculatorFunctionOperation random; - - /** - * Gets the value of the set property. - * - * @return - * possible object is - * {@link CalculatorFunctionOperation } - * - */ - public CalculatorFunctionOperation getSet() { - return set; - } - - /** - * Sets the value of the set property. - * - * @param value - * allowed object is - * {@link CalculatorFunctionOperation } - * - */ - public void setSet(CalculatorFunctionOperation value) { - this.set = value; - } - - /** - * Gets the value of the add property. - * - * @return - * possible object is - * {@link CalculatorFunctionOperation } - * - */ - public CalculatorFunctionOperation getAdd() { - return add; - } - - /** - * Sets the value of the add property. - * - * @param value - * allowed object is - * {@link CalculatorFunctionOperation } - * - */ - public void setAdd(CalculatorFunctionOperation value) { - this.add = value; - } - - /** - * Gets the value of the subtract property. - * - * @return - * possible object is - * {@link CalculatorFunctionOperation } - * - */ - public CalculatorFunctionOperation getSubtract() { - return subtract; - } - - /** - * Sets the value of the subtract property. - * - * @param value - * allowed object is - * {@link CalculatorFunctionOperation } - * - */ - public void setSubtract(CalculatorFunctionOperation value) { - this.subtract = value; - } - - /** - * Gets the value of the random property. - * - * @return - * possible object is - * {@link CalculatorFunctionOperation } - * - */ - public CalculatorFunctionOperation getRandom() { - return random; - } - - /** - * Sets the value of the random property. - * - * @param value - * allowed object is - * {@link CalculatorFunctionOperation } - * - */ - public void setRandom(CalculatorFunctionOperation value) { - this.random = value; - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for CalculatorFunction complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="CalculatorFunction">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="set" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         <element name="add" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         <element name="subtract" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         <element name="random" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "CalculatorFunction", propOrder = { + "set", + "add", + "subtract", + "random" +}) +public class CalculatorFunction { + + protected CalculatorFunctionOperation set; + protected CalculatorFunctionOperation add; + protected CalculatorFunctionOperation subtract; + protected CalculatorFunctionOperation random; + + /** + * Gets the value of the set property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getSet() { + return set; + } + + /** + * Sets the value of the set property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setSet(CalculatorFunctionOperation value) { + this.set = value; + } + + /** + * Gets the value of the add property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setAdd(CalculatorFunctionOperation value) { + this.add = value; + } + + /** + * Gets the value of the subtract property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getSubtract() { + return subtract; + } + + /** + * Sets the value of the subtract property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setSubtract(CalculatorFunctionOperation value) { + this.subtract = value; + } + + /** + * Gets the value of the random property. + * + * @return + * possible object is + * {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation getRandom() { + return random; + } + + /** + * Sets the value of the random property. + * + * @param value + * allowed object is + * {@link CalculatorFunctionOperation } + * + */ + public void setRandom(CalculatorFunctionOperation value) { + this.random = value; + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java index 63d81b5bb..350f4be89 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java @@ -1,85 +1,85 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for CalculatorFunctionOperation complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="CalculatorFunctionOperation">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CalculatorFunctionOperation") -public class CalculatorFunctionOperation { - - @XmlAttribute(name = "order", required = true) - protected BigInteger order; - @XmlAttribute(name = "value", required = true) - protected double value; - - /** - * Gets the value of the order property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getOrder() { - return order; - } - - /** - * Sets the value of the order property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setOrder(BigInteger value) { - this.order = value; - } - - /** - * Gets the value of the value property. - * - */ - public double getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(double value) { - this.value = value; - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for CalculatorFunctionOperation complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="CalculatorFunctionOperation">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "CalculatorFunctionOperation") +public class CalculatorFunctionOperation { + + @XmlAttribute(name = "order", required = true) + protected BigInteger order; + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the order property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getOrder() { + return order; + } + + /** + * Sets the value of the order property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setOrder(BigInteger value) { + this.order = value; + } + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java index 4322389ea..397dd80c8 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java @@ -1,1894 +1,1894 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.l2jserver.model.id.template.CharacterTemplateID; -import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter; - - -/** - *

Java class for character element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="character">
- *   <complexType>
- *     <complexContent>
- *       <extension base="{}ActorTemplate">
- *         <sequence>
- *           <element name="stats">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="hp">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="mp">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="cp">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="attack">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                               <element name="physical">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="magical">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                             </sequence>
- *                             <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="defense">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                               <element name="physical">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="magical">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                             </sequence>
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="move">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="base">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *                   </sequence>
- *                   <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                   <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="collision">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="male">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="female">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *         </sequence>
- *         <attribute name="class" use="required" type="{http://schemas.l2jserver2.com/character}CharacterTemplateID" />
- *       </extension>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "stats", - "collision" -}) -@XmlRootElement(name = "character", namespace = "http://schemas.l2jserver2.com/character") -public class CharacterTemplate - extends ActorTemplate -{ - - @XmlElement(required = true) - protected CharacterTemplate.Stats stats; - @XmlElement(required = true) - protected CharacterTemplate.Collision collision; - @XmlAttribute(name = "class", required = true) - @XmlJavaTypeAdapter(CharacterTemplateIDAdapter.class) - protected CharacterTemplateID id; - - /** - * Gets the value of the stats property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats } - * - */ - public CharacterTemplate.Stats getStats() { - return stats; - } - - /** - * Sets the value of the stats property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats } - * - */ - public void setStats(CharacterTemplate.Stats value) { - this.stats = value; - } - - /** - * Gets the value of the collision property. - * - * @return - * possible object is - * {@link CharacterTemplate.Collision } - * - */ - public CharacterTemplate.Collision getCollision() { - return collision; - } - - /** - * Sets the value of the collision property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Collision } - * - */ - public void setCollision(CharacterTemplate.Collision value) { - this.collision = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public CharacterTemplateID getID() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setID(CharacterTemplateID value) { - this.id = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="male">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="female">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "male", - "female" - }) - public static class Collision { - - @XmlElement(required = true) - protected CharacterTemplate.Collision.Male male; - @XmlElement(required = true) - protected CharacterTemplate.Collision.Female female; - - /** - * Gets the value of the male property. - * - * @return - * possible object is - * {@link CharacterTemplate.Collision.Male } - * - */ - public CharacterTemplate.Collision.Male getMale() { - return male; - } - - /** - * Sets the value of the male property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Collision.Male } - * - */ - public void setMale(CharacterTemplate.Collision.Male value) { - this.male = value; - } - - /** - * Gets the value of the female property. - * - * @return - * possible object is - * {@link CharacterTemplate.Collision.Female } - * - */ - public CharacterTemplate.Collision.Female getFemale() { - return female; - } - - /** - * Sets the value of the female property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Collision.Female } - * - */ - public void setFemale(CharacterTemplate.Collision.Female value) { - this.female = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Female { - - @XmlAttribute(name = "radius", required = true) - protected double radius; - @XmlAttribute(name = "heigth", required = true) - protected double heigth; - - /** - * Gets the value of the radius property. - * - */ - public double getRadius() { - return radius; - } - - /** - * Sets the value of the radius property. - * - */ - public void setRadius(double value) { - this.radius = value; - } - - /** - * Gets the value of the heigth property. - * - */ - public double getHeigth() { - return heigth; - } - - /** - * Sets the value of the heigth property. - * - */ - public void setHeigth(double value) { - this.heigth = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Male { - - @XmlAttribute(name = "radius", required = true) - protected double radius; - @XmlAttribute(name = "heigth", required = true) - protected double heigth; - - /** - * Gets the value of the radius property. - * - */ - public double getRadius() { - return radius; - } - - /** - * Sets the value of the radius property. - * - */ - public void setRadius(double value) { - this.radius = value; - } - - /** - * Gets the value of the heigth property. - * - */ - public double getHeigth() { - return heigth; - } - - /** - * Sets the value of the heigth property. - * - */ - public void setHeigth(double value) { - this.heigth = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="hp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="mp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="cp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="attack">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="physical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="magical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="defense">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="physical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="magical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="move">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="base">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *       </sequence>
-     *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "hp", - "mp", - "cp", - "attack", - "defense", - "move", - "base", - "maxload" - }) - public static class Stats { - - @XmlElement(required = true) - protected CharacterTemplate.Stats.Hp hp; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Mp mp; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Cp cp; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Attack attack; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Defense defense; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Move move; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Base base; - protected int maxload; - @XmlAttribute(name = "level", required = true) - protected int level; - @XmlAttribute(name = "crafter", required = true) - protected boolean crafter; - - /** - * Gets the value of the hp property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Hp } - * - */ - public CharacterTemplate.Stats.Hp getHp() { - return hp; - } - - /** - * Sets the value of the hp property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Hp } - * - */ - public void setHp(CharacterTemplate.Stats.Hp value) { - this.hp = value; - } - - /** - * Gets the value of the mp property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Mp } - * - */ - public CharacterTemplate.Stats.Mp getMp() { - return mp; - } - - /** - * Sets the value of the mp property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Mp } - * - */ - public void setMp(CharacterTemplate.Stats.Mp value) { - this.mp = value; - } - - /** - * Gets the value of the cp property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Cp } - * - */ - public CharacterTemplate.Stats.Cp getCp() { - return cp; - } - - /** - * Sets the value of the cp property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Cp } - * - */ - public void setCp(CharacterTemplate.Stats.Cp value) { - this.cp = value; - } - - /** - * Gets the value of the attack property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Attack } - * - */ - public CharacterTemplate.Stats.Attack getAttack() { - return attack; - } - - /** - * Sets the value of the attack property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Attack } - * - */ - public void setAttack(CharacterTemplate.Stats.Attack value) { - this.attack = value; - } - - /** - * Gets the value of the defense property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Defense } - * - */ - public CharacterTemplate.Stats.Defense getDefense() { - return defense; - } - - /** - * Sets the value of the defense property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Defense } - * - */ - public void setDefense(CharacterTemplate.Stats.Defense value) { - this.defense = value; - } - - /** - * Gets the value of the move property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Move } - * - */ - public CharacterTemplate.Stats.Move getMove() { - return move; - } - - /** - * Sets the value of the move property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Move } - * - */ - public void setMove(CharacterTemplate.Stats.Move value) { - this.move = value; - } - - /** - * Gets the value of the base property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Base } - * - */ - public CharacterTemplate.Stats.Base getBase() { - return base; - } - - /** - * Sets the value of the base property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Base } - * - */ - public void setBase(CharacterTemplate.Stats.Base value) { - this.base = value; - } - - /** - * Gets the value of the maxload property. - * - */ - public int getMaxload() { - return maxload; - } - - /** - * Sets the value of the maxload property. - * - */ - public void setMaxload(int value) { - this.maxload = value; - } - - /** - * Gets the value of the level property. - * - */ - public int getLevel() { - return level; - } - - /** - * Sets the value of the level property. - * - */ - public void setLevel(int value) { - this.level = value; - } - - /** - * Gets the value of the crafter property. - * - */ - public boolean isCrafter() { - return crafter; - } - - /** - * Sets the value of the crafter property. - * - */ - public void setCrafter(boolean value) { - this.crafter = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="physical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="magical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "physical", - "magical" - }) - public static class Attack { - - @XmlElement(required = true) - protected CharacterTemplate.Stats.Attack.Physical physical; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Attack.Magical magical; - @XmlAttribute(name = "evasion", required = true) - protected int evasion; - @XmlAttribute(name = "critical", required = true) - protected int critical; - @XmlAttribute(name = "accuracy", required = true) - protected int accuracy; - - /** - * Gets the value of the physical property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Attack.Physical } - * - */ - public CharacterTemplate.Stats.Attack.Physical getPhysical() { - return physical; - } - - /** - * Sets the value of the physical property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Attack.Physical } - * - */ - public void setPhysical(CharacterTemplate.Stats.Attack.Physical value) { - this.physical = value; - } - - /** - * Gets the value of the magical property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Attack.Magical } - * - */ - public CharacterTemplate.Stats.Attack.Magical getMagical() { - return magical; - } - - /** - * Sets the value of the magical property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Attack.Magical } - * - */ - public void setMagical(CharacterTemplate.Stats.Attack.Magical value) { - this.magical = value; - } - - /** - * Gets the value of the evasion property. - * - */ - public int getEvasion() { - return evasion; - } - - /** - * Sets the value of the evasion property. - * - */ - public void setEvasion(int value) { - this.evasion = value; - } - - /** - * Gets the value of the critical property. - * - */ - public int getCritical() { - return critical; - } - - /** - * Sets the value of the critical property. - * - */ - public void setCritical(int value) { - this.critical = value; - } - - /** - * Gets the value of the accuracy property. - * - */ - public int getAccuracy() { - return accuracy; - } - - /** - * Sets the value of the accuracy property. - * - */ - public void setAccuracy(int value) { - this.accuracy = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Magical { - - @XmlAttribute(name = "damage", required = true) - protected double damage; - @XmlAttribute(name = "speed", required = true) - protected double speed; - - /** - * Gets the value of the damage property. - * - */ - public double getDamage() { - return damage; - } - - /** - * Sets the value of the damage property. - * - */ - public void setDamage(double value) { - this.damage = value; - } - - /** - * Gets the value of the speed property. - * - */ - public double getSpeed() { - return speed; - } - - /** - * Sets the value of the speed property. - * - */ - public void setSpeed(double value) { - this.speed = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Physical { - - @XmlAttribute(name = "damage", required = true) - protected double damage; - @XmlAttribute(name = "speed", required = true) - protected double speed; - - /** - * Gets the value of the damage property. - * - */ - public double getDamage() { - return damage; - } - - /** - * Sets the value of the damage property. - * - */ - public void setDamage(double value) { - this.damage = value; - } - - /** - * Gets the value of the speed property. - * - */ - public double getSpeed() { - return speed; - } - - /** - * Sets the value of the speed property. - * - */ - public void setSpeed(double value) { - this.speed = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Base { - - @XmlAttribute(name = "int", required = true) - protected int _int; - @XmlAttribute(name = "str", required = true) - protected int str; - @XmlAttribute(name = "con", required = true) - protected int con; - @XmlAttribute(name = "men", required = true) - protected int men; - @XmlAttribute(name = "dex", required = true) - protected int dex; - @XmlAttribute(name = "wit", required = true) - protected int wit; - - /** - * Gets the value of the int property. - * - */ - public int getInt() { - return _int; - } - - /** - * Sets the value of the int property. - * - */ - public void setInt(int value) { - this._int = value; - } - - /** - * Gets the value of the str property. - * - */ - public int getStr() { - return str; - } - - /** - * Sets the value of the str property. - * - */ - public void setStr(int value) { - this.str = value; - } - - /** - * Gets the value of the con property. - * - */ - public int getCon() { - return con; - } - - /** - * Sets the value of the con property. - * - */ - public void setCon(int value) { - this.con = value; - } - - /** - * Gets the value of the men property. - * - */ - public int getMen() { - return men; - } - - /** - * Sets the value of the men property. - * - */ - public void setMen(int value) { - this.men = value; - } - - /** - * Gets the value of the dex property. - * - */ - public int getDex() { - return dex; - } - - /** - * Sets the value of the dex property. - * - */ - public void setDex(int value) { - this.dex = value; - } - - /** - * Gets the value of the wit property. - * - */ - public int getWit() { - return wit; - } - - /** - * Sets the value of the wit property. - * - */ - public void setWit(int value) { - this.wit = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Cp { - - @XmlAttribute(name = "base", required = true) - protected double base; - @XmlAttribute(name = "modifier", required = true) - protected double modifier; - @XmlAttribute(name = "add", required = true) - protected double add; - - /** - * Gets the value of the base property. - * - */ - public double getBase() { - return base; - } - - /** - * Sets the value of the base property. - * - */ - public void setBase(double value) { - this.base = value; - } - - /** - * Gets the value of the modifier property. - * - */ - public double getModifier() { - return modifier; - } - - /** - * Sets the value of the modifier property. - * - */ - public void setModifier(double value) { - this.modifier = value; - } - - /** - * Gets the value of the add property. - * - */ - public double getAdd() { - return add; - } - - /** - * Sets the value of the add property. - * - */ - public void setAdd(double value) { - this.add = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="physical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="magical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "physical", - "magical" - }) - public static class Defense { - - @XmlElement(required = true) - protected CharacterTemplate.Stats.Defense.Physical physical; - @XmlElement(required = true) - protected CharacterTemplate.Stats.Defense.Magical magical; - - /** - * Gets the value of the physical property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Defense.Physical } - * - */ - public CharacterTemplate.Stats.Defense.Physical getPhysical() { - return physical; - } - - /** - * Sets the value of the physical property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Defense.Physical } - * - */ - public void setPhysical(CharacterTemplate.Stats.Defense.Physical value) { - this.physical = value; - } - - /** - * Gets the value of the magical property. - * - * @return - * possible object is - * {@link CharacterTemplate.Stats.Defense.Magical } - * - */ - public CharacterTemplate.Stats.Defense.Magical getMagical() { - return magical; - } - - /** - * Sets the value of the magical property. - * - * @param value - * allowed object is - * {@link CharacterTemplate.Stats.Defense.Magical } - * - */ - public void setMagical(CharacterTemplate.Stats.Defense.Magical value) { - this.magical = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Magical { - - @XmlAttribute(name = "value", required = true) - protected double value; - - /** - * Gets the value of the value property. - * - */ - public double getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(double value) { - this.value = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Physical { - - @XmlAttribute(name = "value", required = true) - protected double value; - - /** - * Gets the value of the value property. - * - */ - public double getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(double value) { - this.value = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Hp { - - @XmlAttribute(name = "base", required = true) - protected double base; - @XmlAttribute(name = "modifier", required = true) - protected double modifier; - @XmlAttribute(name = "add", required = true) - protected double add; - - /** - * Gets the value of the base property. - * - */ - public double getBase() { - return base; - } - - /** - * Sets the value of the base property. - * - */ - public void setBase(double value) { - this.base = value; - } - - /** - * Gets the value of the modifier property. - * - */ - public double getModifier() { - return modifier; - } - - /** - * Sets the value of the modifier property. - * - */ - public void setModifier(double value) { - this.modifier = value; - } - - /** - * Gets the value of the add property. - * - */ - public double getAdd() { - return add; - } - - /** - * Sets the value of the add property. - * - */ - public void setAdd(double value) { - this.add = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Move { - - @XmlAttribute(name = "run", required = true) - protected double run; - @XmlAttribute(name = "walk", required = true) - protected double walk; - - /** - * Gets the value of the run property. - * - */ - public double getRun() { - return run; - } - - /** - * Sets the value of the run property. - * - */ - public void setRun(double value) { - this.run = value; - } - - /** - * Gets the value of the walk property. - * - */ - public double getWalk() { - return walk; - } - - /** - * Sets the value of the walk property. - * - */ - public void setWalk(double value) { - this.walk = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Mp { - - @XmlAttribute(name = "base", required = true) - protected double base; - @XmlAttribute(name = "modifier", required = true) - protected double modifier; - @XmlAttribute(name = "add", required = true) - protected double add; - - /** - * Gets the value of the base property. - * - */ - public double getBase() { - return base; - } - - /** - * Sets the value of the base property. - * - */ - public void setBase(double value) { - this.base = value; - } - - /** - * Gets the value of the modifier property. - * - */ - public double getModifier() { - return modifier; - } - - /** - * Sets the value of the modifier property. - * - */ - public void setModifier(double value) { - this.modifier = value; - } - - /** - * Gets the value of the add property. - * - */ - public double getAdd() { - return add; - } - - /** - * Sets the value of the add property. - * - */ - public void setAdd(double value) { - this.add = value; - } - - } - - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import com.l2jserver.model.id.template.CharacterTemplateID; +import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter; + + +/** + *

Java class for character element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="character">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}ActorTemplate">
+ *         <sequence>
+ *           <element name="stats">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="hp">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="mp">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="cp">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="attack">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <element name="physical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="magical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </sequence>
+ *                             <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="defense">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <element name="physical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="magical">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </sequence>
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="move">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="base">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                   </sequence>
+ *                   <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="collision">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="male">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="female">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *         </sequence>
+ *         <attribute name="class" use="required" type="{http://schemas.l2jserver2.com/character}CharacterTemplateID" />
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "stats", + "collision" +}) +@XmlRootElement(name = "character", namespace = "http://schemas.l2jserver2.com/character") +public class CharacterTemplate + extends ActorTemplate +{ + + @XmlElement(required = true) + protected CharacterTemplate.Stats stats; + @XmlElement(required = true) + protected CharacterTemplate.Collision collision; + @XmlAttribute(name = "class", required = true) + @XmlJavaTypeAdapter(CharacterTemplateIDAdapter.class) + protected CharacterTemplateID id; + + /** + * Gets the value of the stats property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats } + * + */ + public CharacterTemplate.Stats getStats() { + return stats; + } + + /** + * Sets the value of the stats property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats } + * + */ + public void setStats(CharacterTemplate.Stats value) { + this.stats = value; + } + + /** + * Gets the value of the collision property. + * + * @return + * possible object is + * {@link CharacterTemplate.Collision } + * + */ + public CharacterTemplate.Collision getCollision() { + return collision; + } + + /** + * Sets the value of the collision property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Collision } + * + */ + public void setCollision(CharacterTemplate.Collision value) { + this.collision = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public CharacterTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(CharacterTemplateID value) { + this.id = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="male">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="female">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "male", + "female" + }) + public static class Collision { + + @XmlElement(required = true) + protected CharacterTemplate.Collision.Male male; + @XmlElement(required = true) + protected CharacterTemplate.Collision.Female female; + + /** + * Gets the value of the male property. + * + * @return + * possible object is + * {@link CharacterTemplate.Collision.Male } + * + */ + public CharacterTemplate.Collision.Male getMale() { + return male; + } + + /** + * Sets the value of the male property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Collision.Male } + * + */ + public void setMale(CharacterTemplate.Collision.Male value) { + this.male = value; + } + + /** + * Gets the value of the female property. + * + * @return + * possible object is + * {@link CharacterTemplate.Collision.Female } + * + */ + public CharacterTemplate.Collision.Female getFemale() { + return female; + } + + /** + * Sets the value of the female property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Collision.Female } + * + */ + public void setFemale(CharacterTemplate.Collision.Female value) { + this.female = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Female { + + @XmlAttribute(name = "radius", required = true) + protected double radius; + @XmlAttribute(name = "heigth", required = true) + protected double heigth; + + /** + * Gets the value of the radius property. + * + */ + public double getRadius() { + return radius; + } + + /** + * Sets the value of the radius property. + * + */ + public void setRadius(double value) { + this.radius = value; + } + + /** + * Gets the value of the heigth property. + * + */ + public double getHeigth() { + return heigth; + } + + /** + * Sets the value of the heigth property. + * + */ + public void setHeigth(double value) { + this.heigth = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Male { + + @XmlAttribute(name = "radius", required = true) + protected double radius; + @XmlAttribute(name = "heigth", required = true) + protected double heigth; + + /** + * Gets the value of the radius property. + * + */ + public double getRadius() { + return radius; + } + + /** + * Sets the value of the radius property. + * + */ + public void setRadius(double value) { + this.radius = value; + } + + /** + * Gets the value of the heigth property. + * + */ + public double getHeigth() { + return heigth; + } + + /** + * Sets the value of the heigth property. + * + */ + public void setHeigth(double value) { + this.heigth = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="hp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="mp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="cp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="attack">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="physical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="magical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="defense">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="physical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="magical">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="move">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="base">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *       </sequence>
+     *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "hp", + "mp", + "cp", + "attack", + "defense", + "move", + "base", + "maxload" + }) + public static class Stats { + + @XmlElement(required = true) + protected CharacterTemplate.Stats.Hp hp; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Mp mp; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Cp cp; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Attack attack; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Defense defense; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Move move; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Base base; + protected int maxload; + @XmlAttribute(name = "level", required = true) + protected int level; + @XmlAttribute(name = "crafter", required = true) + protected boolean crafter; + + /** + * Gets the value of the hp property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Hp } + * + */ + public CharacterTemplate.Stats.Hp getHp() { + return hp; + } + + /** + * Sets the value of the hp property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Hp } + * + */ + public void setHp(CharacterTemplate.Stats.Hp value) { + this.hp = value; + } + + /** + * Gets the value of the mp property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Mp } + * + */ + public CharacterTemplate.Stats.Mp getMp() { + return mp; + } + + /** + * Sets the value of the mp property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Mp } + * + */ + public void setMp(CharacterTemplate.Stats.Mp value) { + this.mp = value; + } + + /** + * Gets the value of the cp property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Cp } + * + */ + public CharacterTemplate.Stats.Cp getCp() { + return cp; + } + + /** + * Sets the value of the cp property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Cp } + * + */ + public void setCp(CharacterTemplate.Stats.Cp value) { + this.cp = value; + } + + /** + * Gets the value of the attack property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Attack } + * + */ + public CharacterTemplate.Stats.Attack getAttack() { + return attack; + } + + /** + * Sets the value of the attack property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Attack } + * + */ + public void setAttack(CharacterTemplate.Stats.Attack value) { + this.attack = value; + } + + /** + * Gets the value of the defense property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Defense } + * + */ + public CharacterTemplate.Stats.Defense getDefense() { + return defense; + } + + /** + * Sets the value of the defense property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Defense } + * + */ + public void setDefense(CharacterTemplate.Stats.Defense value) { + this.defense = value; + } + + /** + * Gets the value of the move property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Move } + * + */ + public CharacterTemplate.Stats.Move getMove() { + return move; + } + + /** + * Sets the value of the move property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Move } + * + */ + public void setMove(CharacterTemplate.Stats.Move value) { + this.move = value; + } + + /** + * Gets the value of the base property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Base } + * + */ + public CharacterTemplate.Stats.Base getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Base } + * + */ + public void setBase(CharacterTemplate.Stats.Base value) { + this.base = value; + } + + /** + * Gets the value of the maxload property. + * + */ + public int getMaxload() { + return maxload; + } + + /** + * Sets the value of the maxload property. + * + */ + public void setMaxload(int value) { + this.maxload = value; + } + + /** + * Gets the value of the level property. + * + */ + public int getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + */ + public void setLevel(int value) { + this.level = value; + } + + /** + * Gets the value of the crafter property. + * + */ + public boolean isCrafter() { + return crafter; + } + + /** + * Sets the value of the crafter property. + * + */ + public void setCrafter(boolean value) { + this.crafter = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="physical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="magical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Attack { + + @XmlElement(required = true) + protected CharacterTemplate.Stats.Attack.Physical physical; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Attack.Magical magical; + @XmlAttribute(name = "evasion", required = true) + protected int evasion; + @XmlAttribute(name = "critical", required = true) + protected int critical; + @XmlAttribute(name = "accuracy", required = true) + protected int accuracy; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Attack.Physical } + * + */ + public CharacterTemplate.Stats.Attack.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Attack.Physical } + * + */ + public void setPhysical(CharacterTemplate.Stats.Attack.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Attack.Magical } + * + */ + public CharacterTemplate.Stats.Attack.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Attack.Magical } + * + */ + public void setMagical(CharacterTemplate.Stats.Attack.Magical value) { + this.magical = value; + } + + /** + * Gets the value of the evasion property. + * + */ + public int getEvasion() { + return evasion; + } + + /** + * Sets the value of the evasion property. + * + */ + public void setEvasion(int value) { + this.evasion = value; + } + + /** + * Gets the value of the critical property. + * + */ + public int getCritical() { + return critical; + } + + /** + * Sets the value of the critical property. + * + */ + public void setCritical(int value) { + this.critical = value; + } + + /** + * Gets the value of the accuracy property. + * + */ + public int getAccuracy() { + return accuracy; + } + + /** + * Sets the value of the accuracy property. + * + */ + public void setAccuracy(int value) { + this.accuracy = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Base { + + @XmlAttribute(name = "int", required = true) + protected int _int; + @XmlAttribute(name = "str", required = true) + protected int str; + @XmlAttribute(name = "con", required = true) + protected int con; + @XmlAttribute(name = "men", required = true) + protected int men; + @XmlAttribute(name = "dex", required = true) + protected int dex; + @XmlAttribute(name = "wit", required = true) + protected int wit; + + /** + * Gets the value of the int property. + * + */ + public int getInt() { + return _int; + } + + /** + * Sets the value of the int property. + * + */ + public void setInt(int value) { + this._int = value; + } + + /** + * Gets the value of the str property. + * + */ + public int getStr() { + return str; + } + + /** + * Sets the value of the str property. + * + */ + public void setStr(int value) { + this.str = value; + } + + /** + * Gets the value of the con property. + * + */ + public int getCon() { + return con; + } + + /** + * Sets the value of the con property. + * + */ + public void setCon(int value) { + this.con = value; + } + + /** + * Gets the value of the men property. + * + */ + public int getMen() { + return men; + } + + /** + * Sets the value of the men property. + * + */ + public void setMen(int value) { + this.men = value; + } + + /** + * Gets the value of the dex property. + * + */ + public int getDex() { + return dex; + } + + /** + * Sets the value of the dex property. + * + */ + public void setDex(int value) { + this.dex = value; + } + + /** + * Gets the value of the wit property. + * + */ + public int getWit() { + return wit; + } + + /** + * Sets the value of the wit property. + * + */ + public void setWit(int value) { + this.wit = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Cp { + + @XmlAttribute(name = "base", required = true) + protected double base; + @XmlAttribute(name = "modifier", required = true) + protected double modifier; + @XmlAttribute(name = "add", required = true) + protected double add; + + /** + * Gets the value of the base property. + * + */ + public double getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + */ + public void setBase(double value) { + this.base = value; + } + + /** + * Gets the value of the modifier property. + * + */ + public double getModifier() { + return modifier; + } + + /** + * Sets the value of the modifier property. + * + */ + public void setModifier(double value) { + this.modifier = value; + } + + /** + * Gets the value of the add property. + * + */ + public double getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + */ + public void setAdd(double value) { + this.add = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="physical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="magical">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Defense { + + @XmlElement(required = true) + protected CharacterTemplate.Stats.Defense.Physical physical; + @XmlElement(required = true) + protected CharacterTemplate.Stats.Defense.Magical magical; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Defense.Physical } + * + */ + public CharacterTemplate.Stats.Defense.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Defense.Physical } + * + */ + public void setPhysical(CharacterTemplate.Stats.Defense.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link CharacterTemplate.Stats.Defense.Magical } + * + */ + public CharacterTemplate.Stats.Defense.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link CharacterTemplate.Stats.Defense.Magical } + * + */ + public void setMagical(CharacterTemplate.Stats.Defense.Magical value) { + this.magical = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Hp { + + @XmlAttribute(name = "base", required = true) + protected double base; + @XmlAttribute(name = "modifier", required = true) + protected double modifier; + @XmlAttribute(name = "add", required = true) + protected double add; + + /** + * Gets the value of the base property. + * + */ + public double getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + */ + public void setBase(double value) { + this.base = value; + } + + /** + * Gets the value of the modifier property. + * + */ + public double getModifier() { + return modifier; + } + + /** + * Sets the value of the modifier property. + * + */ + public void setModifier(double value) { + this.modifier = value; + } + + /** + * Gets the value of the add property. + * + */ + public double getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + */ + public void setAdd(double value) { + this.add = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Move { + + @XmlAttribute(name = "run", required = true) + protected double run; + @XmlAttribute(name = "walk", required = true) + protected double walk; + + /** + * Gets the value of the run property. + * + */ + public double getRun() { + return run; + } + + /** + * Sets the value of the run property. + * + */ + public void setRun(double value) { + this.run = value; + } + + /** + * Gets the value of the walk property. + * + */ + public double getWalk() { + return walk; + } + + /** + * Sets the value of the walk property. + * + */ + public void setWalk(double value) { + this.walk = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Mp { + + @XmlAttribute(name = "base", required = true) + protected double base; + @XmlAttribute(name = "modifier", required = true) + protected double modifier; + @XmlAttribute(name = "add", required = true) + protected double add; + + /** + * Gets the value of the base property. + * + */ + public double getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + */ + public void setBase(double value) { + this.base = value; + } + + /** + * Gets the value of the modifier property. + * + */ + public double getModifier() { + return modifier; + } + + /** + * Sets the value of the modifier property. + * + */ + public void setModifier(double value) { + this.modifier = value; + } + + /** + * Gets the value of the add property. + * + */ + public double getAdd() { + return add; + } + + /** + * Sets the value of the add property. + * + */ + public void setAdd(double value) { + this.add = value; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Coordinate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Coordinate.java index 181e2511e..ab8b21532 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Coordinate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Coordinate.java @@ -1,97 +1,97 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for Coordinate complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Coordinate">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *       </sequence>
- *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       <attribute name="z" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Coordinate") -public class Coordinate { - - @XmlAttribute(name = "x", required = true) - protected int x; - @XmlAttribute(name = "y", required = true) - protected int y; - @XmlAttribute(name = "z", required = true) - protected int z; - - /** - * Gets the value of the x property. - * - */ - public int getX() { - return x; - } - - /** - * Sets the value of the x property. - * - */ - public void setX(int value) { - this.x = value; - } - - /** - * Gets the value of the y property. - * - */ - public int getY() { - return y; - } - - /** - * Sets the value of the y property. - * - */ - public void setY(int value) { - this.y = value; - } - - /** - * Gets the value of the z property. - * - */ - public int getZ() { - return z; - } - - /** - * Sets the value of the z property. - * - */ - public void setZ(int value) { - this.z = value; - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for Coordinate complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="Coordinate">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *       </sequence>
+ *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="z" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Coordinate") +public class Coordinate { + + @XmlAttribute(name = "x", required = true) + protected int x; + @XmlAttribute(name = "y", required = true) + protected int y; + @XmlAttribute(name = "z", required = true) + protected int z; + + /** + * Gets the value of the x property. + * + */ + public int getX() { + return x; + } + + /** + * Sets the value of the x property. + * + */ + public void setX(int value) { + this.x = value; + } + + /** + * Gets the value of the y property. + * + */ + public int getY() { + return y; + } + + /** + * Sets the value of the y property. + * + */ + public void setY(int value) { + this.y = value; + } + + /** + * Gets the value of the z property. + * + */ + public int getZ() { + return z; + } + + /** + * Sets the value of the z property. + * + */ + public void setZ(int value) { + this.z = value; + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ItemTemplate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ItemTemplate.java index 0e244c9a3..e5ef77cdc 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ItemTemplate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ItemTemplate.java @@ -1,1187 +1,1187 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.l2jserver.model.id.template.ItemTemplateID; -import com.l2jserver.model.template.item.ArmorType; -import com.l2jserver.model.template.item.ItemMaterial; -import com.l2jserver.model.template.item.ItemType; -import com.l2jserver.model.template.item.WeaponType; -import com.l2jserver.util.jaxb.ArmorTypeAdapter; -import com.l2jserver.util.jaxb.ItemMaterialAdapter; -import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; -import com.l2jserver.util.jaxb.ItemTypeAdapter; -import com.l2jserver.util.jaxb.WeaponTypeAdapter; - - -/** - *

Java class for item element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="item">
- *   <complexType>
- *     <complexContent>
- *       <extension base="{}AbstractTemplate">
- *         <sequence>
- *           <element name="attributes">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="cost">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                   <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                   <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="controller">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="effect">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <attribute name="type">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <enumeration value="IMMEDIATE"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </attribute>
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <choice minOccurs="0">
- *             <element name="etcItem">
- *               <complexType>
- *                 <complexContent>
- *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
- *                   </restriction>
- *                 </complexContent>
- *               </complexType>
- *             </element>
- *             <element name="weapon">
- *               <complexType>
- *                 <complexContent>
- *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                     <sequence>
- *                       <element name="physicalDamage" type="{}CalculatorFunction"/>
- *                       <element name="magicalDamage" type="{}CalculatorFunction"/>
- *                       <element name="criticalChance" type="{}CalculatorFunction"/>
- *                       <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
- *                     </sequence>
- *                     <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
- *                   </restriction>
- *                 </complexContent>
- *               </complexType>
- *             </element>
- *             <element name="armor">
- *               <complexType>
- *                 <complexContent>
- *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                     <sequence>
- *                       <element name="cost">
- *                         <complexType>
- *                           <complexContent>
- *                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                               <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *                             </restriction>
- *                           </complexContent>
- *                         </complexType>
- *                       </element>
- *                       <element name="equipment">
- *                         <complexType>
- *                           <complexContent>
- *                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                               <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *                             </restriction>
- *                           </complexContent>
- *                         </complexType>
- *                       </element>
- *                     </sequence>
- *                     <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
- *                   </restriction>
- *                 </complexContent>
- *               </complexType>
- *             </element>
- *           </choice>
- *         </sequence>
- *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
- *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *         <attribute name="icon" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       </extension>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "attributes", - "controller", - "effect", - "etcItem", - "weapon", - "armor" -}) -@XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item") -public class ItemTemplate - extends AbstractTemplate -{ - - @XmlElement(required = true) - protected ItemTemplate.Attributes attributes; - @XmlElement(required = true) - protected ItemTemplate.Controller controller; - @XmlElement(required = true) - protected ItemTemplate.Effect effect; - protected ItemTemplate.EtcItem etcItem; - protected ItemTemplate.Weapon weapon; - protected ItemTemplate.Armor armor; - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) - protected ItemTemplateID id; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "icon") - protected String icon; - - /** - * Gets the value of the attributes property. - * - * @return - * possible object is - * {@link ItemTemplate.Attributes } - * - */ - public ItemTemplate.Attributes getAttributes() { - return attributes; - } - - /** - * Sets the value of the attributes property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Attributes } - * - */ - public void setAttributes(ItemTemplate.Attributes value) { - this.attributes = value; - } - - /** - * Gets the value of the controller property. - * - * @return - * possible object is - * {@link ItemTemplate.Controller } - * - */ - public ItemTemplate.Controller getController() { - return controller; - } - - /** - * Sets the value of the controller property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Controller } - * - */ - public void setController(ItemTemplate.Controller value) { - this.controller = value; - } - - /** - * Gets the value of the effect property. - * - * @return - * possible object is - * {@link ItemTemplate.Effect } - * - */ - public ItemTemplate.Effect getEffect() { - return effect; - } - - /** - * Sets the value of the effect property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Effect } - * - */ - public void setEffect(ItemTemplate.Effect value) { - this.effect = value; - } - - /** - * Gets the value of the etcItem property. - * - * @return - * possible object is - * {@link ItemTemplate.EtcItem } - * - */ - public ItemTemplate.EtcItem getEtcItem() { - return etcItem; - } - - /** - * Sets the value of the etcItem property. - * - * @param value - * allowed object is - * {@link ItemTemplate.EtcItem } - * - */ - public void setEtcItem(ItemTemplate.EtcItem value) { - this.etcItem = value; - } - - /** - * Gets the value of the weapon property. - * - * @return - * possible object is - * {@link ItemTemplate.Weapon } - * - */ - public ItemTemplate.Weapon getWeapon() { - return weapon; - } - - /** - * Sets the value of the weapon property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Weapon } - * - */ - public void setWeapon(ItemTemplate.Weapon value) { - this.weapon = value; - } - - /** - * Gets the value of the armor property. - * - * @return - * possible object is - * {@link ItemTemplate.Armor } - * - */ - public ItemTemplate.Armor getArmor() { - return armor; - } - - /** - * Sets the value of the armor property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Armor } - * - */ - public void setArmor(ItemTemplate.Armor value) { - this.armor = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public ItemTemplateID getID() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setID(ItemTemplateID value) { - this.id = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the icon property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIcon() { - return icon; - } - - /** - * Sets the value of the icon property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIcon(String value) { - this.icon = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="cost">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="equipment">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cost", - "equipment" - }) - public static class Armor { - - @XmlElement(required = true) - protected ItemTemplate.Armor.Cost cost; - @XmlElement(required = true) - protected ItemTemplate.Armor.Equipment equipment; - @XmlAttribute(name = "weigth") - @XmlSchemaType(name = "anySimpleType") - protected String weigth; - @XmlAttribute(name = "type") - @XmlJavaTypeAdapter(ArmorTypeAdapter.class) - protected ArmorType type; - - /** - * Gets the value of the cost property. - * - * @return - * possible object is - * {@link ItemTemplate.Armor.Cost } - * - */ - public ItemTemplate.Armor.Cost getCost() { - return cost; - } - - /** - * Sets the value of the cost property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Armor.Cost } - * - */ - public void setCost(ItemTemplate.Armor.Cost value) { - this.cost = value; - } - - /** - * Gets the value of the equipment property. - * - * @return - * possible object is - * {@link ItemTemplate.Armor.Equipment } - * - */ - public ItemTemplate.Armor.Equipment getEquipment() { - return equipment; - } - - /** - * Sets the value of the equipment property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Armor.Equipment } - * - */ - public void setEquipment(ItemTemplate.Armor.Equipment value) { - this.equipment = value; - } - - /** - * Gets the value of the weigth property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getWeigth() { - return weigth; - } - - /** - * Sets the value of the weigth property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setWeigth(String value) { - this.weigth = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public ArmorType getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(ArmorType value) { - this.type = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Cost { - - @XmlAttribute(name = "adena") - @XmlSchemaType(name = "anySimpleType") - protected String adena; - - /** - * Gets the value of the adena property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAdena() { - return adena; - } - - /** - * Sets the value of the adena property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAdena(String value) { - this.adena = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Equipment { - - @XmlAttribute(name = "part") - @XmlSchemaType(name = "anySimpleType") - protected String part; - - /** - * Gets the value of the part property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPart() { - return part; - } - - /** - * Sets the value of the part property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPart(String value) { - this.part = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="cost">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cost" - }) - public static class Attributes { - - @XmlElement(required = true) - protected ItemTemplate.Attributes.Cost cost; - @XmlAttribute(name = "weigth") - protected Integer weigth; - @XmlAttribute(name = "material") - @XmlJavaTypeAdapter(ItemMaterialAdapter.class) - protected ItemMaterial material; - - /** - * Gets the value of the cost property. - * - * @return - * possible object is - * {@link ItemTemplate.Attributes.Cost } - * - */ - public ItemTemplate.Attributes.Cost getCost() { - return cost; - } - - /** - * Sets the value of the cost property. - * - * @param value - * allowed object is - * {@link ItemTemplate.Attributes.Cost } - * - */ - public void setCost(ItemTemplate.Attributes.Cost value) { - this.cost = value; - } - - /** - * Gets the value of the weigth property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getWeigth() { - return weigth; - } - - /** - * Sets the value of the weigth property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setWeigth(Integer value) { - this.weigth = value; - } - - /** - * Gets the value of the material property. - * - * @return - * possible object is - * {@link String } - * - */ - public ItemMaterial getMaterial() { - return material; - } - - /** - * Sets the value of the material property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMaterial(ItemMaterial value) { - this.material = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Cost { - - @XmlAttribute(name = "adena") - protected Integer adena; - - /** - * Gets the value of the adena property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getAdena() { - return adena; - } - - /** - * Sets the value of the adena property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setAdena(Integer value) { - this.adena = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Controller { - - @XmlAttribute(name = "defaultAction") - @XmlSchemaType(name = "anySimpleType") - protected String defaultAction; - - /** - * Gets the value of the defaultAction property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDefaultAction() { - return defaultAction; - } - - /** - * Sets the value of the defaultAction property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDefaultAction(String value) { - this.defaultAction = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="type">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *             <enumeration value="IMMEDIATE"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Effect { - - @XmlAttribute(name = "type") - protected String type; - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class EtcItem { - - @XmlAttribute(name = "type") - @XmlJavaTypeAdapter(ItemTypeAdapter.class) - protected ItemType type; - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public ItemType getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(ItemType value) { - this.type = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="physicalDamage" type="{}CalculatorFunction"/>
-     *         <element name="magicalDamage" type="{}CalculatorFunction"/>
-     *         <element name="criticalChance" type="{}CalculatorFunction"/>
-     *         <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
-     *       </sequence>
-     *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "physicalDamage", - "magicalDamage", - "criticalChance", - "physicalAttackSpeed" - }) - public static class Weapon { - - @XmlElement(required = true) - protected CalculatorFunction physicalDamage; - @XmlElement(required = true) - protected CalculatorFunction magicalDamage; - @XmlElement(required = true) - protected CalculatorFunction criticalChance; - @XmlElement(required = true) - protected CalculatorFunction physicalAttackSpeed; - @XmlAttribute(name = "part") - @XmlSchemaType(name = "anySimpleType") - protected String part; - @XmlAttribute(name = "type") - @XmlJavaTypeAdapter(WeaponTypeAdapter.class) - protected WeaponType type; - - /** - * Gets the value of the physicalDamage property. - * - * @return - * possible object is - * {@link CalculatorFunction } - * - */ - public CalculatorFunction getPhysicalDamage() { - return physicalDamage; - } - - /** - * Sets the value of the physicalDamage property. - * - * @param value - * allowed object is - * {@link CalculatorFunction } - * - */ - public void setPhysicalDamage(CalculatorFunction value) { - this.physicalDamage = value; - } - - /** - * Gets the value of the magicalDamage property. - * - * @return - * possible object is - * {@link CalculatorFunction } - * - */ - public CalculatorFunction getMagicalDamage() { - return magicalDamage; - } - - /** - * Sets the value of the magicalDamage property. - * - * @param value - * allowed object is - * {@link CalculatorFunction } - * - */ - public void setMagicalDamage(CalculatorFunction value) { - this.magicalDamage = value; - } - - /** - * Gets the value of the criticalChance property. - * - * @return - * possible object is - * {@link CalculatorFunction } - * - */ - public CalculatorFunction getCriticalChance() { - return criticalChance; - } - - /** - * Sets the value of the criticalChance property. - * - * @param value - * allowed object is - * {@link CalculatorFunction } - * - */ - public void setCriticalChance(CalculatorFunction value) { - this.criticalChance = value; - } - - /** - * Gets the value of the physicalAttackSpeed property. - * - * @return - * possible object is - * {@link CalculatorFunction } - * - */ - public CalculatorFunction getPhysicalAttackSpeed() { - return physicalAttackSpeed; - } - - /** - * Sets the value of the physicalAttackSpeed property. - * - * @param value - * allowed object is - * {@link CalculatorFunction } - * - */ - public void setPhysicalAttackSpeed(CalculatorFunction value) { - this.physicalAttackSpeed = value; - } - - /** - * Gets the value of the part property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPart() { - return part; - } - - /** - * Sets the value of the part property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPart(String value) { - this.part = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public WeaponType getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(WeaponType value) { - this.type = value; - } - - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import com.l2jserver.model.id.template.ItemTemplateID; +import com.l2jserver.model.template.item.ArmorType; +import com.l2jserver.model.template.item.ItemMaterial; +import com.l2jserver.model.template.item.ItemType; +import com.l2jserver.model.template.item.WeaponType; +import com.l2jserver.util.jaxb.ArmorTypeAdapter; +import com.l2jserver.util.jaxb.ItemMaterialAdapter; +import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; +import com.l2jserver.util.jaxb.ItemTypeAdapter; +import com.l2jserver.util.jaxb.WeaponTypeAdapter; + + +/** + *

Java class for item element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="item">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}AbstractTemplate">
+ *         <sequence>
+ *           <element name="attributes">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="cost">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="controller">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="effect">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <attribute name="type">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <enumeration value="IMMEDIATE"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </attribute>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <choice minOccurs="0">
+ *             <element name="etcItem">
+ *               <complexType>
+ *                 <complexContent>
+ *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
+ *                   </restriction>
+ *                 </complexContent>
+ *               </complexType>
+ *             </element>
+ *             <element name="weapon">
+ *               <complexType>
+ *                 <complexContent>
+ *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                     <sequence>
+ *                       <element name="physicalDamage" type="{}CalculatorFunction"/>
+ *                       <element name="magicalDamage" type="{}CalculatorFunction"/>
+ *                       <element name="criticalChance" type="{}CalculatorFunction"/>
+ *                       <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
+ *                     </sequence>
+ *                     <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
+ *                   </restriction>
+ *                 </complexContent>
+ *               </complexType>
+ *             </element>
+ *             <element name="armor">
+ *               <complexType>
+ *                 <complexContent>
+ *                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                     <sequence>
+ *                       <element name="cost">
+ *                         <complexType>
+ *                           <complexContent>
+ *                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                               <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                             </restriction>
+ *                           </complexContent>
+ *                         </complexType>
+ *                       </element>
+ *                       <element name="equipment">
+ *                         <complexType>
+ *                           <complexContent>
+ *                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                               <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                             </restriction>
+ *                           </complexContent>
+ *                         </complexType>
+ *                       </element>
+ *                     </sequence>
+ *                     <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *                     <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
+ *                   </restriction>
+ *                 </complexContent>
+ *               </complexType>
+ *             </element>
+ *           </choice>
+ *         </sequence>
+ *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="icon" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "attributes", + "controller", + "effect", + "etcItem", + "weapon", + "armor" +}) +@XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item") +public class ItemTemplate + extends AbstractTemplate +{ + + @XmlElement(required = true) + protected ItemTemplate.Attributes attributes; + @XmlElement(required = true) + protected ItemTemplate.Controller controller; + @XmlElement(required = true) + protected ItemTemplate.Effect effect; + protected ItemTemplate.EtcItem etcItem; + protected ItemTemplate.Weapon weapon; + protected ItemTemplate.Armor armor; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID id; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "icon") + protected String icon; + + /** + * Gets the value of the attributes property. + * + * @return + * possible object is + * {@link ItemTemplate.Attributes } + * + */ + public ItemTemplate.Attributes getAttributes() { + return attributes; + } + + /** + * Sets the value of the attributes property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Attributes } + * + */ + public void setAttributes(ItemTemplate.Attributes value) { + this.attributes = value; + } + + /** + * Gets the value of the controller property. + * + * @return + * possible object is + * {@link ItemTemplate.Controller } + * + */ + public ItemTemplate.Controller getController() { + return controller; + } + + /** + * Sets the value of the controller property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Controller } + * + */ + public void setController(ItemTemplate.Controller value) { + this.controller = value; + } + + /** + * Gets the value of the effect property. + * + * @return + * possible object is + * {@link ItemTemplate.Effect } + * + */ + public ItemTemplate.Effect getEffect() { + return effect; + } + + /** + * Sets the value of the effect property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Effect } + * + */ + public void setEffect(ItemTemplate.Effect value) { + this.effect = value; + } + + /** + * Gets the value of the etcItem property. + * + * @return + * possible object is + * {@link ItemTemplate.EtcItem } + * + */ + public ItemTemplate.EtcItem getEtcItem() { + return etcItem; + } + + /** + * Sets the value of the etcItem property. + * + * @param value + * allowed object is + * {@link ItemTemplate.EtcItem } + * + */ + public void setEtcItem(ItemTemplate.EtcItem value) { + this.etcItem = value; + } + + /** + * Gets the value of the weapon property. + * + * @return + * possible object is + * {@link ItemTemplate.Weapon } + * + */ + public ItemTemplate.Weapon getWeapon() { + return weapon; + } + + /** + * Sets the value of the weapon property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Weapon } + * + */ + public void setWeapon(ItemTemplate.Weapon value) { + this.weapon = value; + } + + /** + * Gets the value of the armor property. + * + * @return + * possible object is + * {@link ItemTemplate.Armor } + * + */ + public ItemTemplate.Armor getArmor() { + return armor; + } + + /** + * Sets the value of the armor property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Armor } + * + */ + public void setArmor(ItemTemplate.Armor value) { + this.armor = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(ItemTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the icon property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIcon() { + return icon; + } + + /** + * Sets the value of the icon property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIcon(String value) { + this.icon = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="cost">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="equipment">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cost", + "equipment" + }) + public static class Armor { + + @XmlElement(required = true) + protected ItemTemplate.Armor.Cost cost; + @XmlElement(required = true) + protected ItemTemplate.Armor.Equipment equipment; + @XmlAttribute(name = "weigth") + @XmlSchemaType(name = "anySimpleType") + protected String weigth; + @XmlAttribute(name = "type") + @XmlJavaTypeAdapter(ArmorTypeAdapter.class) + protected ArmorType type; + + /** + * Gets the value of the cost property. + * + * @return + * possible object is + * {@link ItemTemplate.Armor.Cost } + * + */ + public ItemTemplate.Armor.Cost getCost() { + return cost; + } + + /** + * Sets the value of the cost property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Armor.Cost } + * + */ + public void setCost(ItemTemplate.Armor.Cost value) { + this.cost = value; + } + + /** + * Gets the value of the equipment property. + * + * @return + * possible object is + * {@link ItemTemplate.Armor.Equipment } + * + */ + public ItemTemplate.Armor.Equipment getEquipment() { + return equipment; + } + + /** + * Sets the value of the equipment property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Armor.Equipment } + * + */ + public void setEquipment(ItemTemplate.Armor.Equipment value) { + this.equipment = value; + } + + /** + * Gets the value of the weigth property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getWeigth() { + return weigth; + } + + /** + * Sets the value of the weigth property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setWeigth(String value) { + this.weigth = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public ArmorType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(ArmorType value) { + this.type = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Cost { + + @XmlAttribute(name = "adena") + @XmlSchemaType(name = "anySimpleType") + protected String adena; + + /** + * Gets the value of the adena property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdena() { + return adena; + } + + /** + * Sets the value of the adena property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdena(String value) { + this.adena = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Equipment { + + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="cost">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cost" + }) + public static class Attributes { + + @XmlElement(required = true) + protected ItemTemplate.Attributes.Cost cost; + @XmlAttribute(name = "weigth") + protected Integer weigth; + @XmlAttribute(name = "material") + @XmlJavaTypeAdapter(ItemMaterialAdapter.class) + protected ItemMaterial material; + + /** + * Gets the value of the cost property. + * + * @return + * possible object is + * {@link ItemTemplate.Attributes.Cost } + * + */ + public ItemTemplate.Attributes.Cost getCost() { + return cost; + } + + /** + * Sets the value of the cost property. + * + * @param value + * allowed object is + * {@link ItemTemplate.Attributes.Cost } + * + */ + public void setCost(ItemTemplate.Attributes.Cost value) { + this.cost = value; + } + + /** + * Gets the value of the weigth property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getWeigth() { + return weigth; + } + + /** + * Sets the value of the weigth property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setWeigth(Integer value) { + this.weigth = value; + } + + /** + * Gets the value of the material property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemMaterial getMaterial() { + return material; + } + + /** + * Sets the value of the material property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMaterial(ItemMaterial value) { + this.material = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Cost { + + @XmlAttribute(name = "adena") + protected Integer adena; + + /** + * Gets the value of the adena property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getAdena() { + return adena; + } + + /** + * Sets the value of the adena property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setAdena(Integer value) { + this.adena = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Controller { + + @XmlAttribute(name = "defaultAction") + @XmlSchemaType(name = "anySimpleType") + protected String defaultAction; + + /** + * Gets the value of the defaultAction property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDefaultAction() { + return defaultAction; + } + + /** + * Sets the value of the defaultAction property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDefaultAction(String value) { + this.defaultAction = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="type">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *             <enumeration value="IMMEDIATE"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Effect { + + @XmlAttribute(name = "type") + protected String type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class EtcItem { + + @XmlAttribute(name = "type") + @XmlJavaTypeAdapter(ItemTypeAdapter.class) + protected ItemType type; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(ItemType value) { + this.type = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="physicalDamage" type="{}CalculatorFunction"/>
+     *         <element name="magicalDamage" type="{}CalculatorFunction"/>
+     *         <element name="criticalChance" type="{}CalculatorFunction"/>
+     *         <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
+     *       </sequence>
+     *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physicalDamage", + "magicalDamage", + "criticalChance", + "physicalAttackSpeed" + }) + public static class Weapon { + + @XmlElement(required = true) + protected CalculatorFunction physicalDamage; + @XmlElement(required = true) + protected CalculatorFunction magicalDamage; + @XmlElement(required = true) + protected CalculatorFunction criticalChance; + @XmlElement(required = true) + protected CalculatorFunction physicalAttackSpeed; + @XmlAttribute(name = "part") + @XmlSchemaType(name = "anySimpleType") + protected String part; + @XmlAttribute(name = "type") + @XmlJavaTypeAdapter(WeaponTypeAdapter.class) + protected WeaponType type; + + /** + * Gets the value of the physicalDamage property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getPhysicalDamage() { + return physicalDamage; + } + + /** + * Sets the value of the physicalDamage property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setPhysicalDamage(CalculatorFunction value) { + this.physicalDamage = value; + } + + /** + * Gets the value of the magicalDamage property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getMagicalDamage() { + return magicalDamage; + } + + /** + * Sets the value of the magicalDamage property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setMagicalDamage(CalculatorFunction value) { + this.magicalDamage = value; + } + + /** + * Gets the value of the criticalChance property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getCriticalChance() { + return criticalChance; + } + + /** + * Sets the value of the criticalChance property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setCriticalChance(CalculatorFunction value) { + this.criticalChance = value; + } + + /** + * Gets the value of the physicalAttackSpeed property. + * + * @return + * possible object is + * {@link CalculatorFunction } + * + */ + public CalculatorFunction getPhysicalAttackSpeed() { + return physicalAttackSpeed; + } + + /** + * Sets the value of the physicalAttackSpeed property. + * + * @param value + * allowed object is + * {@link CalculatorFunction } + * + */ + public void setPhysicalAttackSpeed(CalculatorFunction value) { + this.physicalAttackSpeed = value; + } + + /** + * Gets the value of the part property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPart() { + return part; + } + + /** + * Sets the value of the part property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPart(String value) { + this.part = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public WeaponType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(WeaponType value) { + this.type = value; + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/NPCTemplate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/NPCTemplate.java index 00d34a813..014f6be11 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/NPCTemplate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/NPCTemplate.java @@ -1,3320 +1,3320 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.l2jserver.model.id.template.ItemTemplateID; -import com.l2jserver.model.id.template.NPCTemplateID; -import com.l2jserver.model.id.template.SkillTemplateID; -import com.l2jserver.model.template.actor.ActorSex; -import com.l2jserver.model.template.npc.NPCRace; -import com.l2jserver.util.jaxb.ActorSexAdapter; -import com.l2jserver.util.jaxb.ClassAdapter; -import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; -import com.l2jserver.util.jaxb.NPCRaceAdapter; -import com.l2jserver.util.jaxb.NPCTemplateIDAdapter; -import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; - - -/** - *

Java class for npc element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="npc">
- *   <complexType>
- *     <complexContent>
- *       <extension base="{}ActorTemplate">
- *         <sequence>
- *           <element name="info">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="name" minOccurs="0">
- *                       <complexType>
- *                         <simpleContent>
- *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                             <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                             <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                           </extension>
- *                         </simpleContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="title" minOccurs="0">
- *                       <complexType>
- *                         <simpleContent>
- *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                             <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                           </extension>
- *                         </simpleContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *                     <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
- *                     <element name="sex" type="{}ActorSexType" minOccurs="0"/>
- *                     <element name="stats">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                               <element name="hp">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="mp">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="attack" minOccurs="0">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                         <element name="physical">
- *                                           <complexType>
- *                                             <complexContent>
- *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                                 <sequence>
- *                                                 </sequence>
- *                                                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                               </restriction>
- *                                             </complexContent>
- *                                           </complexType>
- *                                         </element>
- *                                         <element name="magical">
- *                                           <complexType>
- *                                             <complexContent>
- *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                                 <sequence>
- *                                                 </sequence>
- *                                                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                               </restriction>
- *                                             </complexContent>
- *                                           </complexType>
- *                                         </element>
- *                                       </sequence>
- *                                       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="defense" minOccurs="0">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                         <element name="physical">
- *                                           <complexType>
- *                                             <complexContent>
- *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                                 <sequence>
- *                                                 </sequence>
- *                                                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                               </restriction>
- *                                             </complexContent>
- *                                           </complexType>
- *                                         </element>
- *                                         <element name="magical">
- *                                           <complexType>
- *                                             <complexContent>
- *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                                 <sequence>
- *                                                 </sequence>
- *                                                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                               </restriction>
- *                                             </complexContent>
- *                                           </complexType>
- *                                         </element>
- *                                       </sequence>
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="move" minOccurs="0">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                               <element name="base">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                       </sequence>
- *                                       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                             </sequence>
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
- *                     <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *                     <element name="item" minOccurs="0">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
- *                             <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                     <element name="collision" minOccurs="0">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                   <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                   <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                   <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="ai" minOccurs="0">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                   </sequence>
- *                   <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="talk" minOccurs="0">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="chat" maxOccurs="unbounded">
- *                       <complexType>
- *                         <simpleContent>
- *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                             <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           </extension>
- *                         </simpleContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                   <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="droplist" minOccurs="0">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="item" maxOccurs="unbounded">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
- *                             <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                             <attribute name="category" use="required">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <enumeration value="DROP"/>
- *                                   <enumeration value="SPOIL"/>
- *                                   <enumeration value="UNK_1"/>
- *                                   <enumeration value="UNK_2"/>
- *                                   <enumeration value="UNK_3"/>
- *                                   <enumeration value="UNK_4"/>
- *                                   <enumeration value="UNK_5"/>
- *                                   <enumeration value="UNK_6"/>
- *                                   <enumeration value="UNK_7"/>
- *                                   <enumeration value="UNK_8"/>
- *                                   <enumeration value="UNK_9"/>
- *                                   <enumeration value="UNK_10"/>
- *                                   <enumeration value="UNK_11"/>
- *                                   <enumeration value="UNK_12"/>
- *                                   <enumeration value="UNK_13"/>
- *                                   <enumeration value="UNK_14"/>
- *                                   <enumeration value="UNK_15"/>
- *                                   <enumeration value="UNK_16"/>
- *                                   <enumeration value="UNK_17"/>
- *                                   <enumeration value="UNK_18"/>
- *                                   <enumeration value="UNK_19"/>
- *                                   <enumeration value="UNK_20"/>
- *                                   <enumeration value="UNK_21"/>
- *                                   <enumeration value="UNK_22"/>
- *                                   <enumeration value="UNK_23"/>
- *                                   <enumeration value="UNK_24"/>
- *                                   <enumeration value="UNK_25"/>
- *                                   <enumeration value="UNK_26"/>
- *                                   <enumeration value="UNK_27"/>
- *                                   <enumeration value="UNK_28"/>
- *                                   <enumeration value="UNK_29"/>
- *                                   <enumeration value="UNK_30"/>
- *                                   <enumeration value="UNK_31"/>
- *                                   <enumeration value="UNK_32"/>
- *                                   <enumeration value="UNK_33"/>
- *                                   <enumeration value="UNK_34"/>
- *                                   <enumeration value="UNK_35"/>
- *                                   <enumeration value="UNK_36"/>
- *                                   <enumeration value="UNK_100"/>
- *                                   <enumeration value="UNK_101"/>
- *                                   <enumeration value="UNK_102"/>
- *                                   <enumeration value="UNK_200"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </attribute>
- *                             <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *           <element name="skills" minOccurs="0">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="skill" maxOccurs="unbounded">
- *                       <complexType>
- *                         <complexContent>
- *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                             <sequence>
- *                             </sequence>
- *                             <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
- *                             <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                           </restriction>
- *                         </complexContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *         </sequence>
- *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/npc}NPCTemplateID" />
- *         <attribute name="controller" use="required">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             </restriction>
- *           </simpleType>
- *         </attribute>
- *       </extension>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "info", - "ai", - "talk", - "droplist", - "skills" -}) -@XmlRootElement(name = "npc", namespace = "http://schemas.l2jserver2.com/npc") -public class NPCTemplate - extends ActorTemplate -{ - - @XmlElement(required = true) - protected NPCTemplate.Info info; - protected NPCTemplate.Ai ai; - protected NPCTemplate.Talk talk; - protected NPCTemplate.Droplist droplist; - protected NPCTemplate.Skills skills; - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(NPCTemplateIDAdapter.class) - protected NPCTemplateID id; - @XmlAttribute(name = "controller", required = true) - @XmlJavaTypeAdapter(ClassAdapter.class) - protected Class controller; - - /** - * Gets the value of the info property. - * - * @return - * possible object is - * {@link NPCTemplate.Info } - * - */ - public NPCTemplate.Info getInfo() { - return info; - } - - /** - * Sets the value of the info property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info } - * - */ - public void setInfo(NPCTemplate.Info value) { - this.info = value; - } - - /** - * Gets the value of the ai property. - * - * @return - * possible object is - * {@link NPCTemplate.Ai } - * - */ - public NPCTemplate.Ai getAi() { - return ai; - } - - /** - * Sets the value of the ai property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Ai } - * - */ - public void setAi(NPCTemplate.Ai value) { - this.ai = value; - } - - /** - * Gets the value of the talk property. - * - * @return - * possible object is - * {@link NPCTemplate.Talk } - * - */ - public NPCTemplate.Talk getTalk() { - return talk; - } - - /** - * Sets the value of the talk property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Talk } - * - */ - public void setTalk(NPCTemplate.Talk value) { - this.talk = value; - } - - /** - * Gets the value of the droplist property. - * - * @return - * possible object is - * {@link NPCTemplate.Droplist } - * - */ - public NPCTemplate.Droplist getDroplist() { - return droplist; - } - - /** - * Sets the value of the droplist property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Droplist } - * - */ - public void setDroplist(NPCTemplate.Droplist value) { - this.droplist = value; - } - - /** - * Gets the value of the skills property. - * - * @return - * possible object is - * {@link NPCTemplate.Skills } - * - */ - public NPCTemplate.Skills getSkills() { - return skills; - } - - /** - * Sets the value of the skills property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Skills } - * - */ - public void setSkills(NPCTemplate.Skills value) { - this.skills = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public NPCTemplateID getID() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setID(NPCTemplateID value) { - this.id = value; - } - - /** - * Gets the value of the controller property. - * - * @return - * possible object is - * {@link String } - * - */ - public Class getController() { - return controller; - } - - /** - * Sets the value of the controller property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setController(Class value) { - this.controller = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *       </sequence>
-     *       <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Ai { - - @XmlAttribute(name = "script", required = true) - protected String script; - - /** - * Gets the value of the script property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getScript() { - return script; - } - - /** - * Sets the value of the script property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setScript(String value) { - this.script = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="item" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-     *                 <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="category" use="required">
-     *                   <simpleType>
-     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                       <enumeration value="DROP"/>
-     *                       <enumeration value="SPOIL"/>
-     *                       <enumeration value="UNK_1"/>
-     *                       <enumeration value="UNK_2"/>
-     *                       <enumeration value="UNK_3"/>
-     *                       <enumeration value="UNK_4"/>
-     *                       <enumeration value="UNK_5"/>
-     *                       <enumeration value="UNK_6"/>
-     *                       <enumeration value="UNK_7"/>
-     *                       <enumeration value="UNK_8"/>
-     *                       <enumeration value="UNK_9"/>
-     *                       <enumeration value="UNK_10"/>
-     *                       <enumeration value="UNK_11"/>
-     *                       <enumeration value="UNK_12"/>
-     *                       <enumeration value="UNK_13"/>
-     *                       <enumeration value="UNK_14"/>
-     *                       <enumeration value="UNK_15"/>
-     *                       <enumeration value="UNK_16"/>
-     *                       <enumeration value="UNK_17"/>
-     *                       <enumeration value="UNK_18"/>
-     *                       <enumeration value="UNK_19"/>
-     *                       <enumeration value="UNK_20"/>
-     *                       <enumeration value="UNK_21"/>
-     *                       <enumeration value="UNK_22"/>
-     *                       <enumeration value="UNK_23"/>
-     *                       <enumeration value="UNK_24"/>
-     *                       <enumeration value="UNK_25"/>
-     *                       <enumeration value="UNK_26"/>
-     *                       <enumeration value="UNK_27"/>
-     *                       <enumeration value="UNK_28"/>
-     *                       <enumeration value="UNK_29"/>
-     *                       <enumeration value="UNK_30"/>
-     *                       <enumeration value="UNK_31"/>
-     *                       <enumeration value="UNK_32"/>
-     *                       <enumeration value="UNK_33"/>
-     *                       <enumeration value="UNK_34"/>
-     *                       <enumeration value="UNK_35"/>
-     *                       <enumeration value="UNK_36"/>
-     *                       <enumeration value="UNK_100"/>
-     *                       <enumeration value="UNK_101"/>
-     *                       <enumeration value="UNK_102"/>
-     *                       <enumeration value="UNK_200"/>
-     *                     </restriction>
-     *                   </simpleType>
-     *                 </attribute>
-     *                 <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "item" - }) - public static class Droplist { - - @XmlElement(required = true) - protected List item; - - /** - * Gets the value of the item property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the item property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getItem().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link NPCTemplate.Droplist.Item } - * - * - */ - public List getItem() { - if (item == null) { - item = new ArrayList(); - } - return this.item; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-         *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="category" use="required">
-         *         <simpleType>
-         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *             <enumeration value="DROP"/>
-         *             <enumeration value="SPOIL"/>
-         *             <enumeration value="UNK_1"/>
-         *             <enumeration value="UNK_2"/>
-         *             <enumeration value="UNK_3"/>
-         *             <enumeration value="UNK_4"/>
-         *             <enumeration value="UNK_5"/>
-         *             <enumeration value="UNK_6"/>
-         *             <enumeration value="UNK_7"/>
-         *             <enumeration value="UNK_8"/>
-         *             <enumeration value="UNK_9"/>
-         *             <enumeration value="UNK_10"/>
-         *             <enumeration value="UNK_11"/>
-         *             <enumeration value="UNK_12"/>
-         *             <enumeration value="UNK_13"/>
-         *             <enumeration value="UNK_14"/>
-         *             <enumeration value="UNK_15"/>
-         *             <enumeration value="UNK_16"/>
-         *             <enumeration value="UNK_17"/>
-         *             <enumeration value="UNK_18"/>
-         *             <enumeration value="UNK_19"/>
-         *             <enumeration value="UNK_20"/>
-         *             <enumeration value="UNK_21"/>
-         *             <enumeration value="UNK_22"/>
-         *             <enumeration value="UNK_23"/>
-         *             <enumeration value="UNK_24"/>
-         *             <enumeration value="UNK_25"/>
-         *             <enumeration value="UNK_26"/>
-         *             <enumeration value="UNK_27"/>
-         *             <enumeration value="UNK_28"/>
-         *             <enumeration value="UNK_29"/>
-         *             <enumeration value="UNK_30"/>
-         *             <enumeration value="UNK_31"/>
-         *             <enumeration value="UNK_32"/>
-         *             <enumeration value="UNK_33"/>
-         *             <enumeration value="UNK_34"/>
-         *             <enumeration value="UNK_35"/>
-         *             <enumeration value="UNK_36"/>
-         *             <enumeration value="UNK_100"/>
-         *             <enumeration value="UNK_101"/>
-         *             <enumeration value="UNK_102"/>
-         *             <enumeration value="UNK_200"/>
-         *           </restriction>
-         *         </simpleType>
-         *       </attribute>
-         *       <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Item { - - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) - protected ItemTemplateID id; - @XmlAttribute(name = "min", required = true) - protected int min; - @XmlAttribute(name = "max", required = true) - protected int max; - @XmlAttribute(name = "category", required = true) - protected NPCTemplate.Droplist.Item.DropCategory category; - @XmlAttribute(name = "chance", required = true) - protected int chance; - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public ItemTemplateID getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(ItemTemplateID value) { - this.id = value; - } - - /** - * Gets the value of the min property. - * - */ - public int getMin() { - return min; - } - - /** - * Sets the value of the min property. - * - */ - public void setMin(int value) { - this.min = value; - } - - /** - * Gets the value of the max property. - * - */ - public int getMax() { - return max; - } - - /** - * Sets the value of the max property. - * - */ - public void setMax(int value) { - this.max = value; - } - - /** - * Gets the value of the category property. - * - * @return - * possible object is - * {@link NPCTemplate.Droplist.Item.DropCategory } - * - */ - public NPCTemplate.Droplist.Item.DropCategory getCategory() { - return category; - } - - /** - * Sets the value of the category property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Droplist.Item.DropCategory } - * - */ - public void setCategory(NPCTemplate.Droplist.Item.DropCategory value) { - this.category = value; - } - - /** - * Gets the value of the chance property. - * - */ - public int getChance() { - return chance; - } - - /** - * Sets the value of the chance property. - * - */ - public void setChance(int value) { - this.chance = value; - } - - - /** - *

Java class for null. - * - *

The following schema fragment specifies the expected content contained within this class. - *

- *

-             * <simpleType>
-             *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *     <enumeration value="DROP"/>
-             *     <enumeration value="SPOIL"/>
-             *     <enumeration value="UNK_1"/>
-             *     <enumeration value="UNK_2"/>
-             *     <enumeration value="UNK_3"/>
-             *     <enumeration value="UNK_4"/>
-             *     <enumeration value="UNK_5"/>
-             *     <enumeration value="UNK_6"/>
-             *     <enumeration value="UNK_7"/>
-             *     <enumeration value="UNK_8"/>
-             *     <enumeration value="UNK_9"/>
-             *     <enumeration value="UNK_10"/>
-             *     <enumeration value="UNK_11"/>
-             *     <enumeration value="UNK_12"/>
-             *     <enumeration value="UNK_13"/>
-             *     <enumeration value="UNK_14"/>
-             *     <enumeration value="UNK_15"/>
-             *     <enumeration value="UNK_16"/>
-             *     <enumeration value="UNK_17"/>
-             *     <enumeration value="UNK_18"/>
-             *     <enumeration value="UNK_19"/>
-             *     <enumeration value="UNK_20"/>
-             *     <enumeration value="UNK_21"/>
-             *     <enumeration value="UNK_22"/>
-             *     <enumeration value="UNK_23"/>
-             *     <enumeration value="UNK_24"/>
-             *     <enumeration value="UNK_25"/>
-             *     <enumeration value="UNK_26"/>
-             *     <enumeration value="UNK_27"/>
-             *     <enumeration value="UNK_28"/>
-             *     <enumeration value="UNK_29"/>
-             *     <enumeration value="UNK_30"/>
-             *     <enumeration value="UNK_31"/>
-             *     <enumeration value="UNK_32"/>
-             *     <enumeration value="UNK_33"/>
-             *     <enumeration value="UNK_34"/>
-             *     <enumeration value="UNK_35"/>
-             *     <enumeration value="UNK_36"/>
-             *     <enumeration value="UNK_100"/>
-             *     <enumeration value="UNK_101"/>
-             *     <enumeration value="UNK_102"/>
-             *     <enumeration value="UNK_200"/>
-             *   </restriction>
-             * </simpleType>
-             * 
- * - */ - @XmlType(name = "") - @XmlEnum - public enum DropCategory { - - DROP, - SPOIL, - UNK_1, - UNK_2, - UNK_3, - UNK_4, - UNK_5, - UNK_6, - UNK_7, - UNK_8, - UNK_9, - UNK_10, - UNK_11, - UNK_12, - UNK_13, - UNK_14, - UNK_15, - UNK_16, - UNK_17, - UNK_18, - UNK_19, - UNK_20, - UNK_21, - UNK_22, - UNK_23, - UNK_24, - UNK_25, - UNK_26, - UNK_27, - UNK_28, - UNK_29, - UNK_30, - UNK_31, - UNK_32, - UNK_33, - UNK_34, - UNK_35, - UNK_36, - UNK_100, - UNK_101, - UNK_102, - UNK_200; - - public String value() { - return name(); - } - - public static NPCTemplate.Droplist.Item.DropCategory fromValue(String v) { - return valueOf(v); - } - - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="name" minOccurs="0">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *                 <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="title" minOccurs="0">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *         <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
-     *         <element name="sex" type="{}ActorSexType" minOccurs="0"/>
-     *         <element name="stats">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="hp">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="mp">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="attack" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="physical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                             <element name="magical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                           </sequence>
-     *                           <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="defense" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="physical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                             <element name="magical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="move" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="base">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
-     *         <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *         <element name="item" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-     *                 <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="collision" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *       <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *       <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "name", - "title", - "level", - "race", - "sex", - "stats", - "experience", - "sp", - "item", - "collision" - }) - public static class Info { - - protected NPCTemplate.Info.Name name; - protected NPCTemplate.Info.Title title; - protected int level; - @XmlElement(type = String.class) - @XmlJavaTypeAdapter(NPCRaceAdapter.class) - protected NPCRace race; - @XmlElement(type = String.class) - @XmlJavaTypeAdapter(ActorSexAdapter.class) - protected ActorSex sex; - @XmlElement(required = true) - protected NPCTemplate.Info.Stats stats; - protected long experience; - protected int sp; - protected NPCTemplate.Info.Item item; - protected NPCTemplate.Info.Collision collision; - @XmlAttribute(name = "attackable", required = true) - protected boolean attackable; - @XmlAttribute(name = "targetable", required = true) - protected boolean targetable; - @XmlAttribute(name = "aggressive", required = true) - protected boolean aggressive; - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Name } - * - */ - public NPCTemplate.Info.Name getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Name } - * - */ - public void setName(NPCTemplate.Info.Name value) { - this.name = value; - } - - /** - * Gets the value of the title property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Title } - * - */ - public NPCTemplate.Info.Title getTitle() { - return title; - } - - /** - * Sets the value of the title property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Title } - * - */ - public void setTitle(NPCTemplate.Info.Title value) { - this.title = value; - } - - /** - * Gets the value of the level property. - * - */ - public int getLevel() { - return level; - } - - /** - * Sets the value of the level property. - * - */ - public void setLevel(int value) { - this.level = value; - } - - /** - * Gets the value of the race property. - * - * @return - * possible object is - * {@link String } - * - */ - public NPCRace getRace() { - return race; - } - - /** - * Sets the value of the race property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRace(NPCRace value) { - this.race = value; - } - - /** - * Gets the value of the sex property. - * - * @return - * possible object is - * {@link String } - * - */ - public ActorSex getSex() { - return sex; - } - - /** - * Sets the value of the sex property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSex(ActorSex value) { - this.sex = value; - } - - /** - * Gets the value of the stats property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats } - * - */ - public NPCTemplate.Info.Stats getStats() { - return stats; - } - - /** - * Sets the value of the stats property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats } - * - */ - public void setStats(NPCTemplate.Info.Stats value) { - this.stats = value; - } - - /** - * Gets the value of the experience property. - * - */ - public long getExperience() { - return experience; - } - - /** - * Sets the value of the experience property. - * - */ - public void setExperience(long value) { - this.experience = value; - } - - /** - * Gets the value of the sp property. - * - */ - public int getSp() { - return sp; - } - - /** - * Sets the value of the sp property. - * - */ - public void setSp(int value) { - this.sp = value; - } - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Item } - * - */ - public NPCTemplate.Info.Item getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Item } - * - */ - public void setItem(NPCTemplate.Info.Item value) { - this.item = value; - } - - /** - * Gets the value of the collision property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Collision } - * - */ - public NPCTemplate.Info.Collision getCollision() { - return collision; - } - - /** - * Sets the value of the collision property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Collision } - * - */ - public void setCollision(NPCTemplate.Info.Collision value) { - this.collision = value; - } - - /** - * Gets the value of the attackable property. - * - */ - public boolean isAttackable() { - return attackable; - } - - /** - * Sets the value of the attackable property. - * - */ - public void setAttackable(boolean value) { - this.attackable = value; - } - - /** - * Gets the value of the targetable property. - * - */ - public boolean isTargetable() { - return targetable; - } - - /** - * Sets the value of the targetable property. - * - */ - public void setTargetable(boolean value) { - this.targetable = value; - } - - /** - * Gets the value of the aggressive property. - * - */ - public boolean isAggressive() { - return aggressive; - } - - /** - * Sets the value of the aggressive property. - * - */ - public void setAggressive(boolean value) { - this.aggressive = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Collision { - - @XmlAttribute(name = "radius", required = true) - protected double radius; - @XmlAttribute(name = "heigth", required = true) - protected double heigth; - - /** - * Gets the value of the radius property. - * - */ - public double getRadius() { - return radius; - } - - /** - * Sets the value of the radius property. - * - */ - public void setRadius(double value) { - this.radius = value; - } - - /** - * Gets the value of the heigth property. - * - */ - public double getHeigth() { - return heigth; - } - - /** - * Sets the value of the heigth property. - * - */ - public void setHeigth(double value) { - this.heigth = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-         *       <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Item { - - @XmlAttribute(name = "rightHand") - @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) - protected ItemTemplateID rightHand; - @XmlAttribute(name = "leftHand") - @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) - protected ItemTemplateID leftHand; - - /** - * Gets the value of the rightHand property. - * - * @return - * possible object is - * {@link String } - * - */ - public ItemTemplateID getRightHand() { - return rightHand; - } - - /** - * Sets the value of the rightHand property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRightHand(ItemTemplateID value) { - this.rightHand = value; - } - - /** - * Gets the value of the leftHand property. - * - * @return - * possible object is - * {@link String } - * - */ - public ItemTemplateID getLeftHand() { - return leftHand; - } - - /** - * Sets the value of the leftHand property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLeftHand(ItemTemplateID value) { - this.leftHand = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-         *       <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Name { - - @XmlValue - protected String value; - @XmlAttribute(name = "send") - protected Boolean send; - @XmlAttribute(name = "display") - protected Boolean display; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the send property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isSend() { - return send; - } - - /** - * Sets the value of the send property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setSend(Boolean value) { - this.send = value; - } - - /** - * Gets the value of the display property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isDisplay() { - return display; - } - - /** - * Sets the value of the display property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setDisplay(Boolean value) { - this.display = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="hp">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="mp">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="attack" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="physical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                   <element name="magical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                 </sequence>
-         *                 <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="defense" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="physical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                   <element name="magical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="move" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="base">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "hp", - "mp", - "attack", - "defense", - "move", - "base" - }) - public static class Stats { - - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Hp hp; - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Mp mp; - protected NPCTemplate.Info.Stats.Attack attack; - protected NPCTemplate.Info.Stats.Defense defense; - protected NPCTemplate.Info.Stats.Move move; - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Base base; - - /** - * Gets the value of the hp property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Hp } - * - */ - public NPCTemplate.Info.Stats.Hp getHp() { - return hp; - } - - /** - * Sets the value of the hp property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Hp } - * - */ - public void setHp(NPCTemplate.Info.Stats.Hp value) { - this.hp = value; - } - - /** - * Gets the value of the mp property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Mp } - * - */ - public NPCTemplate.Info.Stats.Mp getMp() { - return mp; - } - - /** - * Sets the value of the mp property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Mp } - * - */ - public void setMp(NPCTemplate.Info.Stats.Mp value) { - this.mp = value; - } - - /** - * Gets the value of the attack property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Attack } - * - */ - public NPCTemplate.Info.Stats.Attack getAttack() { - return attack; - } - - /** - * Sets the value of the attack property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Attack } - * - */ - public void setAttack(NPCTemplate.Info.Stats.Attack value) { - this.attack = value; - } - - /** - * Gets the value of the defense property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Defense } - * - */ - public NPCTemplate.Info.Stats.Defense getDefense() { - return defense; - } - - /** - * Sets the value of the defense property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Defense } - * - */ - public void setDefense(NPCTemplate.Info.Stats.Defense value) { - this.defense = value; - } - - /** - * Gets the value of the move property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Move } - * - */ - public NPCTemplate.Info.Stats.Move getMove() { - return move; - } - - /** - * Sets the value of the move property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Move } - * - */ - public void setMove(NPCTemplate.Info.Stats.Move value) { - this.move = value; - } - - /** - * Gets the value of the base property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Base } - * - */ - public NPCTemplate.Info.Stats.Base getBase() { - return base; - } - - /** - * Sets the value of the base property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Base } - * - */ - public void setBase(NPCTemplate.Info.Stats.Base value) { - this.base = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="physical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *         <element name="magical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *       </sequence>
-             *       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "physical", - "magical" - }) - public static class Attack { - - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Attack.Physical physical; - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Attack.Magical magical; - @XmlAttribute(name = "range", required = true) - protected int range; - @XmlAttribute(name = "evasion", required = true) - protected int evasion; - @XmlAttribute(name = "critical", required = true) - protected int critical; - - /** - * Gets the value of the physical property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Attack.Physical } - * - */ - public NPCTemplate.Info.Stats.Attack.Physical getPhysical() { - return physical; - } - - /** - * Sets the value of the physical property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Attack.Physical } - * - */ - public void setPhysical(NPCTemplate.Info.Stats.Attack.Physical value) { - this.physical = value; - } - - /** - * Gets the value of the magical property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Attack.Magical } - * - */ - public NPCTemplate.Info.Stats.Attack.Magical getMagical() { - return magical; - } - - /** - * Sets the value of the magical property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Attack.Magical } - * - */ - public void setMagical(NPCTemplate.Info.Stats.Attack.Magical value) { - this.magical = value; - } - - /** - * Gets the value of the range property. - * - */ - public int getRange() { - return range; - } - - /** - * Sets the value of the range property. - * - */ - public void setRange(int value) { - this.range = value; - } - - /** - * Gets the value of the evasion property. - * - */ - public int getEvasion() { - return evasion; - } - - /** - * Sets the value of the evasion property. - * - */ - public void setEvasion(int value) { - this.evasion = value; - } - - /** - * Gets the value of the critical property. - * - */ - public int getCritical() { - return critical; - } - - /** - * Sets the value of the critical property. - * - */ - public void setCritical(int value) { - this.critical = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Magical { - - @XmlAttribute(name = "damage", required = true) - protected double damage; - @XmlAttribute(name = "speed", required = true) - protected double speed; - - /** - * Gets the value of the damage property. - * - */ - public double getDamage() { - return damage; - } - - /** - * Sets the value of the damage property. - * - */ - public void setDamage(double value) { - this.damage = value; - } - - /** - * Gets the value of the speed property. - * - */ - public double getSpeed() { - return speed; - } - - /** - * Sets the value of the speed property. - * - */ - public void setSpeed(double value) { - this.speed = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Physical { - - @XmlAttribute(name = "damage", required = true) - protected double damage; - @XmlAttribute(name = "speed", required = true) - protected double speed; - - /** - * Gets the value of the damage property. - * - */ - public double getDamage() { - return damage; - } - - /** - * Sets the value of the damage property. - * - */ - public void setDamage(double value) { - this.damage = value; - } - - /** - * Gets the value of the speed property. - * - */ - public double getSpeed() { - return speed; - } - - /** - * Sets the value of the speed property. - * - */ - public void setSpeed(double value) { - this.speed = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Base { - - @XmlAttribute(name = "int", required = true) - protected int _int; - @XmlAttribute(name = "str", required = true) - protected int str; - @XmlAttribute(name = "con", required = true) - protected int con; - @XmlAttribute(name = "men", required = true) - protected int men; - @XmlAttribute(name = "dex", required = true) - protected int dex; - @XmlAttribute(name = "wit", required = true) - protected int wit; - - /** - * Gets the value of the int property. - * - */ - public int getInt() { - return _int; - } - - /** - * Sets the value of the int property. - * - */ - public void setInt(int value) { - this._int = value; - } - - /** - * Gets the value of the str property. - * - */ - public int getStr() { - return str; - } - - /** - * Sets the value of the str property. - * - */ - public void setStr(int value) { - this.str = value; - } - - /** - * Gets the value of the con property. - * - */ - public int getCon() { - return con; - } - - /** - * Sets the value of the con property. - * - */ - public void setCon(int value) { - this.con = value; - } - - /** - * Gets the value of the men property. - * - */ - public int getMen() { - return men; - } - - /** - * Sets the value of the men property. - * - */ - public void setMen(int value) { - this.men = value; - } - - /** - * Gets the value of the dex property. - * - */ - public int getDex() { - return dex; - } - - /** - * Sets the value of the dex property. - * - */ - public void setDex(int value) { - this.dex = value; - } - - /** - * Gets the value of the wit property. - * - */ - public int getWit() { - return wit; - } - - /** - * Sets the value of the wit property. - * - */ - public void setWit(int value) { - this.wit = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="physical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *         <element name="magical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "physical", - "magical" - }) - public static class Defense { - - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Defense.Physical physical; - @XmlElement(required = true) - protected NPCTemplate.Info.Stats.Defense.Magical magical; - - /** - * Gets the value of the physical property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Defense.Physical } - * - */ - public NPCTemplate.Info.Stats.Defense.Physical getPhysical() { - return physical; - } - - /** - * Sets the value of the physical property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Defense.Physical } - * - */ - public void setPhysical(NPCTemplate.Info.Stats.Defense.Physical value) { - this.physical = value; - } - - /** - * Gets the value of the magical property. - * - * @return - * possible object is - * {@link NPCTemplate.Info.Stats.Defense.Magical } - * - */ - public NPCTemplate.Info.Stats.Defense.Magical getMagical() { - return magical; - } - - /** - * Sets the value of the magical property. - * - * @param value - * allowed object is - * {@link NPCTemplate.Info.Stats.Defense.Magical } - * - */ - public void setMagical(NPCTemplate.Info.Stats.Defense.Magical value) { - this.magical = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Magical { - - @XmlAttribute(name = "value", required = true) - protected double value; - - /** - * Gets the value of the value property. - * - */ - public double getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(double value) { - this.value = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Physical { - - @XmlAttribute(name = "value", required = true) - protected double value; - - /** - * Gets the value of the value property. - * - */ - public double getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(double value) { - this.value = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Hp { - - @XmlAttribute(name = "max", required = true) - protected double max; - @XmlAttribute(name = "regen", required = true) - protected double regen; - - /** - * Gets the value of the max property. - * - */ - public double getMax() { - return max; - } - - /** - * Sets the value of the max property. - * - */ - public void setMax(double value) { - this.max = value; - } - - /** - * Gets the value of the regen property. - * - */ - public double getRegen() { - return regen; - } - - /** - * Sets the value of the regen property. - * - */ - public void setRegen(double value) { - this.regen = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Move { - - @XmlAttribute(name = "run", required = true) - protected double run; - @XmlAttribute(name = "walk", required = true) - protected double walk; - - /** - * Gets the value of the run property. - * - */ - public double getRun() { - return run; - } - - /** - * Sets the value of the run property. - * - */ - public void setRun(double value) { - this.run = value; - } - - /** - * Gets the value of the walk property. - * - */ - public double getWalk() { - return walk; - } - - /** - * Sets the value of the walk property. - * - */ - public void setWalk(double value) { - this.walk = value; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Mp { - - @XmlAttribute(name = "max", required = true) - protected double max; - @XmlAttribute(name = "regen", required = true) - protected double regen; - - /** - * Gets the value of the max property. - * - */ - public double getMax() { - return max; - } - - /** - * Sets the value of the max property. - * - */ - public void setMax(double value) { - this.max = value; - } - - /** - * Gets the value of the regen property. - * - */ - public double getRegen() { - return regen; - } - - /** - * Sets the value of the regen property. - * - */ - public void setRegen(double value) { - this.regen = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Title { - - @XmlValue - protected String value; - @XmlAttribute(name = "send") - protected Boolean send; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the send property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isSend() { - return send; - } - - /** - * Sets the value of the send property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setSend(Boolean value) { - this.send = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="skill" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
-     *                 <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "skill" - }) - public static class Skills { - - @XmlElement(required = true) - protected List skill; - - /** - * Gets the value of the skill property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the skill property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getSkill().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link NPCTemplate.Skills.Skill } - * - * - */ - public List getSkill() { - if (skill == null) { - skill = new ArrayList(); - } - return this.skill; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
-         *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Skill { - - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) - protected SkillTemplateID id; - @XmlAttribute(name = "level", required = true) - protected int level; - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public SkillTemplateID getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(SkillTemplateID value) { - this.id = value; - } - - /** - * Gets the value of the level property. - * - */ - public int getLevel() { - return level; - } - - /** - * Sets the value of the level property. - * - */ - public void setLevel(int value) { - this.level = value; - } - - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="chat" maxOccurs="unbounded">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "chat" - }) - public static class Talk { - - @XmlElement(required = true) - protected List chat; - @XmlAttribute(name = "default", required = true) - protected String _default; - - /** - * Gets the value of the chat property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the chat property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getChat().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link NPCTemplate.Talk.Chat } - * - * - */ - public List getChat() { - if (chat == null) { - chat = new ArrayList(); - } - return this.chat; - } - - /** - * Gets the value of the default property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDefault() { - return _default; - } - - /** - * Sets the value of the default property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDefault(String value) { - this._default = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Chat { - - @XmlValue - protected String value; - @XmlAttribute(name = "id", required = true) - protected String id; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - } - - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import com.l2jserver.model.id.template.ItemTemplateID; +import com.l2jserver.model.id.template.NPCTemplateID; +import com.l2jserver.model.id.template.SkillTemplateID; +import com.l2jserver.model.template.actor.ActorSex; +import com.l2jserver.model.template.npc.NPCRace; +import com.l2jserver.util.jaxb.ActorSexAdapter; +import com.l2jserver.util.jaxb.ClassAdapter; +import com.l2jserver.util.jaxb.ItemTemplateIDAdapter; +import com.l2jserver.util.jaxb.NPCRaceAdapter; +import com.l2jserver.util.jaxb.NPCTemplateIDAdapter; +import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; + + +/** + *

Java class for npc element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="npc">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}ActorTemplate">
+ *         <sequence>
+ *           <element name="info">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="name" minOccurs="0">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                             <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="title" minOccurs="0">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                     <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
+ *                     <element name="sex" type="{}ActorSexType" minOccurs="0"/>
+ *                     <element name="stats">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <element name="hp">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="mp">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="attack" minOccurs="0">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                         <element name="physical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                         <element name="magical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                       </sequence>
+ *                                       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="defense" minOccurs="0">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                         <element name="physical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                         <element name="magical">
+ *                                           <complexType>
+ *                                             <complexContent>
+ *                                               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                                 <sequence>
+ *                                                 </sequence>
+ *                                                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                               </restriction>
+ *                                             </complexContent>
+ *                                           </complexType>
+ *                                         </element>
+ *                                       </sequence>
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="move" minOccurs="0">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="base">
+ *                                 <complexType>
+ *                                   <complexContent>
+ *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                       <sequence>
+ *                                       </sequence>
+ *                                       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                     </restriction>
+ *                                   </complexContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </sequence>
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
+ *                     <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                     <element name="item" minOccurs="0">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *                             <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                     <element name="collision" minOccurs="0">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                             <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="ai" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                   </sequence>
+ *                   <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="talk" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="chat" maxOccurs="unbounded">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="droplist" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="item" maxOccurs="unbounded">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+ *                             <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                             <attribute name="category" use="required">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <enumeration value="DROP"/>
+ *                                   <enumeration value="SPOIL"/>
+ *                                   <enumeration value="UNK_1"/>
+ *                                   <enumeration value="UNK_2"/>
+ *                                   <enumeration value="UNK_3"/>
+ *                                   <enumeration value="UNK_4"/>
+ *                                   <enumeration value="UNK_5"/>
+ *                                   <enumeration value="UNK_6"/>
+ *                                   <enumeration value="UNK_7"/>
+ *                                   <enumeration value="UNK_8"/>
+ *                                   <enumeration value="UNK_9"/>
+ *                                   <enumeration value="UNK_10"/>
+ *                                   <enumeration value="UNK_11"/>
+ *                                   <enumeration value="UNK_12"/>
+ *                                   <enumeration value="UNK_13"/>
+ *                                   <enumeration value="UNK_14"/>
+ *                                   <enumeration value="UNK_15"/>
+ *                                   <enumeration value="UNK_16"/>
+ *                                   <enumeration value="UNK_17"/>
+ *                                   <enumeration value="UNK_18"/>
+ *                                   <enumeration value="UNK_19"/>
+ *                                   <enumeration value="UNK_20"/>
+ *                                   <enumeration value="UNK_21"/>
+ *                                   <enumeration value="UNK_22"/>
+ *                                   <enumeration value="UNK_23"/>
+ *                                   <enumeration value="UNK_24"/>
+ *                                   <enumeration value="UNK_25"/>
+ *                                   <enumeration value="UNK_26"/>
+ *                                   <enumeration value="UNK_27"/>
+ *                                   <enumeration value="UNK_28"/>
+ *                                   <enumeration value="UNK_29"/>
+ *                                   <enumeration value="UNK_30"/>
+ *                                   <enumeration value="UNK_31"/>
+ *                                   <enumeration value="UNK_32"/>
+ *                                   <enumeration value="UNK_33"/>
+ *                                   <enumeration value="UNK_34"/>
+ *                                   <enumeration value="UNK_35"/>
+ *                                   <enumeration value="UNK_36"/>
+ *                                   <enumeration value="UNK_100"/>
+ *                                   <enumeration value="UNK_101"/>
+ *                                   <enumeration value="UNK_102"/>
+ *                                   <enumeration value="UNK_200"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </attribute>
+ *                             <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="skills" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="skill" maxOccurs="unbounded">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                             </sequence>
+ *                             <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+ *                             <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *         </sequence>
+ *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/npc}NPCTemplateID" />
+ *         <attribute name="controller" use="required">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             </restriction>
+ *           </simpleType>
+ *         </attribute>
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "info", + "ai", + "talk", + "droplist", + "skills" +}) +@XmlRootElement(name = "npc", namespace = "http://schemas.l2jserver2.com/npc") +public class NPCTemplate + extends ActorTemplate +{ + + @XmlElement(required = true) + protected NPCTemplate.Info info; + protected NPCTemplate.Ai ai; + protected NPCTemplate.Talk talk; + protected NPCTemplate.Droplist droplist; + protected NPCTemplate.Skills skills; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(NPCTemplateIDAdapter.class) + protected NPCTemplateID id; + @XmlAttribute(name = "controller", required = true) + @XmlJavaTypeAdapter(ClassAdapter.class) + protected Class controller; + + /** + * Gets the value of the info property. + * + * @return + * possible object is + * {@link NPCTemplate.Info } + * + */ + public NPCTemplate.Info getInfo() { + return info; + } + + /** + * Sets the value of the info property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info } + * + */ + public void setInfo(NPCTemplate.Info value) { + this.info = value; + } + + /** + * Gets the value of the ai property. + * + * @return + * possible object is + * {@link NPCTemplate.Ai } + * + */ + public NPCTemplate.Ai getAi() { + return ai; + } + + /** + * Sets the value of the ai property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Ai } + * + */ + public void setAi(NPCTemplate.Ai value) { + this.ai = value; + } + + /** + * Gets the value of the talk property. + * + * @return + * possible object is + * {@link NPCTemplate.Talk } + * + */ + public NPCTemplate.Talk getTalk() { + return talk; + } + + /** + * Sets the value of the talk property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Talk } + * + */ + public void setTalk(NPCTemplate.Talk value) { + this.talk = value; + } + + /** + * Gets the value of the droplist property. + * + * @return + * possible object is + * {@link NPCTemplate.Droplist } + * + */ + public NPCTemplate.Droplist getDroplist() { + return droplist; + } + + /** + * Sets the value of the droplist property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Droplist } + * + */ + public void setDroplist(NPCTemplate.Droplist value) { + this.droplist = value; + } + + /** + * Gets the value of the skills property. + * + * @return + * possible object is + * {@link NPCTemplate.Skills } + * + */ + public NPCTemplate.Skills getSkills() { + return skills; + } + + /** + * Sets the value of the skills property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Skills } + * + */ + public void setSkills(NPCTemplate.Skills value) { + this.skills = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public NPCTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(NPCTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the controller property. + * + * @return + * possible object is + * {@link String } + * + */ + public Class getController() { + return controller; + } + + /** + * Sets the value of the controller property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setController(Class value) { + this.controller = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *       </sequence>
+     *       <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Ai { + + @XmlAttribute(name = "script", required = true) + protected String script; + + /** + * Gets the value of the script property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScript() { + return script; + } + + /** + * Sets the value of the script property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScript(String value) { + this.script = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="item" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+     *                 <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                 <attribute name="category" use="required">
+     *                   <simpleType>
+     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                       <enumeration value="DROP"/>
+     *                       <enumeration value="SPOIL"/>
+     *                       <enumeration value="UNK_1"/>
+     *                       <enumeration value="UNK_2"/>
+     *                       <enumeration value="UNK_3"/>
+     *                       <enumeration value="UNK_4"/>
+     *                       <enumeration value="UNK_5"/>
+     *                       <enumeration value="UNK_6"/>
+     *                       <enumeration value="UNK_7"/>
+     *                       <enumeration value="UNK_8"/>
+     *                       <enumeration value="UNK_9"/>
+     *                       <enumeration value="UNK_10"/>
+     *                       <enumeration value="UNK_11"/>
+     *                       <enumeration value="UNK_12"/>
+     *                       <enumeration value="UNK_13"/>
+     *                       <enumeration value="UNK_14"/>
+     *                       <enumeration value="UNK_15"/>
+     *                       <enumeration value="UNK_16"/>
+     *                       <enumeration value="UNK_17"/>
+     *                       <enumeration value="UNK_18"/>
+     *                       <enumeration value="UNK_19"/>
+     *                       <enumeration value="UNK_20"/>
+     *                       <enumeration value="UNK_21"/>
+     *                       <enumeration value="UNK_22"/>
+     *                       <enumeration value="UNK_23"/>
+     *                       <enumeration value="UNK_24"/>
+     *                       <enumeration value="UNK_25"/>
+     *                       <enumeration value="UNK_26"/>
+     *                       <enumeration value="UNK_27"/>
+     *                       <enumeration value="UNK_28"/>
+     *                       <enumeration value="UNK_29"/>
+     *                       <enumeration value="UNK_30"/>
+     *                       <enumeration value="UNK_31"/>
+     *                       <enumeration value="UNK_32"/>
+     *                       <enumeration value="UNK_33"/>
+     *                       <enumeration value="UNK_34"/>
+     *                       <enumeration value="UNK_35"/>
+     *                       <enumeration value="UNK_36"/>
+     *                       <enumeration value="UNK_100"/>
+     *                       <enumeration value="UNK_101"/>
+     *                       <enumeration value="UNK_102"/>
+     *                       <enumeration value="UNK_200"/>
+     *                     </restriction>
+     *                   </simpleType>
+     *                 </attribute>
+     *                 <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "item" + }) + public static class Droplist { + + @XmlElement(required = true) + protected List item; + + /** + * Gets the value of the item property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the item property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getItem().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link NPCTemplate.Droplist.Item } + * + * + */ + public List getItem() { + if (item == null) { + item = new ArrayList(); + } + return this.item; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+         *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="category" use="required">
+         *         <simpleType>
+         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *             <enumeration value="DROP"/>
+         *             <enumeration value="SPOIL"/>
+         *             <enumeration value="UNK_1"/>
+         *             <enumeration value="UNK_2"/>
+         *             <enumeration value="UNK_3"/>
+         *             <enumeration value="UNK_4"/>
+         *             <enumeration value="UNK_5"/>
+         *             <enumeration value="UNK_6"/>
+         *             <enumeration value="UNK_7"/>
+         *             <enumeration value="UNK_8"/>
+         *             <enumeration value="UNK_9"/>
+         *             <enumeration value="UNK_10"/>
+         *             <enumeration value="UNK_11"/>
+         *             <enumeration value="UNK_12"/>
+         *             <enumeration value="UNK_13"/>
+         *             <enumeration value="UNK_14"/>
+         *             <enumeration value="UNK_15"/>
+         *             <enumeration value="UNK_16"/>
+         *             <enumeration value="UNK_17"/>
+         *             <enumeration value="UNK_18"/>
+         *             <enumeration value="UNK_19"/>
+         *             <enumeration value="UNK_20"/>
+         *             <enumeration value="UNK_21"/>
+         *             <enumeration value="UNK_22"/>
+         *             <enumeration value="UNK_23"/>
+         *             <enumeration value="UNK_24"/>
+         *             <enumeration value="UNK_25"/>
+         *             <enumeration value="UNK_26"/>
+         *             <enumeration value="UNK_27"/>
+         *             <enumeration value="UNK_28"/>
+         *             <enumeration value="UNK_29"/>
+         *             <enumeration value="UNK_30"/>
+         *             <enumeration value="UNK_31"/>
+         *             <enumeration value="UNK_32"/>
+         *             <enumeration value="UNK_33"/>
+         *             <enumeration value="UNK_34"/>
+         *             <enumeration value="UNK_35"/>
+         *             <enumeration value="UNK_36"/>
+         *             <enumeration value="UNK_100"/>
+         *             <enumeration value="UNK_101"/>
+         *             <enumeration value="UNK_102"/>
+         *             <enumeration value="UNK_200"/>
+         *           </restriction>
+         *         </simpleType>
+         *       </attribute>
+         *       <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Item { + + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID id; + @XmlAttribute(name = "min", required = true) + protected int min; + @XmlAttribute(name = "max", required = true) + protected int max; + @XmlAttribute(name = "category", required = true) + protected NPCTemplate.Droplist.Item.DropCategory category; + @XmlAttribute(name = "chance", required = true) + protected int chance; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(ItemTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the min property. + * + */ + public int getMin() { + return min; + } + + /** + * Sets the value of the min property. + * + */ + public void setMin(int value) { + this.min = value; + } + + /** + * Gets the value of the max property. + * + */ + public int getMax() { + return max; + } + + /** + * Sets the value of the max property. + * + */ + public void setMax(int value) { + this.max = value; + } + + /** + * Gets the value of the category property. + * + * @return + * possible object is + * {@link NPCTemplate.Droplist.Item.DropCategory } + * + */ + public NPCTemplate.Droplist.Item.DropCategory getCategory() { + return category; + } + + /** + * Sets the value of the category property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Droplist.Item.DropCategory } + * + */ + public void setCategory(NPCTemplate.Droplist.Item.DropCategory value) { + this.category = value; + } + + /** + * Gets the value of the chance property. + * + */ + public int getChance() { + return chance; + } + + /** + * Sets the value of the chance property. + * + */ + public void setChance(int value) { + this.chance = value; + } + + + /** + *

Java class for null. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+             * <simpleType>
+             *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *     <enumeration value="DROP"/>
+             *     <enumeration value="SPOIL"/>
+             *     <enumeration value="UNK_1"/>
+             *     <enumeration value="UNK_2"/>
+             *     <enumeration value="UNK_3"/>
+             *     <enumeration value="UNK_4"/>
+             *     <enumeration value="UNK_5"/>
+             *     <enumeration value="UNK_6"/>
+             *     <enumeration value="UNK_7"/>
+             *     <enumeration value="UNK_8"/>
+             *     <enumeration value="UNK_9"/>
+             *     <enumeration value="UNK_10"/>
+             *     <enumeration value="UNK_11"/>
+             *     <enumeration value="UNK_12"/>
+             *     <enumeration value="UNK_13"/>
+             *     <enumeration value="UNK_14"/>
+             *     <enumeration value="UNK_15"/>
+             *     <enumeration value="UNK_16"/>
+             *     <enumeration value="UNK_17"/>
+             *     <enumeration value="UNK_18"/>
+             *     <enumeration value="UNK_19"/>
+             *     <enumeration value="UNK_20"/>
+             *     <enumeration value="UNK_21"/>
+             *     <enumeration value="UNK_22"/>
+             *     <enumeration value="UNK_23"/>
+             *     <enumeration value="UNK_24"/>
+             *     <enumeration value="UNK_25"/>
+             *     <enumeration value="UNK_26"/>
+             *     <enumeration value="UNK_27"/>
+             *     <enumeration value="UNK_28"/>
+             *     <enumeration value="UNK_29"/>
+             *     <enumeration value="UNK_30"/>
+             *     <enumeration value="UNK_31"/>
+             *     <enumeration value="UNK_32"/>
+             *     <enumeration value="UNK_33"/>
+             *     <enumeration value="UNK_34"/>
+             *     <enumeration value="UNK_35"/>
+             *     <enumeration value="UNK_36"/>
+             *     <enumeration value="UNK_100"/>
+             *     <enumeration value="UNK_101"/>
+             *     <enumeration value="UNK_102"/>
+             *     <enumeration value="UNK_200"/>
+             *   </restriction>
+             * </simpleType>
+             * 
+ * + */ + @XmlType(name = "") + @XmlEnum + public enum DropCategory { + + DROP, + SPOIL, + UNK_1, + UNK_2, + UNK_3, + UNK_4, + UNK_5, + UNK_6, + UNK_7, + UNK_8, + UNK_9, + UNK_10, + UNK_11, + UNK_12, + UNK_13, + UNK_14, + UNK_15, + UNK_16, + UNK_17, + UNK_18, + UNK_19, + UNK_20, + UNK_21, + UNK_22, + UNK_23, + UNK_24, + UNK_25, + UNK_26, + UNK_27, + UNK_28, + UNK_29, + UNK_30, + UNK_31, + UNK_32, + UNK_33, + UNK_34, + UNK_35, + UNK_36, + UNK_100, + UNK_101, + UNK_102, + UNK_200; + + public String value() { + return name(); + } + + public static NPCTemplate.Droplist.Item.DropCategory fromValue(String v) { + return valueOf(v); + } + + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="name" minOccurs="0">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *                 <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="title" minOccurs="0">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
+     *         <element name="sex" type="{}ActorSexType" minOccurs="0"/>
+     *         <element name="stats">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="hp">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="mp">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="attack" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="physical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                             <element name="magical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                           </sequence>
+     *                           <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="defense" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="physical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                             <element name="magical">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                     </sequence>
+     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="move" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                           <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                   <element name="base">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                           </sequence>
+     *                           <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
+     *         <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="item" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+     *                 <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="collision" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *       <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *       <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "name", + "title", + "level", + "race", + "sex", + "stats", + "experience", + "sp", + "item", + "collision" + }) + public static class Info { + + protected NPCTemplate.Info.Name name; + protected NPCTemplate.Info.Title title; + protected int level; + @XmlElement(type = String.class) + @XmlJavaTypeAdapter(NPCRaceAdapter.class) + protected NPCRace race; + @XmlElement(type = String.class) + @XmlJavaTypeAdapter(ActorSexAdapter.class) + protected ActorSex sex; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats stats; + protected long experience; + protected int sp; + protected NPCTemplate.Info.Item item; + protected NPCTemplate.Info.Collision collision; + @XmlAttribute(name = "attackable", required = true) + protected boolean attackable; + @XmlAttribute(name = "targetable", required = true) + protected boolean targetable; + @XmlAttribute(name = "aggressive", required = true) + protected boolean aggressive; + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Name } + * + */ + public NPCTemplate.Info.Name getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Name } + * + */ + public void setName(NPCTemplate.Info.Name value) { + this.name = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Title } + * + */ + public NPCTemplate.Info.Title getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Title } + * + */ + public void setTitle(NPCTemplate.Info.Title value) { + this.title = value; + } + + /** + * Gets the value of the level property. + * + */ + public int getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + */ + public void setLevel(int value) { + this.level = value; + } + + /** + * Gets the value of the race property. + * + * @return + * possible object is + * {@link String } + * + */ + public NPCRace getRace() { + return race; + } + + /** + * Sets the value of the race property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRace(NPCRace value) { + this.race = value; + } + + /** + * Gets the value of the sex property. + * + * @return + * possible object is + * {@link String } + * + */ + public ActorSex getSex() { + return sex; + } + + /** + * Sets the value of the sex property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSex(ActorSex value) { + this.sex = value; + } + + /** + * Gets the value of the stats property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats } + * + */ + public NPCTemplate.Info.Stats getStats() { + return stats; + } + + /** + * Sets the value of the stats property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats } + * + */ + public void setStats(NPCTemplate.Info.Stats value) { + this.stats = value; + } + + /** + * Gets the value of the experience property. + * + */ + public long getExperience() { + return experience; + } + + /** + * Sets the value of the experience property. + * + */ + public void setExperience(long value) { + this.experience = value; + } + + /** + * Gets the value of the sp property. + * + */ + public int getSp() { + return sp; + } + + /** + * Sets the value of the sp property. + * + */ + public void setSp(int value) { + this.sp = value; + } + + /** + * Gets the value of the item property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Item } + * + */ + public NPCTemplate.Info.Item getItem() { + return item; + } + + /** + * Sets the value of the item property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Item } + * + */ + public void setItem(NPCTemplate.Info.Item value) { + this.item = value; + } + + /** + * Gets the value of the collision property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Collision } + * + */ + public NPCTemplate.Info.Collision getCollision() { + return collision; + } + + /** + * Sets the value of the collision property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Collision } + * + */ + public void setCollision(NPCTemplate.Info.Collision value) { + this.collision = value; + } + + /** + * Gets the value of the attackable property. + * + */ + public boolean isAttackable() { + return attackable; + } + + /** + * Sets the value of the attackable property. + * + */ + public void setAttackable(boolean value) { + this.attackable = value; + } + + /** + * Gets the value of the targetable property. + * + */ + public boolean isTargetable() { + return targetable; + } + + /** + * Sets the value of the targetable property. + * + */ + public void setTargetable(boolean value) { + this.targetable = value; + } + + /** + * Gets the value of the aggressive property. + * + */ + public boolean isAggressive() { + return aggressive; + } + + /** + * Sets the value of the aggressive property. + * + */ + public void setAggressive(boolean value) { + this.aggressive = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Collision { + + @XmlAttribute(name = "radius", required = true) + protected double radius; + @XmlAttribute(name = "heigth", required = true) + protected double heigth; + + /** + * Gets the value of the radius property. + * + */ + public double getRadius() { + return radius; + } + + /** + * Sets the value of the radius property. + * + */ + public void setRadius(double value) { + this.radius = value; + } + + /** + * Gets the value of the heigth property. + * + */ + public double getHeigth() { + return heigth; + } + + /** + * Sets the value of the heigth property. + * + */ + public void setHeigth(double value) { + this.heigth = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+         *       <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Item { + + @XmlAttribute(name = "rightHand") + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID rightHand; + @XmlAttribute(name = "leftHand") + @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class) + protected ItemTemplateID leftHand; + + /** + * Gets the value of the rightHand property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getRightHand() { + return rightHand; + } + + /** + * Sets the value of the rightHand property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRightHand(ItemTemplateID value) { + this.rightHand = value; + } + + /** + * Gets the value of the leftHand property. + * + * @return + * possible object is + * {@link String } + * + */ + public ItemTemplateID getLeftHand() { + return leftHand; + } + + /** + * Sets the value of the leftHand property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLeftHand(ItemTemplateID value) { + this.leftHand = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *       <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Name { + + @XmlValue + protected String value; + @XmlAttribute(name = "send") + protected Boolean send; + @XmlAttribute(name = "display") + protected Boolean display; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the send property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isSend() { + return send; + } + + /** + * Sets the value of the send property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setSend(Boolean value) { + this.send = value; + } + + /** + * Gets the value of the display property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isDisplay() { + return display; + } + + /** + * Sets the value of the display property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setDisplay(Boolean value) { + this.display = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="hp">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="mp">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="attack" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="physical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                   <element name="magical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                 </sequence>
+         *                 <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="defense" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="physical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                   <element name="magical">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                           </sequence>
+         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="move" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *         <element name="base">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                 </sequence>
+         *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "hp", + "mp", + "attack", + "defense", + "move", + "base" + }) + public static class Stats { + + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Hp hp; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Mp mp; + protected NPCTemplate.Info.Stats.Attack attack; + protected NPCTemplate.Info.Stats.Defense defense; + protected NPCTemplate.Info.Stats.Move move; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Base base; + + /** + * Gets the value of the hp property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Hp } + * + */ + public NPCTemplate.Info.Stats.Hp getHp() { + return hp; + } + + /** + * Sets the value of the hp property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Hp } + * + */ + public void setHp(NPCTemplate.Info.Stats.Hp value) { + this.hp = value; + } + + /** + * Gets the value of the mp property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Mp } + * + */ + public NPCTemplate.Info.Stats.Mp getMp() { + return mp; + } + + /** + * Sets the value of the mp property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Mp } + * + */ + public void setMp(NPCTemplate.Info.Stats.Mp value) { + this.mp = value; + } + + /** + * Gets the value of the attack property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Attack } + * + */ + public NPCTemplate.Info.Stats.Attack getAttack() { + return attack; + } + + /** + * Sets the value of the attack property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Attack } + * + */ + public void setAttack(NPCTemplate.Info.Stats.Attack value) { + this.attack = value; + } + + /** + * Gets the value of the defense property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Defense } + * + */ + public NPCTemplate.Info.Stats.Defense getDefense() { + return defense; + } + + /** + * Sets the value of the defense property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Defense } + * + */ + public void setDefense(NPCTemplate.Info.Stats.Defense value) { + this.defense = value; + } + + /** + * Gets the value of the move property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Move } + * + */ + public NPCTemplate.Info.Stats.Move getMove() { + return move; + } + + /** + * Sets the value of the move property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Move } + * + */ + public void setMove(NPCTemplate.Info.Stats.Move value) { + this.move = value; + } + + /** + * Gets the value of the base property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Base } + * + */ + public NPCTemplate.Info.Stats.Base getBase() { + return base; + } + + /** + * Sets the value of the base property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Base } + * + */ + public void setBase(NPCTemplate.Info.Stats.Base value) { + this.base = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="physical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="magical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *       </sequence>
+             *       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Attack { + + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Attack.Physical physical; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Attack.Magical magical; + @XmlAttribute(name = "range", required = true) + protected int range; + @XmlAttribute(name = "evasion", required = true) + protected int evasion; + @XmlAttribute(name = "critical", required = true) + protected int critical; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Attack.Physical } + * + */ + public NPCTemplate.Info.Stats.Attack.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Attack.Physical } + * + */ + public void setPhysical(NPCTemplate.Info.Stats.Attack.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Attack.Magical } + * + */ + public NPCTemplate.Info.Stats.Attack.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Attack.Magical } + * + */ + public void setMagical(NPCTemplate.Info.Stats.Attack.Magical value) { + this.magical = value; + } + + /** + * Gets the value of the range property. + * + */ + public int getRange() { + return range; + } + + /** + * Sets the value of the range property. + * + */ + public void setRange(int value) { + this.range = value; + } + + /** + * Gets the value of the evasion property. + * + */ + public int getEvasion() { + return evasion; + } + + /** + * Sets the value of the evasion property. + * + */ + public void setEvasion(int value) { + this.evasion = value; + } + + /** + * Gets the value of the critical property. + * + */ + public int getCritical() { + return critical; + } + + /** + * Sets the value of the critical property. + * + */ + public void setCritical(int value) { + this.critical = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "damage", required = true) + protected double damage; + @XmlAttribute(name = "speed", required = true) + protected double speed; + + /** + * Gets the value of the damage property. + * + */ + public double getDamage() { + return damage; + } + + /** + * Sets the value of the damage property. + * + */ + public void setDamage(double value) { + this.damage = value; + } + + /** + * Gets the value of the speed property. + * + */ + public double getSpeed() { + return speed; + } + + /** + * Sets the value of the speed property. + * + */ + public void setSpeed(double value) { + this.speed = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Base { + + @XmlAttribute(name = "int", required = true) + protected int _int; + @XmlAttribute(name = "str", required = true) + protected int str; + @XmlAttribute(name = "con", required = true) + protected int con; + @XmlAttribute(name = "men", required = true) + protected int men; + @XmlAttribute(name = "dex", required = true) + protected int dex; + @XmlAttribute(name = "wit", required = true) + protected int wit; + + /** + * Gets the value of the int property. + * + */ + public int getInt() { + return _int; + } + + /** + * Sets the value of the int property. + * + */ + public void setInt(int value) { + this._int = value; + } + + /** + * Gets the value of the str property. + * + */ + public int getStr() { + return str; + } + + /** + * Sets the value of the str property. + * + */ + public void setStr(int value) { + this.str = value; + } + + /** + * Gets the value of the con property. + * + */ + public int getCon() { + return con; + } + + /** + * Sets the value of the con property. + * + */ + public void setCon(int value) { + this.con = value; + } + + /** + * Gets the value of the men property. + * + */ + public int getMen() { + return men; + } + + /** + * Sets the value of the men property. + * + */ + public void setMen(int value) { + this.men = value; + } + + /** + * Gets the value of the dex property. + * + */ + public int getDex() { + return dex; + } + + /** + * Sets the value of the dex property. + * + */ + public void setDex(int value) { + this.dex = value; + } + + /** + * Gets the value of the wit property. + * + */ + public int getWit() { + return wit; + } + + /** + * Sets the value of the wit property. + * + */ + public void setWit(int value) { + this.wit = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="physical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="magical">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                 </sequence>
+             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "physical", + "magical" + }) + public static class Defense { + + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Defense.Physical physical; + @XmlElement(required = true) + protected NPCTemplate.Info.Stats.Defense.Magical magical; + + /** + * Gets the value of the physical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Defense.Physical } + * + */ + public NPCTemplate.Info.Stats.Defense.Physical getPhysical() { + return physical; + } + + /** + * Sets the value of the physical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Defense.Physical } + * + */ + public void setPhysical(NPCTemplate.Info.Stats.Defense.Physical value) { + this.physical = value; + } + + /** + * Gets the value of the magical property. + * + * @return + * possible object is + * {@link NPCTemplate.Info.Stats.Defense.Magical } + * + */ + public NPCTemplate.Info.Stats.Defense.Magical getMagical() { + return magical; + } + + /** + * Sets the value of the magical property. + * + * @param value + * allowed object is + * {@link NPCTemplate.Info.Stats.Defense.Magical } + * + */ + public void setMagical(NPCTemplate.Info.Stats.Defense.Magical value) { + this.magical = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Magical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *       </sequence>
+                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Physical { + + @XmlAttribute(name = "value", required = true) + protected double value; + + /** + * Gets the value of the value property. + * + */ + public double getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(double value) { + this.value = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Hp { + + @XmlAttribute(name = "max", required = true) + protected double max; + @XmlAttribute(name = "regen", required = true) + protected double regen; + + /** + * Gets the value of the max property. + * + */ + public double getMax() { + return max; + } + + /** + * Sets the value of the max property. + * + */ + public void setMax(double value) { + this.max = value; + } + + /** + * Gets the value of the regen property. + * + */ + public double getRegen() { + return regen; + } + + /** + * Sets the value of the regen property. + * + */ + public void setRegen(double value) { + this.regen = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Move { + + @XmlAttribute(name = "run", required = true) + protected double run; + @XmlAttribute(name = "walk", required = true) + protected double walk; + + /** + * Gets the value of the run property. + * + */ + public double getRun() { + return run; + } + + /** + * Sets the value of the run property. + * + */ + public void setRun(double value) { + this.run = value; + } + + /** + * Gets the value of the walk property. + * + */ + public double getWalk() { + return walk; + } + + /** + * Sets the value of the walk property. + * + */ + public void setWalk(double value) { + this.walk = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *       </sequence>
+             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Mp { + + @XmlAttribute(name = "max", required = true) + protected double max; + @XmlAttribute(name = "regen", required = true) + protected double regen; + + /** + * Gets the value of the max property. + * + */ + public double getMax() { + return max; + } + + /** + * Sets the value of the max property. + * + */ + public void setMax(double value) { + this.max = value; + } + + /** + * Gets the value of the regen property. + * + */ + public double getRegen() { + return regen; + } + + /** + * Sets the value of the regen property. + * + */ + public void setRegen(double value) { + this.regen = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Title { + + @XmlValue + protected String value; + @XmlAttribute(name = "send") + protected Boolean send; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the send property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isSend() { + return send; + } + + /** + * Sets the value of the send property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setSend(Boolean value) { + this.send = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="skill" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                 </sequence>
+     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+     *                 <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "skill" + }) + public static class Skills { + + @XmlElement(required = true) + protected List skill; + + /** + * Gets the value of the skill property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the skill property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getSkill().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link NPCTemplate.Skills.Skill } + * + * + */ + public List getSkill() { + if (skill == null) { + skill = new ArrayList(); + } + return this.skill; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *       </sequence>
+         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+         *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Skill { + + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) + protected SkillTemplateID id; + @XmlAttribute(name = "level", required = true) + protected int level; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public SkillTemplateID getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(SkillTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the level property. + * + */ + public int getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + */ + public void setLevel(int value) { + this.level = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="chat" maxOccurs="unbounded">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "chat" + }) + public static class Talk { + + @XmlElement(required = true) + protected List chat; + @XmlAttribute(name = "default", required = true) + protected String _default; + + /** + * Gets the value of the chat property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the chat property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getChat().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link NPCTemplate.Talk.Chat } + * + * + */ + public List getChat() { + if (chat == null) { + chat = new ArrayList(); + } + return this.chat; + } + + /** + * Gets the value of the default property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDefault() { + return _default; + } + + /** + * Sets the value of the default property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDefault(String value) { + this._default = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Chat { + + @XmlValue + protected String value; + @XmlAttribute(name = "id", required = true) + protected String id; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ObjectFactory.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ObjectFactory.java index 39ffc9bc9..90465314b 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ObjectFactory.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ObjectFactory.java @@ -1,535 +1,535 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the com.l2jserver.model.template package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link NPCTemplate } - * - */ - public NPCTemplate createNPCTemplate() { - return new NPCTemplate(); - } - - /** - * Create an instance of {@link NPCTemplate.Droplist } - * - */ - public NPCTemplate.Droplist createNPCTemplateDroplist() { - return new NPCTemplate.Droplist(); - } - - /** - * Create an instance of {@link NPCTemplate.Droplist.Item } - * - */ - public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() { - return new NPCTemplate.Droplist.Item(); - } - - /** - * Create an instance of {@link Teleports } - * - */ - public Teleports createTeleports() { - return new Teleports(); - } - - /** - * Create an instance of {@link Zones } - * - */ - public Zones createZones() { - return new Zones(); - } - - /** - * Create an instance of {@link ZoneType } - * - */ - public ZoneType createZoneType() { - return new ZoneType(); - } - - /** - * Create an instance of {@link Zones.Castle } - * - */ - public Zones.Castle createZonesCastle() { - return new Zones.Castle(); - } - - /** - * Create an instance of {@link Teleports.Teleport } - * - */ - public Teleports.Teleport createTeleportsTeleport() { - return new Teleports.Teleport(); - } - - /** - * Create an instance of {@link NPCTemplate.Skills } - * - */ - public NPCTemplate.Skills createNPCTemplateSkills() { - return new NPCTemplate.Skills(); - } - - /** - * Create an instance of {@link NPCTemplate.Talk } - * - */ - public NPCTemplate.Talk createNPCTemplateTalk() { - return new NPCTemplate.Talk(); - } - - /** - * Create an instance of {@link NPCTemplate.Info } - * - */ - public NPCTemplate.Info createNPCTemplateInfo() { - return new NPCTemplate.Info(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats } - * - */ - public NPCTemplate.Info.Stats createNPCTemplateInfoStats() { - return new NPCTemplate.Info.Stats(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Defense } - * - */ - public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() { - return new NPCTemplate.Info.Stats.Defense(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Attack } - * - */ - public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() { - return new NPCTemplate.Info.Stats.Attack(); - } - - /** - * Create an instance of {@link ItemTemplate } - * - */ - public ItemTemplate createItemTemplate() { - return new ItemTemplate(); - } - - /** - * Create an instance of {@link ItemTemplate.Armor } - * - */ - public ItemTemplate.Armor createItemTemplateArmor() { - return new ItemTemplate.Armor(); - } - - /** - * Create an instance of {@link ItemTemplate.Attributes } - * - */ - public ItemTemplate.Attributes createItemTemplateAttributes() { - return new ItemTemplate.Attributes(); - } - - /** - * Create an instance of {@link CharacterTemplate } - * - */ - public CharacterTemplate createCharacterTemplate() { - return new CharacterTemplate(); - } - - /** - * Create an instance of {@link CharacterTemplate.Collision } - * - */ - public CharacterTemplate.Collision createCharacterTemplateCollision() { - return new CharacterTemplate.Collision(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats } - * - */ - public CharacterTemplate.Stats createCharacterTemplateStats() { - return new CharacterTemplate.Stats(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Defense } - * - */ - public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() { - return new CharacterTemplate.Stats.Defense(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Attack } - * - */ - public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() { - return new CharacterTemplate.Stats.Attack(); - } - - /** - * Create an instance of {@link CalculatorFunction } - * - */ - public CalculatorFunction createCalculatorFunction() { - return new CalculatorFunction(); - } - - /** - * Create an instance of {@link Coordinate } - * - */ - public Coordinate createCoordinate() { - return new Coordinate(); - } - - /** - * Create an instance of {@link CalculatorFunctionOperation } - * - */ - public CalculatorFunctionOperation createCalculatorFunctionOperation() { - return new CalculatorFunctionOperation(); - } - - /** - * Create an instance of {@link SkillTemplate } - * - */ - public SkillTemplate createSkillTemplate() { - return new SkillTemplate(); - } - - /** - * Create an instance of {@link ZoneType.Point } - * - */ - public ZoneType.Point createZoneTypePoint() { - return new ZoneType.Point(); - } - - /** - * Create an instance of {@link Zones.Castle.Siege } - * - */ - public Zones.Castle.Siege createZonesCastleSiege() { - return new Zones.Castle.Siege(); - } - - /** - * Create an instance of {@link Teleports.Teleport.Restrictions } - * - */ - public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() { - return new Teleports.Teleport.Restrictions(); - } - - /** - * Create an instance of {@link NPCTemplate.Ai } - * - */ - public NPCTemplate.Ai createNPCTemplateAi() { - return new NPCTemplate.Ai(); - } - - /** - * Create an instance of {@link NPCTemplate.Skills.Skill } - * - */ - public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() { - return new NPCTemplate.Skills.Skill(); - } - - /** - * Create an instance of {@link NPCTemplate.Talk.Chat } - * - */ - public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() { - return new NPCTemplate.Talk.Chat(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Name } - * - */ - public NPCTemplate.Info.Name createNPCTemplateInfoName() { - return new NPCTemplate.Info.Name(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Title } - * - */ - public NPCTemplate.Info.Title createNPCTemplateInfoTitle() { - return new NPCTemplate.Info.Title(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Item } - * - */ - public NPCTemplate.Info.Item createNPCTemplateInfoItem() { - return new NPCTemplate.Info.Item(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Collision } - * - */ - public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() { - return new NPCTemplate.Info.Collision(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Hp } - * - */ - public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() { - return new NPCTemplate.Info.Stats.Hp(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Mp } - * - */ - public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() { - return new NPCTemplate.Info.Stats.Mp(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Move } - * - */ - public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() { - return new NPCTemplate.Info.Stats.Move(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Base } - * - */ - public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() { - return new NPCTemplate.Info.Stats.Base(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical } - * - */ - public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() { - return new NPCTemplate.Info.Stats.Defense.Physical(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical } - * - */ - public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() { - return new NPCTemplate.Info.Stats.Defense.Magical(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical } - * - */ - public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() { - return new NPCTemplate.Info.Stats.Attack.Physical(); - } - - /** - * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical } - * - */ - public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() { - return new NPCTemplate.Info.Stats.Attack.Magical(); - } - - /** - * Create an instance of {@link ItemTemplate.Controller } - * - */ - public ItemTemplate.Controller createItemTemplateController() { - return new ItemTemplate.Controller(); - } - - /** - * Create an instance of {@link ItemTemplate.Effect } - * - */ - public ItemTemplate.Effect createItemTemplateEffect() { - return new ItemTemplate.Effect(); - } - - /** - * Create an instance of {@link ItemTemplate.EtcItem } - * - */ - public ItemTemplate.EtcItem createItemTemplateEtcItem() { - return new ItemTemplate.EtcItem(); - } - - /** - * Create an instance of {@link ItemTemplate.Weapon } - * - */ - public ItemTemplate.Weapon createItemTemplateWeapon() { - return new ItemTemplate.Weapon(); - } - - /** - * Create an instance of {@link ItemTemplate.Armor.Cost } - * - */ - public ItemTemplate.Armor.Cost createItemTemplateArmorCost() { - return new ItemTemplate.Armor.Cost(); - } - - /** - * Create an instance of {@link ItemTemplate.Armor.Equipment } - * - */ - public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() { - return new ItemTemplate.Armor.Equipment(); - } - - /** - * Create an instance of {@link ItemTemplate.Attributes.Cost } - * - */ - public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() { - return new ItemTemplate.Attributes.Cost(); - } - - /** - * Create an instance of {@link CharacterTemplate.Collision.Male } - * - */ - public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() { - return new CharacterTemplate.Collision.Male(); - } - - /** - * Create an instance of {@link CharacterTemplate.Collision.Female } - * - */ - public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() { - return new CharacterTemplate.Collision.Female(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Hp } - * - */ - public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() { - return new CharacterTemplate.Stats.Hp(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Mp } - * - */ - public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() { - return new CharacterTemplate.Stats.Mp(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Cp } - * - */ - public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() { - return new CharacterTemplate.Stats.Cp(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Move } - * - */ - public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() { - return new CharacterTemplate.Stats.Move(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Base } - * - */ - public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() { - return new CharacterTemplate.Stats.Base(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical } - * - */ - public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() { - return new CharacterTemplate.Stats.Defense.Physical(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical } - * - */ - public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() { - return new CharacterTemplate.Stats.Defense.Magical(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical } - * - */ - public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() { - return new CharacterTemplate.Stats.Attack.Physical(); - } - - /** - * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical } - * - */ - public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() { - return new CharacterTemplate.Stats.Attack.Magical(); - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.l2jserver.model.template package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link NPCTemplate } + * + */ + public NPCTemplate createNPCTemplate() { + return new NPCTemplate(); + } + + /** + * Create an instance of {@link NPCTemplate.Droplist } + * + */ + public NPCTemplate.Droplist createNPCTemplateDroplist() { + return new NPCTemplate.Droplist(); + } + + /** + * Create an instance of {@link NPCTemplate.Droplist.Item } + * + */ + public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() { + return new NPCTemplate.Droplist.Item(); + } + + /** + * Create an instance of {@link Teleports } + * + */ + public Teleports createTeleports() { + return new Teleports(); + } + + /** + * Create an instance of {@link Zones } + * + */ + public Zones createZones() { + return new Zones(); + } + + /** + * Create an instance of {@link ZoneType } + * + */ + public ZoneType createZoneType() { + return new ZoneType(); + } + + /** + * Create an instance of {@link Zones.Castle } + * + */ + public Zones.Castle createZonesCastle() { + return new Zones.Castle(); + } + + /** + * Create an instance of {@link Teleports.Teleport } + * + */ + public Teleports.Teleport createTeleportsTeleport() { + return new Teleports.Teleport(); + } + + /** + * Create an instance of {@link NPCTemplate.Skills } + * + */ + public NPCTemplate.Skills createNPCTemplateSkills() { + return new NPCTemplate.Skills(); + } + + /** + * Create an instance of {@link NPCTemplate.Talk } + * + */ + public NPCTemplate.Talk createNPCTemplateTalk() { + return new NPCTemplate.Talk(); + } + + /** + * Create an instance of {@link NPCTemplate.Info } + * + */ + public NPCTemplate.Info createNPCTemplateInfo() { + return new NPCTemplate.Info(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats } + * + */ + public NPCTemplate.Info.Stats createNPCTemplateInfoStats() { + return new NPCTemplate.Info.Stats(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Defense } + * + */ + public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() { + return new NPCTemplate.Info.Stats.Defense(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Attack } + * + */ + public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() { + return new NPCTemplate.Info.Stats.Attack(); + } + + /** + * Create an instance of {@link ItemTemplate } + * + */ + public ItemTemplate createItemTemplate() { + return new ItemTemplate(); + } + + /** + * Create an instance of {@link ItemTemplate.Armor } + * + */ + public ItemTemplate.Armor createItemTemplateArmor() { + return new ItemTemplate.Armor(); + } + + /** + * Create an instance of {@link ItemTemplate.Attributes } + * + */ + public ItemTemplate.Attributes createItemTemplateAttributes() { + return new ItemTemplate.Attributes(); + } + + /** + * Create an instance of {@link CharacterTemplate } + * + */ + public CharacterTemplate createCharacterTemplate() { + return new CharacterTemplate(); + } + + /** + * Create an instance of {@link CharacterTemplate.Collision } + * + */ + public CharacterTemplate.Collision createCharacterTemplateCollision() { + return new CharacterTemplate.Collision(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats } + * + */ + public CharacterTemplate.Stats createCharacterTemplateStats() { + return new CharacterTemplate.Stats(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Defense } + * + */ + public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() { + return new CharacterTemplate.Stats.Defense(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Attack } + * + */ + public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() { + return new CharacterTemplate.Stats.Attack(); + } + + /** + * Create an instance of {@link CalculatorFunction } + * + */ + public CalculatorFunction createCalculatorFunction() { + return new CalculatorFunction(); + } + + /** + * Create an instance of {@link Coordinate } + * + */ + public Coordinate createCoordinate() { + return new Coordinate(); + } + + /** + * Create an instance of {@link CalculatorFunctionOperation } + * + */ + public CalculatorFunctionOperation createCalculatorFunctionOperation() { + return new CalculatorFunctionOperation(); + } + + /** + * Create an instance of {@link SkillTemplate } + * + */ + public SkillTemplate createSkillTemplate() { + return new SkillTemplate(); + } + + /** + * Create an instance of {@link ZoneType.Point } + * + */ + public ZoneType.Point createZoneTypePoint() { + return new ZoneType.Point(); + } + + /** + * Create an instance of {@link Zones.Castle.Siege } + * + */ + public Zones.Castle.Siege createZonesCastleSiege() { + return new Zones.Castle.Siege(); + } + + /** + * Create an instance of {@link Teleports.Teleport.Restrictions } + * + */ + public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() { + return new Teleports.Teleport.Restrictions(); + } + + /** + * Create an instance of {@link NPCTemplate.Ai } + * + */ + public NPCTemplate.Ai createNPCTemplateAi() { + return new NPCTemplate.Ai(); + } + + /** + * Create an instance of {@link NPCTemplate.Skills.Skill } + * + */ + public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() { + return new NPCTemplate.Skills.Skill(); + } + + /** + * Create an instance of {@link NPCTemplate.Talk.Chat } + * + */ + public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() { + return new NPCTemplate.Talk.Chat(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Name } + * + */ + public NPCTemplate.Info.Name createNPCTemplateInfoName() { + return new NPCTemplate.Info.Name(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Title } + * + */ + public NPCTemplate.Info.Title createNPCTemplateInfoTitle() { + return new NPCTemplate.Info.Title(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Item } + * + */ + public NPCTemplate.Info.Item createNPCTemplateInfoItem() { + return new NPCTemplate.Info.Item(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Collision } + * + */ + public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() { + return new NPCTemplate.Info.Collision(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Hp } + * + */ + public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() { + return new NPCTemplate.Info.Stats.Hp(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Mp } + * + */ + public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() { + return new NPCTemplate.Info.Stats.Mp(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Move } + * + */ + public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() { + return new NPCTemplate.Info.Stats.Move(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Base } + * + */ + public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() { + return new NPCTemplate.Info.Stats.Base(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical } + * + */ + public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() { + return new NPCTemplate.Info.Stats.Defense.Physical(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical } + * + */ + public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() { + return new NPCTemplate.Info.Stats.Defense.Magical(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical } + * + */ + public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() { + return new NPCTemplate.Info.Stats.Attack.Physical(); + } + + /** + * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical } + * + */ + public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() { + return new NPCTemplate.Info.Stats.Attack.Magical(); + } + + /** + * Create an instance of {@link ItemTemplate.Controller } + * + */ + public ItemTemplate.Controller createItemTemplateController() { + return new ItemTemplate.Controller(); + } + + /** + * Create an instance of {@link ItemTemplate.Effect } + * + */ + public ItemTemplate.Effect createItemTemplateEffect() { + return new ItemTemplate.Effect(); + } + + /** + * Create an instance of {@link ItemTemplate.EtcItem } + * + */ + public ItemTemplate.EtcItem createItemTemplateEtcItem() { + return new ItemTemplate.EtcItem(); + } + + /** + * Create an instance of {@link ItemTemplate.Weapon } + * + */ + public ItemTemplate.Weapon createItemTemplateWeapon() { + return new ItemTemplate.Weapon(); + } + + /** + * Create an instance of {@link ItemTemplate.Armor.Cost } + * + */ + public ItemTemplate.Armor.Cost createItemTemplateArmorCost() { + return new ItemTemplate.Armor.Cost(); + } + + /** + * Create an instance of {@link ItemTemplate.Armor.Equipment } + * + */ + public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() { + return new ItemTemplate.Armor.Equipment(); + } + + /** + * Create an instance of {@link ItemTemplate.Attributes.Cost } + * + */ + public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() { + return new ItemTemplate.Attributes.Cost(); + } + + /** + * Create an instance of {@link CharacterTemplate.Collision.Male } + * + */ + public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() { + return new CharacterTemplate.Collision.Male(); + } + + /** + * Create an instance of {@link CharacterTemplate.Collision.Female } + * + */ + public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() { + return new CharacterTemplate.Collision.Female(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Hp } + * + */ + public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() { + return new CharacterTemplate.Stats.Hp(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Mp } + * + */ + public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() { + return new CharacterTemplate.Stats.Mp(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Cp } + * + */ + public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() { + return new CharacterTemplate.Stats.Cp(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Move } + * + */ + public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() { + return new CharacterTemplate.Stats.Move(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Base } + * + */ + public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() { + return new CharacterTemplate.Stats.Base(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical } + * + */ + public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() { + return new CharacterTemplate.Stats.Defense.Physical(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical } + * + */ + public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() { + return new CharacterTemplate.Stats.Defense.Magical(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical } + * + */ + public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() { + return new CharacterTemplate.Stats.Attack.Physical(); + } + + /** + * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical } + * + */ + public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() { + return new CharacterTemplate.Stats.Attack.Magical(); + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/SkillTemplate.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/SkillTemplate.java index a82dd025a..50a925d2d 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/SkillTemplate.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/SkillTemplate.java @@ -1,162 +1,162 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.l2jserver.model.id.template.SkillTemplateID; -import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; - - -/** - *

Java class for skill element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="skill">
- *   <complexType>
- *     <complexContent>
- *       <extension base="{}AbstractTemplate">
- *         <sequence>
- *           <element name="maximumLevel" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         </sequence>
- *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
- *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *         <attribute name="delay" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *         <attribute name="cooldown" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       </extension>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "maximumLevel" -}) -@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill") -public class SkillTemplate - extends AbstractTemplate -{ - - protected int maximumLevel; - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) - protected SkillTemplateID id; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "delay", required = true) - protected int delay; - @XmlAttribute(name = "cooldown", required = true) - protected int cooldown; - - /** - * Gets the value of the maximumLevel property. - * - */ - public int getMaximumLevel() { - return maximumLevel; - } - - /** - * Sets the value of the maximumLevel property. - * - */ - public void setMaximumLevel(int value) { - this.maximumLevel = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public SkillTemplateID getID() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setID(SkillTemplateID value) { - this.id = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the delay property. - * - */ - public int getDelay() { - return delay; - } - - /** - * Sets the value of the delay property. - * - */ - public void setDelay(int value) { - this.delay = value; - } - - /** - * Gets the value of the cooldown property. - * - */ - public int getCooldown() { - return cooldown; - } - - /** - * Sets the value of the cooldown property. - * - */ - public void setCooldown(int value) { - this.cooldown = value; - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import com.l2jserver.model.id.template.SkillTemplateID; +import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; + + +/** + *

Java class for skill element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="skill">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{}AbstractTemplate">
+ *         <sequence>
+ *           <element name="maximumLevel" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         </sequence>
+ *         <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+ *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="delay" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *         <attribute name="cooldown" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "maximumLevel" +}) +@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill") +public class SkillTemplate + extends AbstractTemplate +{ + + protected int maximumLevel; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) + protected SkillTemplateID id; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "delay", required = true) + protected int delay; + @XmlAttribute(name = "cooldown", required = true) + protected int cooldown; + + /** + * Gets the value of the maximumLevel property. + * + */ + public int getMaximumLevel() { + return maximumLevel; + } + + /** + * Sets the value of the maximumLevel property. + * + */ + public void setMaximumLevel(int value) { + this.maximumLevel = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public SkillTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(SkillTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the delay property. + * + */ + public int getDelay() { + return delay; + } + + /** + * Sets the value of the delay property. + * + */ + public void setDelay(int value) { + this.delay = value; + } + + /** + * Gets the value of the cooldown property. + * + */ + public int getCooldown() { + return cooldown; + } + + /** + * Sets the value of the cooldown property. + * + */ + public void setCooldown(int value) { + this.cooldown = value; + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Teleports.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Teleports.java index 137040f20..469eaf53d 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Teleports.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Teleports.java @@ -1,379 +1,379 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.l2jserver.model.id.template.TeleportationTemplateID; -import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="teleport" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{}AbstractTemplate">
- *                 <sequence>
- *                   <element name="point" type="{}Coordinate" minOccurs="0"/>
- *                   <element name="restrictions" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="restriction" maxOccurs="unbounded">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <enumeration value="NOBLE"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
- *                 <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                 <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "teleport" -}) -@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport") -public class Teleports { - - @XmlElement(required = true) - protected List teleport; - - /** - * Gets the value of the teleport property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the teleport property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getTeleport().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Teleports.Teleport } - * - * - */ - public List getTeleport() { - if (teleport == null) { - teleport = new ArrayList(); - } - return this.teleport; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{}AbstractTemplate">
-     *       <sequence>
-     *         <element name="point" type="{}Coordinate" minOccurs="0"/>
-     *         <element name="restrictions" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="restriction" maxOccurs="unbounded">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <enumeration value="NOBLE"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
-     *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "point", - "restrictions" - }) - public static class Teleport - extends AbstractTemplate - { - - protected Coordinate point; - protected Teleports.Teleport.Restrictions restrictions; - @XmlAttribute(name = "id", required = true) - @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class) - protected TeleportationTemplateID id; - @XmlAttribute(name = "name") - protected String name; - @XmlAttribute(name = "item") - protected Integer item; - @XmlAttribute(name = "price", required = true) - protected int price; - - /** - * Gets the value of the point property. - * - * @return - * possible object is - * {@link Coordinate } - * - */ - public Coordinate getPoint() { - return point; - } - - /** - * Sets the value of the point property. - * - * @param value - * allowed object is - * {@link Coordinate } - * - */ - public void setPoint(Coordinate value) { - this.point = value; - } - - /** - * Gets the value of the restrictions property. - * - * @return - * possible object is - * {@link Teleports.Teleport.Restrictions } - * - */ - public Teleports.Teleport.Restrictions getRestrictions() { - return restrictions; - } - - /** - * Sets the value of the restrictions property. - * - * @param value - * allowed object is - * {@link Teleports.Teleport.Restrictions } - * - */ - public void setRestrictions(Teleports.Teleport.Restrictions value) { - this.restrictions = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public TeleportationTemplateID getID() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setID(TeleportationTemplateID value) { - this.id = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setItem(Integer value) { - this.item = value; - } - - /** - * Gets the value of the price property. - * - */ - public int getPrice() { - return price; - } - - /** - * Sets the value of the price property. - * - */ - public void setPrice(int value) { - this.price = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="restriction" maxOccurs="unbounded">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <enumeration value="NOBLE"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "restriction" - }) - public static class Restrictions { - - @XmlElement(required = true) - protected List restriction; - - /** - * Gets the value of the restriction property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the restriction property. - * - *

- * For example, to add a new item, do as follows: - *

-             *    getRestriction().add(newItem);
-             * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getRestriction() { - if (restriction == null) { - restriction = new ArrayList(); - } - return this.restriction; - } - - } - - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import com.l2jserver.model.id.template.TeleportationTemplateID; +import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="teleport" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <extension base="{}AbstractTemplate">
+ *                 <sequence>
+ *                   <element name="point" type="{}Coordinate" minOccurs="0"/>
+ *                   <element name="restrictions" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="restriction" maxOccurs="unbounded">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <enumeration value="NOBLE"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+ *                 <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *               </extension>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "teleport" +}) +@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport") +public class Teleports { + + @XmlElement(required = true) + protected List teleport; + + /** + * Gets the value of the teleport property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the teleport property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getTeleport().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Teleports.Teleport } + * + * + */ + public List getTeleport() { + if (teleport == null) { + teleport = new ArrayList(); + } + return this.teleport; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <extension base="{}AbstractTemplate">
+     *       <sequence>
+     *         <element name="point" type="{}Coordinate" minOccurs="0"/>
+     *         <element name="restrictions" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="restriction" maxOccurs="unbounded">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <enumeration value="NOBLE"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+     *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *     </extension>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "point", + "restrictions" + }) + public static class Teleport + extends AbstractTemplate + { + + protected Coordinate point; + protected Teleports.Teleport.Restrictions restrictions; + @XmlAttribute(name = "id", required = true) + @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class) + protected TeleportationTemplateID id; + @XmlAttribute(name = "name") + protected String name; + @XmlAttribute(name = "item") + protected Integer item; + @XmlAttribute(name = "price", required = true) + protected int price; + + /** + * Gets the value of the point property. + * + * @return + * possible object is + * {@link Coordinate } + * + */ + public Coordinate getPoint() { + return point; + } + + /** + * Sets the value of the point property. + * + * @param value + * allowed object is + * {@link Coordinate } + * + */ + public void setPoint(Coordinate value) { + this.point = value; + } + + /** + * Gets the value of the restrictions property. + * + * @return + * possible object is + * {@link Teleports.Teleport.Restrictions } + * + */ + public Teleports.Teleport.Restrictions getRestrictions() { + return restrictions; + } + + /** + * Sets the value of the restrictions property. + * + * @param value + * allowed object is + * {@link Teleports.Teleport.Restrictions } + * + */ + public void setRestrictions(Teleports.Teleport.Restrictions value) { + this.restrictions = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public TeleportationTemplateID getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(TeleportationTemplateID value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the item property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getItem() { + return item; + } + + /** + * Sets the value of the item property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setItem(Integer value) { + this.item = value; + } + + /** + * Gets the value of the price property. + * + */ + public int getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + */ + public void setPrice(int value) { + this.price = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="restriction" maxOccurs="unbounded">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <enumeration value="NOBLE"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "restriction" + }) + public static class Restrictions { + + @XmlElement(required = true) + protected List restriction; + + /** + * Gets the value of the restriction property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the restriction property. + * + *

+ * For example, to add a new item, do as follows: + *

+             *    getRestriction().add(newItem);
+             * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getRestriction() { + if (restriction == null) { + restriction = new ArrayList(); + } + return this.restriction; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ZoneType.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ZoneType.java index 3affba6f9..854990ca0 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ZoneType.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/ZoneType.java @@ -1,179 +1,179 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for ZoneType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="ZoneType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="point" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                 </sequence>
- *                 <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *                 <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ZoneType", namespace = "zones", propOrder = { - "point" -}) -public class ZoneType { - - @XmlElement(required = true) - protected List point; - @XmlAttribute(name = "id", required = true) - protected String id; - - /** - * Gets the value of the point property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the point property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getPoint().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ZoneType.Point } - * - * - */ - public List getPoint() { - if (point == null) { - point = new ArrayList(); - } - return this.point; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *       </sequence>
-     *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Point { - - @XmlAttribute(name = "x", required = true) - protected int x; - @XmlAttribute(name = "y", required = true) - protected int y; - - /** - * Gets the value of the x property. - * - */ - public int getX() { - return x; - } - - /** - * Sets the value of the x property. - * - */ - public void setX(int value) { - this.x = value; - } - - /** - * Gets the value of the y property. - * - */ - public int getY() { - return y; - } - - /** - * Sets the value of the y property. - * - */ - public void setY(int value) { - this.y = value; - } - - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for ZoneType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="ZoneType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="point" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                 </sequence>
+ *                 <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ZoneType", namespace = "zones", propOrder = { + "point" +}) +public class ZoneType { + + @XmlElement(required = true) + protected List point; + @XmlAttribute(name = "id", required = true) + protected String id; + + /** + * Gets the value of the point property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the point property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPoint().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ZoneType.Point } + * + * + */ + public List getPoint() { + if (point == null) { + point = new ArrayList(); + } + return this.point; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *       </sequence>
+     *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Point { + + @XmlAttribute(name = "x", required = true) + protected int x; + @XmlAttribute(name = "y", required = true) + protected int y; + + /** + * Gets the value of the x property. + * + */ + public int getX() { + return x; + } + + /** + * Sets the value of the x property. + * + */ + public void setX(int value) { + this.x = value; + } + + /** + * Gets the value of the y property. + * + */ + public int getY() { + return y; + } + + /** + * Sets the value of the y property. + * + */ + public void setY(int value) { + this.y = value; + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Zones.java b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Zones.java index 6127895da..0ffa9e9a1 100644 --- a/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Zones.java +++ b/l2jserver2-gameserver/src/main/generated/com/l2jserver/model/template/Zones.java @@ -1,211 +1,211 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.01.19 at 03:37:11 PM BRST -// - - -package com.l2jserver.model.template; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="castle">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="siege">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="zone" type="{zones}ZoneType"/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "castle" -}) -@XmlRootElement(name = "zones", namespace = "zones") -public class Zones { - - @XmlElement(required = true) - protected Zones.Castle castle; - - /** - * Gets the value of the castle property. - * - * @return - * possible object is - * {@link Zones.Castle } - * - */ - public Zones.Castle getCastle() { - return castle; - } - - /** - * Sets the value of the castle property. - * - * @param value - * allowed object is - * {@link Zones.Castle } - * - */ - public void setCastle(Zones.Castle value) { - this.castle = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="siege">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="zone" type="{zones}ZoneType"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "siege" - }) - public static class Castle { - - @XmlElement(required = true) - protected Zones.Castle.Siege siege; - - /** - * Gets the value of the siege property. - * - * @return - * possible object is - * {@link Zones.Castle.Siege } - * - */ - public Zones.Castle.Siege getSiege() { - return siege; - } - - /** - * Sets the value of the siege property. - * - * @param value - * allowed object is - * {@link Zones.Castle.Siege } - * - */ - public void setSiege(Zones.Castle.Siege value) { - this.siege = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="zone" type="{zones}ZoneType"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "zone" - }) - public static class Siege { - - @XmlElement(required = true) - protected ZoneType zone; - - /** - * Gets the value of the zone property. - * - * @return - * possible object is - * {@link ZoneType } - * - */ - public ZoneType getZone() { - return zone; - } - - /** - * Sets the value of the zone property. - * - * @param value - * allowed object is - * {@link ZoneType } - * - */ - public void setZone(ZoneType value) { - this.zone = value; - } - - } - - } - -} +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2012.03.24 at 06:20:02 PM BRT +// + + +package com.l2jserver.model.template; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="castle">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="siege">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="zone" type="{zones}ZoneType"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "castle" +}) +@XmlRootElement(name = "zones", namespace = "zones") +public class Zones { + + @XmlElement(required = true) + protected Zones.Castle castle; + + /** + * Gets the value of the castle property. + * + * @return + * possible object is + * {@link Zones.Castle } + * + */ + public Zones.Castle getCastle() { + return castle; + } + + /** + * Sets the value of the castle property. + * + * @param value + * allowed object is + * {@link Zones.Castle } + * + */ + public void setCastle(Zones.Castle value) { + this.castle = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="siege">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="zone" type="{zones}ZoneType"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "siege" + }) + public static class Castle { + + @XmlElement(required = true) + protected Zones.Castle.Siege siege; + + /** + * Gets the value of the siege property. + * + * @return + * possible object is + * {@link Zones.Castle.Siege } + * + */ + public Zones.Castle.Siege getSiege() { + return siege; + } + + /** + * Sets the value of the siege property. + * + * @param value + * allowed object is + * {@link Zones.Castle.Siege } + * + */ + public void setSiege(Zones.Castle.Siege value) { + this.siege = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="zone" type="{zones}ZoneType"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "zone" + }) + public static class Siege { + + @XmlElement(required = true) + protected ZoneType zone; + + /** + * Gets the value of the zone property. + * + * @return + * possible object is + * {@link ZoneType } + * + */ + public ZoneType getZone() { + return zone; + } + + /** + * Sets the value of the zone property. + * + * @param value + * allowed object is + * {@link ZoneType } + * + */ + public void setZone(ZoneType value) { + this.zone = value; + } + + } + + } + +} diff --git a/l2jserver2-gameserver/src/main/jaxb.xml b/l2jserver2-gameserver/src/main/jaxb.xml deleted file mode 100644 index f860f15fe..000000000 --- a/l2jserver2-gameserver/src/main/jaxb.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/l2jserver2-tools/pom.xml b/l2jserver2-tools/pom.xml index f288b5f59..9d8509e01 100644 --- a/l2jserver2-tools/pom.xml +++ b/l2jserver2-tools/pom.xml @@ -21,7 +21,7 @@ com.l2jserver - l2jserver2-gameserver + l2jserver2-gameserver-core 0.0.2-SNAPSHOT diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java index a23f1de14..a81fc6bdd 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java @@ -36,9 +36,6 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.MarshalException; import javax.xml.bind.Marshaller; -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.transform.Result; -import javax.xml.transform.stream.StreamResult; import org.apache.commons.io.FileUtils; diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java index 94fe7a9ec..8f8bdd4b5 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java @@ -18,6 +18,7 @@ package com.l2jserver.tool; import com.l2jserver.model.template.character.CharacterClass; + public class CharacterSQLEnumGenerator { public static void main(String[] args) { System.out.println("== 'Character' SQL STATEMENT =="); diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java index 6d84d6de7..61338a0fc 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java @@ -19,6 +19,7 @@ package com.l2jserver.tool; import com.l2jserver.model.template.character.CharacterClass; + public class PacketSamuraiCharacterClassEnum { public static void main(String[] args) { System.out.println(createClassStatement()); diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java index 5873e9acf..4adfd8e39 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import com.l2jserver.game.net.SystemMessage; +import com.l2jserver.service.network.model.SystemMessage; public class PacketSamuraiSystemMessageEnumGenerator { public static void main(String[] args) throws IOException { diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java index 46806d698..7b2ce85ca 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java @@ -18,6 +18,7 @@ package com.l2jserver.tool.conversor.itemtemplate; import com.l2jserver.model.template.item.ItemMaterial; + /** * @author Rogiel * diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java index a8dffab7c..41a972dcc 100644 --- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java +++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java @@ -18,6 +18,7 @@ package com.l2jserver.tool.conversor.itemtemplate; import com.l2jserver.model.template.item.ItemType; + /** * @author Rogiel *