1
0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-05 23:22:47 +00:00

Fixes issue loading teleportation templates

This commit is contained in:
2012-05-03 20:03:33 -03:00
parent c548c9205c
commit 74c894ae05
23 changed files with 7154 additions and 7008 deletions

View File

@@ -9,7 +9,8 @@
<xs:annotation> <xs:annotation>
<xs:appinfo> <xs:appinfo>
<xjc:superClass name="com.l2jserver.model.template.Template" /> <xjc:superClass name="com.l2jserver.model.template.Template" />
<inheritance:implements>com.l2jserver.model.template.Template</inheritance:implements> <inheritance:implements>com.l2jserver.model.template.Template
</inheritance:implements>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
<xs:sequence /> <xs:sequence />
@@ -27,11 +28,11 @@
</xs:simpleType> </xs:simpleType>
<xs:complexType name="Coordinate"> <xs:complexType name="Coordinate">
<!-- <xs:annotation> --> <xs:annotation>
<!-- <xs:appinfo> --> <xs:appinfo>
<!-- <jaxb:javaType name="com.l2jserver.util.geometry.Coordinate" /> --> <jaxb:class name="TemplateCoordinate" />
<!-- </xs:appinfo> --> </xs:appinfo>
<!-- </xs:annotation> --> </xs:annotation>
<xs:sequence /> <xs:sequence />
<xs:attribute name="x" type="xs:int" use="required" /> <xs:attribute name="x" type="xs:int" use="required" />
<xs:attribute name="y" type="xs:int" use="required" /> <xs:attribute name="y" type="xs:int" use="required" />

View File

@@ -18,45 +18,50 @@
<xs:restriction base="TemplateID" /> <xs:restriction base="TemplateID" />
</xs:simpleType> </xs:simpleType>
<xs:complexType name="TeleportationTemplate">
<xs:annotation>
<xs:appinfo>
<jaxb:class name="TeleportationTemplate" />
</xs:appinfo>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractTemplate">
<xs:sequence>
<xs:element name="point" type="Coordinate" minOccurs="0" />
<xs:element name="restrictions" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="restriction" maxOccurs="unbounded">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="NOBLE" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="id" type="ths:TeleportationTemplateID"
use="required">
<xs:annotation>
<xs:appinfo>
<jaxb:property name="iD" />
</xs:appinfo>
</xs:annotation>
</xs:attribute>
<xs:attribute name="name" type="xs:string" />
<xs:attribute name="item" type="xs:int" />
<xs:attribute name="price" type="xs:int" use="required" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="teleports"> <xs:element name="teleports">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="teleport" minOccurs="1" maxOccurs="unbounded"> <xs:element name="teleport" type="ths:TeleportationTemplate"
<xs:complexType> minOccurs="1" maxOccurs="unbounded" />
<xs:complexContent>
<xs:extension base="AbstractTemplate">
<xs:sequence>
<xs:element name="point" type="Coordinate"
minOccurs="0" />
<xs:element name="restrictions" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="restriction" maxOccurs="unbounded">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="NOBLE" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="id" type="ths:TeleportationTemplateID"
use="required">
<xs:annotation>
<xs:appinfo>
<jaxb:property name="iD" />
</xs:appinfo>
</xs:annotation>
</xs:attribute>
<xs:attribute name="name" type="xs:string" />
<xs:attribute name="item" type="xs:int" />
<xs:attribute name="price" type="xs:int" use="required" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>

View File

@@ -5,33 +5,9 @@
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
Any modifications to this file will be lost upon recompilation of the source schema. Any modifications to this file will be lost upon recompilation of the source schema.
Generated on: 2012.03.25 at 01:03:28 PM BRT Generated on: 2012.05.03 at 07:58:30 PM BRT
--> -->
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:item">
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:npc">
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::"> <jaxb:bindings scd="x-schema::">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -43,7 +19,7 @@ Generated on: 2012.03.25 at 01:03:28 PM BRT
<jaxb:class ref="com.l2jserver.model.template.AbstractTemplate"/> <jaxb:class ref="com.l2jserver.model.template.AbstractTemplate"/>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="~Coordinate"> <jaxb:bindings scd="~Coordinate">
<jaxb:class ref="com.l2jserver.model.template.Coordinate"/> <jaxb:class ref="com.l2jserver.model.template.TemplateCoordinate"/>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="~ActorTemplate"> <jaxb:bindings scd="~ActorTemplate">
<jaxb:class ref="com.l2jserver.model.template.ActorTemplate"/> <jaxb:class ref="com.l2jserver.model.template.ActorTemplate"/>
@@ -52,6 +28,14 @@ Generated on: 2012.03.25 at 01:03:28 PM BRT
<jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/> <jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:npc">
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -60,14 +44,6 @@ Generated on: 2012.03.25 at 01:03:28 PM BRT
<jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/> <jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="zones"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="zones">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -79,5 +55,32 @@ Generated on: 2012.03.25 at 01:03:28 PM BRT
<jaxb:class ref="com.l2jserver.model.template.ZoneType"/> <jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:item">
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="~tns:TeleportationTemplate">
<jaxb:class ref="com.l2jserver.model.template.TeleportationTemplate"/>
</jaxb:bindings>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>

View File

@@ -2,9 +2,10 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@@ -12,13 +13,11 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for AbstractTemplate complex type.
* Java class for AbstractTemplate complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="AbstractTemplate"> * &lt;complexType name="AbstractTemplate">
@@ -35,8 +34,15 @@ import javax.xml.bind.annotation.XmlType;
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "AbstractTemplate") @XmlType(name = "AbstractTemplate")
@XmlSeeAlso({ ItemTemplate.class, ActorTemplate.class, SkillTemplate.class, @XmlSeeAlso({
com.l2jserver.model.template.Teleports.Teleport.class }) ItemTemplate.class,
public abstract class AbstractTemplate implements Template { ActorTemplate.class,
SkillTemplate.class,
TeleportationTemplate.class
})
public abstract class AbstractTemplate
implements Template
{
} }

View File

@@ -2,9 +2,10 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@@ -12,13 +13,11 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for ActorTemplate complex type.
* Java class for ActorTemplate complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="ActorTemplate"> * &lt;complexType name="ActorTemplate">
@@ -33,7 +32,13 @@ import javax.xml.bind.annotation.XmlType;
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ActorTemplate") @XmlType(name = "ActorTemplate")
@XmlSeeAlso({ CharacterTemplate.class, NPCTemplate.class }) @XmlSeeAlso({
public abstract class ActorTemplate extends AbstractTemplate { CharacterTemplate.class,
NPCTemplate.class
})
public abstract class ActorTemplate
extends AbstractTemplate
{
} }

View File

@@ -2,22 +2,21 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for CalculatorFunction complex type.
* Java class for CalculatorFunction complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="CalculatorFunction"> * &lt;complexType name="CalculatorFunction">
@@ -37,97 +36,113 @@ import javax.xml.bind.annotation.XmlType;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CalculatorFunction", propOrder = { "set", "add", "subtract", @XmlType(name = "CalculatorFunction", propOrder = {
"random" }) "set",
"add",
"subtract",
"random"
})
public class CalculatorFunction { public class CalculatorFunction {
protected CalculatorFunctionOperation set; protected CalculatorFunctionOperation set;
protected CalculatorFunctionOperation add; protected CalculatorFunctionOperation add;
protected CalculatorFunctionOperation subtract; protected CalculatorFunctionOperation subtract;
protected CalculatorFunctionOperation random; protected CalculatorFunctionOperation random;
/** /**
* Gets the value of the set property. * Gets the value of the set property.
* *
* @return possible object is {@link CalculatorFunctionOperation } * @return
* * possible object is
*/ * {@link CalculatorFunctionOperation }
public CalculatorFunctionOperation getSet() { *
return set; */
} public CalculatorFunctionOperation getSet() {
return set;
}
/** /**
* Sets the value of the set property. * Sets the value of the set property.
* *
* @param value * @param value
* allowed object is {@link CalculatorFunctionOperation } * allowed object is
* * {@link CalculatorFunctionOperation }
*/ *
public void setSet(CalculatorFunctionOperation value) { */
this.set = value; public void setSet(CalculatorFunctionOperation value) {
} this.set = value;
}
/** /**
* Gets the value of the add property. * Gets the value of the add property.
* *
* @return possible object is {@link CalculatorFunctionOperation } * @return
* * possible object is
*/ * {@link CalculatorFunctionOperation }
public CalculatorFunctionOperation getAdd() { *
return add; */
} public CalculatorFunctionOperation getAdd() {
return add;
}
/** /**
* Sets the value of the add property. * Sets the value of the add property.
* *
* @param value * @param value
* allowed object is {@link CalculatorFunctionOperation } * allowed object is
* * {@link CalculatorFunctionOperation }
*/ *
public void setAdd(CalculatorFunctionOperation value) { */
this.add = value; public void setAdd(CalculatorFunctionOperation value) {
} this.add = value;
}
/** /**
* Gets the value of the subtract property. * Gets the value of the subtract property.
* *
* @return possible object is {@link CalculatorFunctionOperation } * @return
* * possible object is
*/ * {@link CalculatorFunctionOperation }
public CalculatorFunctionOperation getSubtract() { *
return subtract; */
} public CalculatorFunctionOperation getSubtract() {
return subtract;
}
/** /**
* Sets the value of the subtract property. * Sets the value of the subtract property.
* *
* @param value * @param value
* allowed object is {@link CalculatorFunctionOperation } * allowed object is
* * {@link CalculatorFunctionOperation }
*/ *
public void setSubtract(CalculatorFunctionOperation value) { */
this.subtract = value; public void setSubtract(CalculatorFunctionOperation value) {
} this.subtract = value;
}
/** /**
* Gets the value of the random property. * Gets the value of the random property.
* *
* @return possible object is {@link CalculatorFunctionOperation } * @return
* * possible object is
*/ * {@link CalculatorFunctionOperation }
public CalculatorFunctionOperation getRandom() { *
return random; */
} public CalculatorFunctionOperation getRandom() {
return random;
}
/** /**
* Sets the value of the random property. * Sets the value of the random property.
* *
* @param value * @param value
* allowed object is {@link CalculatorFunctionOperation } * allowed object is
* * {@link CalculatorFunctionOperation }
*/ *
public void setRandom(CalculatorFunctionOperation value) { */
this.random = value; public void setRandom(CalculatorFunctionOperation value) {
} this.random = value;
}
} }

View File

@@ -2,25 +2,23 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import java.math.BigInteger; import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for CalculatorFunctionOperation complex type.
* Java class for CalculatorFunctionOperation complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="CalculatorFunctionOperation"> * &lt;complexType name="CalculatorFunctionOperation">
@@ -39,46 +37,49 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "CalculatorFunctionOperation") @XmlType(name = "CalculatorFunctionOperation")
public class CalculatorFunctionOperation { public class CalculatorFunctionOperation {
@XmlAttribute(name = "order", required = true) @XmlAttribute(name = "order", required = true)
protected BigInteger order; protected BigInteger order;
@XmlAttribute(name = "value", required = true) @XmlAttribute(name = "value", required = true)
protected double value; protected double value;
/** /**
* Gets the value of the order property. * Gets the value of the order property.
* *
* @return possible object is {@link BigInteger } * @return
* * possible object is
*/ * {@link BigInteger }
public BigInteger getOrder() { *
return order; */
} public BigInteger getOrder() {
return order;
}
/** /**
* Sets the value of the order property. * Sets the value of the order property.
* *
* @param value * @param value
* allowed object is {@link BigInteger } * allowed object is
* * {@link BigInteger }
*/ *
public void setOrder(BigInteger value) { */
this.order = value; public void setOrder(BigInteger value) {
} this.order = value;
}
/** /**
* Gets the value of the value property. * Gets the value of the value property.
* *
*/ */
public double getValue() { public double getValue() {
return value; return value;
} }
/** /**
* Sets the value of the value property. * Sets the value of the value property.
* *
*/ */
public void setValue(double value) { public void setValue(double value) {
this.value = value; this.value = value;
} }
} }

View File

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

View File

@@ -2,9 +2,10 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@@ -13,17 +14,14 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.SkillTemplateID; import com.l2jserver.model.id.template.SkillTemplateID;
import com.l2jserver.util.jaxb.SkillTemplateIDAdapter; import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
/** /**
* <p> * <p>Java class for skill element declaration.
* Java class for skill element declaration.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;element name="skill"> * &lt;element name="skill">
@@ -46,109 +44,119 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "maximumLevel" }) @XmlType(name = "", propOrder = {
"maximumLevel"
})
@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill") @XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
public class SkillTemplate extends AbstractTemplate { public class SkillTemplate
extends AbstractTemplate
{
protected int maximumLevel; protected int maximumLevel;
@XmlAttribute(name = "id", required = true) @XmlAttribute(name = "id", required = true)
@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
protected SkillTemplateID id; protected SkillTemplateID id;
@XmlAttribute(name = "name", required = true) @XmlAttribute(name = "name", required = true)
protected String name; protected String name;
@XmlAttribute(name = "delay", required = true) @XmlAttribute(name = "delay", required = true)
protected int delay; protected int delay;
@XmlAttribute(name = "cooldown", required = true) @XmlAttribute(name = "cooldown", required = true)
protected int cooldown; protected int cooldown;
/** /**
* Gets the value of the maximumLevel property. * Gets the value of the maximumLevel property.
* *
*/ */
public int getMaximumLevel() { public int getMaximumLevel() {
return maximumLevel; return maximumLevel;
} }
/** /**
* Sets the value of the maximumLevel property. * Sets the value of the maximumLevel property.
* *
*/ */
public void setMaximumLevel(int value) { public void setMaximumLevel(int value) {
this.maximumLevel = value; this.maximumLevel = value;
} }
/** /**
* Gets the value of the id property. * Gets the value of the id property.
* *
* @return possible object is {@link String } * @return
* * possible object is
*/ * {@link String }
public SkillTemplateID getID() { *
return id; */
} public SkillTemplateID getID() {
return id;
}
/** /**
* Sets the value of the id property. * Sets the value of the id property.
* *
* @param value * @param value
* allowed object is {@link String } * allowed object is
* * {@link String }
*/ *
public void setID(SkillTemplateID value) { */
this.id = value; public void setID(SkillTemplateID value) {
} this.id = value;
}
/** /**
* Gets the value of the name property. * Gets the value of the name property.
* *
* @return possible object is {@link String } * @return
* * possible object is
*/ * {@link String }
public String getName() { *
return name; */
} public String getName() {
return name;
}
/** /**
* Sets the value of the name property. * Sets the value of the name property.
* *
* @param value * @param value
* allowed object is {@link String } * allowed object is
* * {@link String }
*/ *
public void setName(String value) { */
this.name = value; public void setName(String value) {
} this.name = value;
}
/** /**
* Gets the value of the delay property. * Gets the value of the delay property.
* *
*/ */
public int getDelay() { public int getDelay() {
return delay; return delay;
} }
/** /**
* Sets the value of the delay property. * Sets the value of the delay property.
* *
*/ */
public void setDelay(int value) { public void setDelay(int value) {
this.delay = value; this.delay = value;
} }
/** /**
* Gets the value of the cooldown property. * Gets the value of the cooldown property.
* *
*/ */
public int getCooldown() { public int getCooldown() {
return cooldown; return cooldown;
} }
/** /**
* Sets the value of the cooldown property. * Sets the value of the cooldown property.
* *
*/ */
public void setCooldown(int value) { public void setCooldown(int value) {
this.cooldown = value; this.cooldown = value;
} }
} }

View File

@@ -0,0 +1,286 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.05.03 at 07:58:30 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;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
/**
* <p>Java class for TeleportationTemplate complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="TeleportationTemplate">
* &lt;complexContent>
* &lt;extension base="{}AbstractTemplate">
* &lt;sequence>
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;element name="restrictions" minOccurs="0">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/extension>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "TeleportationTemplate", namespace = "http://schemas.l2jserver2.com/teleport", propOrder = {
"point",
"restrictions"
})
public class TeleportationTemplate
extends AbstractTemplate
{
protected TemplateCoordinate point;
protected TeleportationTemplate.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 TemplateCoordinate }
*
*/
public TemplateCoordinate getPoint() {
return point;
}
/**
* Sets the value of the point property.
*
* @param value
* allowed object is
* {@link TemplateCoordinate }
*
*/
public void setPoint(TemplateCoordinate value) {
this.point = value;
}
/**
* Gets the value of the restrictions property.
*
* @return
* possible object is
* {@link TeleportationTemplate.Restrictions }
*
*/
public TeleportationTemplate.Restrictions getRestrictions() {
return restrictions;
}
/**
* Sets the value of the restrictions property.
*
* @param value
* allowed object is
* {@link TeleportationTemplate.Restrictions }
*
*/
public void setRestrictions(TeleportationTemplate.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;
}
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"restriction"
})
public static class Restrictions {
@XmlElement(required = true)
protected List<String> restriction;
/**
* Gets the value of the restriction property.
*
* <p>
* 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 <CODE>set</CODE> method for the restriction property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getRestriction().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link String }
*
*
*/
public List<String> getRestriction() {
if (restriction == null) {
restriction = new ArrayList<String>();
}
return this.restriction;
}
}
}

View File

@@ -2,70 +2,32 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; 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;
/** /**
* <p> * <p>Java class for anonymous complex type.
* Java class for anonymous complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="teleport" maxOccurs="unbounded"> * &lt;element name="teleport" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplate" maxOccurs="unbounded"/>
* &lt;complexType>
* &lt;complexContent>
* &lt;extension base="{}AbstractTemplate">
* &lt;sequence>
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;element name="restrictions" minOccurs="0">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/extension>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
@@ -75,290 +37,42 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "teleport" }) @XmlType(name = "", propOrder = {
"teleport"
})
@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport") @XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
public class Teleports { public class Teleports {
@XmlElement(required = true) @XmlElement(required = true)
protected List<Teleports.Teleport> teleport; protected List<TeleportationTemplate> teleport;
/** /**
* Gets the value of the teleport property. * Gets the value of the teleport property.
* *
* <p> * <p>
* This accessor method returns a reference to the live list, not a * This accessor method returns a reference to the live list,
* snapshot. Therefore any modification you make to the returned list will * not a snapshot. Therefore any modification you make to the
* be present inside the JAXB object. This is why there is not a * returned list will be present inside the JAXB object.
* <CODE>set</CODE> method for the teleport property. * This is why there is not a <CODE>set</CODE> method for the teleport property.
* *
* <p> * <p>
* For example, to add a new item, do as follows: * For example, to add a new item, do as follows:
* * <pre>
* <pre> * getTeleport().add(newItem);
* getTeleport().add(newItem); * </pre>
* </pre> *
* *
* * <p>
* <p> * Objects of the following type(s) are allowed in the list
* Objects of the following type(s) are allowed in the list * {@link TeleportationTemplate }
* {@link Teleports.Teleport } *
* *
* */
*/ public List<TeleportationTemplate> getTeleport() {
public List<Teleports.Teleport> getTeleport() { if (teleport == null) {
if (teleport == null) { teleport = new ArrayList<TeleportationTemplate>();
teleport = new ArrayList<Teleports.Teleport>(); }
} return this.teleport;
return this.teleport; }
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;extension base="{}AbstractTemplate">
* &lt;sequence>
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;element name="restrictions" minOccurs="0">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/extension>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@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;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="restriction" maxOccurs="unbounded">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="NOBLE"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "restriction" })
public static class Restrictions {
@XmlElement(required = true)
protected List<String> restriction;
/**
* Gets the value of the restriction property.
*
* <p>
* 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 <CODE>set</CODE> method for the restriction property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getRestriction().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link String }
*
*
*/
public List<String> getRestriction() {
if (restriction == null) {
restriction = new ArrayList<String>();
}
return this.restriction;
}
}
}
} }

View File

@@ -2,9 +2,10 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@@ -12,13 +13,11 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for Coordinate complex type.
* Java class for Coordinate complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="Coordinate"> * &lt;complexType name="Coordinate">
@@ -38,61 +37,61 @@ import javax.xml.bind.annotation.XmlType;
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Coordinate") @XmlType(name = "Coordinate")
public class Coordinate { public class TemplateCoordinate {
@XmlAttribute(name = "x", required = true) @XmlAttribute(name = "x", required = true)
protected int x; protected int x;
@XmlAttribute(name = "y", required = true) @XmlAttribute(name = "y", required = true)
protected int y; protected int y;
@XmlAttribute(name = "z", required = true) @XmlAttribute(name = "z", required = true)
protected int z; protected int z;
/** /**
* Gets the value of the x property. * Gets the value of the x property.
* *
*/ */
public int getX() { public int getX() {
return x; return x;
} }
/** /**
* Sets the value of the x property. * Sets the value of the x property.
* *
*/ */
public void setX(int value) { public void setX(int value) {
this.x = value; this.x = value;
} }
/** /**
* Gets the value of the y property. * Gets the value of the y property.
* *
*/ */
public int getY() { public int getY() {
return y; return y;
} }
/** /**
* Sets the value of the y property. * Sets the value of the y property.
* *
*/ */
public void setY(int value) { public void setY(int value) {
this.y = value; this.y = value;
} }
/** /**
* Gets the value of the z property. * Gets the value of the z property.
* *
*/ */
public int getZ() { public int getZ() {
return z; return z;
} }
/** /**
* Sets the value of the z property. * Sets the value of the z property.
* *
*/ */
public void setZ(int value) { public void setZ(int value) {
this.z = value; this.z = value;
} }
} }

View File

@@ -2,27 +2,25 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for ZoneType complex type.
* Java class for ZoneType complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="ZoneType"> * &lt;complexType name="ZoneType">
@@ -51,129 +49,131 @@ import javax.xml.bind.annotation.XmlType;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point" }) @XmlType(name = "ZoneType", namespace = "zones", propOrder = {
"point"
})
public class ZoneType { public class ZoneType {
@XmlElement(required = true) @XmlElement(required = true)
protected List<ZoneType.Point> point; protected List<ZoneType.Point> point;
@XmlAttribute(name = "id", required = true) @XmlAttribute(name = "id", required = true)
protected String id; protected String id;
/** /**
* Gets the value of the point property. * Gets the value of the point property.
* *
* <p> * <p>
* This accessor method returns a reference to the live list, not a * This accessor method returns a reference to the live list,
* snapshot. Therefore any modification you make to the returned list will * not a snapshot. Therefore any modification you make to the
* be present inside the JAXB object. This is why there is not a * returned list will be present inside the JAXB object.
* <CODE>set</CODE> method for the point property. * This is why there is not a <CODE>set</CODE> method for the point property.
* *
* <p> * <p>
* For example, to add a new item, do as follows: * For example, to add a new item, do as follows:
* * <pre>
* <pre> * getPoint().add(newItem);
* getPoint().add(newItem); * </pre>
* </pre> *
* *
* * <p>
* <p> * Objects of the following type(s) are allowed in the list
* Objects of the following type(s) are allowed in the list * {@link ZoneType.Point }
* {@link ZoneType.Point } *
* *
* */
*/ public List<ZoneType.Point> getPoint() {
public List<ZoneType.Point> getPoint() { if (point == null) {
if (point == null) { point = new ArrayList<ZoneType.Point>();
point = new ArrayList<ZoneType.Point>(); }
} return this.point;
return this.point; }
}
/** /**
* Gets the value of the id property. * Gets the value of the id property.
* *
* @return possible object is {@link String } * @return
* * possible object is
*/ * {@link String }
public String getId() { *
return id; */
} public String getId() {
return id;
}
/** /**
* Sets the value of the id property. * Sets the value of the id property.
* *
* @param value * @param value
* allowed object is {@link String } * allowed object is
* * {@link String }
*/ *
public void setId(String value) { */
this.id = value; public void setId(String value) {
} this.id = value;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;/sequence>
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public static class Point {
@XmlAttribute(name = "x", required = true) /**
protected int x; * <p>Java class for anonymous complex type.
@XmlAttribute(name = "y", required = true) *
protected int y; * <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;/sequence>
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public static class Point {
/** @XmlAttribute(name = "x", required = true)
* Gets the value of the x property. protected int x;
* @XmlAttribute(name = "y", required = true)
*/ protected int y;
public int getX() {
return x;
}
/** /**
* Sets the value of the x property. * Gets the value of the x property.
* *
*/ */
public void setX(int value) { public int getX() {
this.x = value; return x;
} }
/** /**
* Gets the value of the y property. * Sets the value of the x property.
* *
*/ */
public int getY() { public void setX(int value) {
return y; this.x = value;
} }
/** /**
* Sets the value of the y property. * Gets the value of the y property.
* *
*/ */
public void setY(int value) { public int getY() {
this.y = value; return y;
} }
} /**
* Sets the value of the y property.
*
*/
public void setY(int value) {
this.y = value;
}
}
} }

View File

@@ -2,9 +2,10 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 01:03:28 PM BRT // Generated on: 2012.05.03 at 07:58:30 PM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +14,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**
* <p> * <p>Java class for anonymous complex type.
* Java class for anonymous complex type.
* *
* <p> * <p>The following schema fragment specifies the expected content contained within this class.
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType> * &lt;complexType>
@@ -56,146 +55,157 @@ import javax.xml.bind.annotation.XmlType;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "castle" }) @XmlType(name = "", propOrder = {
"castle"
})
@XmlRootElement(name = "zones", namespace = "zones") @XmlRootElement(name = "zones", namespace = "zones")
public class Zones { public class Zones {
@XmlElement(required = true) @XmlElement(required = true)
protected Zones.Castle castle; protected Zones.Castle castle;
/** /**
* Gets the value of the castle property. * Gets the value of the castle property.
* *
* @return possible object is {@link Zones.Castle } * @return
* * possible object is
*/ * {@link Zones.Castle }
public Zones.Castle getCastle() { *
return castle; */
} public Zones.Castle getCastle() {
return castle;
}
/** /**
* Sets the value of the castle property. * Sets the value of the castle property.
* *
* @param value * @param value
* allowed object is {@link Zones.Castle } * allowed object is
* * {@link Zones.Castle }
*/ *
public void setCastle(Zones.Castle value) { */
this.castle = value; public void setCastle(Zones.Castle value) {
} this.castle = value;
}
/**
* <p>
* Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="siege">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "siege" })
public static class Castle {
@XmlElement(required = true) /**
protected Zones.Castle.Siege siege; * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="siege">
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"siege"
})
public static class Castle {
/** @XmlElement(required = true)
* Gets the value of the siege property. protected Zones.Castle.Siege siege;
*
* @return possible object is {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege getSiege() {
return siege;
}
/** /**
* Sets the value of the siege property. * Gets the value of the siege property.
* *
* @param value * @return
* allowed object is {@link Zones.Castle.Siege } * possible object is
* * {@link Zones.Castle.Siege }
*/ *
public void setSiege(Zones.Castle.Siege value) { */
this.siege = value; public Zones.Castle.Siege getSiege() {
} return siege;
}
/** /**
* <p> * Sets the value of the siege property.
* Java class for anonymous complex type. *
* * @param value
* <p> * allowed object is
* The following schema fragment specifies the expected content * {@link Zones.Castle.Siege }
* contained within this class. *
* */
* <pre> public void setSiege(Zones.Castle.Siege value) {
* &lt;complexType> this.siege = value;
* &lt;complexContent> }
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "zone" })
public static class Siege {
@XmlElement(required = true)
protected ZoneType zone;
/** /**
* Gets the value of the zone property. * <p>Java class for anonymous complex type.
* *
* @return possible object is {@link ZoneType } * <p>The following schema fragment specifies the expected content contained within this class.
* *
*/ * <pre>
public ZoneType getZone() { * &lt;complexType>
return zone; * &lt;complexContent>
} * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"zone"
})
public static class Siege {
/** @XmlElement(required = true)
* Sets the value of the zone property. protected ZoneType zone;
*
* @param value
* allowed object is {@link ZoneType }
*
*/
public void setZone(ZoneType value) {
this.zone = value;
}
} /**
* 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;
}
}
}
} }

View File

@@ -22,7 +22,7 @@ import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.l2jserver.model.id.TemplateID; import com.l2jserver.model.id.TemplateID;
import com.l2jserver.model.template.SkillTemplate; import com.l2jserver.model.template.SkillTemplate;
import com.l2jserver.model.template.npc.TeleportationTemplate; import com.l2jserver.model.template.TeleportationTemplate;
import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.service.game.template.TemplateService;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter; import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;

View File

@@ -1,146 +0,0 @@
/*
* This file is part of l2jserver2 <l2jserver2.com>.
*
* 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 <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.model.template.npc;
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.XmlElementWrapper;
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.ItemTemplateID;
import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.model.template.AbstractTemplate;
import com.l2jserver.util.geometry.Coordinate;
import com.l2jserver.util.jaxb.CoordinateAdapter;
import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
/**
* Template for effects
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@XmlRootElement(name = "teleport", namespace = "http://schemas.l2jserver2.com/teleport")
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(namespace = "http://schemas.l2jserver2.com/teleport", name = "TeleportType")
public class TeleportationTemplate extends AbstractTemplate {
/**
* The teleportation template ID
*/
@XmlAttribute(name = "id")
@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
protected TeleportationTemplateID id;
/**
* The teleportation name
*/
@XmlAttribute(name = "name")
protected String name;
/**
* The teleportation cost item id
*/
@XmlAttribute(name = "item", required = false)
@XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
protected ItemTemplateID itemTemplateID;
/**
* The amount of items decreased
*/
@XmlAttribute(name = "price", required = true)
protected int price;
/**
* The teleportation point
*/
@XmlElement(name = "point", required = false)
@XmlJavaTypeAdapter(CoordinateAdapter.class)
protected Coordinate coordinate;
/**
* The teleportation restrictions
*/
@XmlElementWrapper(name = "restrictions", required = false)
@XmlElement(name = "restriction", required = true)
protected List<TeleportRestriction> restrictions;
/**
* Defines an teleport restriction
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@XmlType(name = "TeleportRestrictionType")
public enum TeleportRestriction {
/**
* Only nobles can use this teleport
*/
NOBLE;
}
/**
* Create a new {@link Coordinate}
*
* @return the created object
*/
public Coordinate create() {
return coordinate;
}
/**
* @return the name
*/
public String getName() {
return name;
}
/**
* @return the id
*/
public TeleportationTemplateID getId() {
return id;
}
/**
* @return the itemTemplateID
*/
public ItemTemplateID getItemTemplateID() {
return itemTemplateID;
}
/**
* @return the price
*/
public int getPrice() {
return price;
}
/**
* @return the coordinate
*/
public Coordinate getCoordinate() {
return coordinate;
}
@Override
public TeleportationTemplateID getID() {
return id;
}
}

View File

@@ -18,12 +18,13 @@ package com.l2jserver.model.world.npc.controller.impl;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.l2jserver.model.id.template.provider.TeleportationTemplateIDProvider; import com.l2jserver.model.id.template.provider.TeleportationTemplateIDProvider;
import com.l2jserver.model.template.npc.TeleportationTemplate; import com.l2jserver.model.template.TeleportationTemplate;
import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.NPC; import com.l2jserver.model.world.NPC;
import com.l2jserver.model.world.npc.BaseNPCController; import com.l2jserver.model.world.npc.BaseNPCController;
import com.l2jserver.service.game.spawn.SpawnService; import com.l2jserver.service.game.spawn.SpawnService;
import com.l2jserver.util.exception.L2Exception; import com.l2jserver.util.exception.L2Exception;
import com.l2jserver.util.geometry.Coordinate;
/** /**
* This controller is used to control teleporters (e.g. gatekeepers) * This controller is used to control teleporters (e.g. gatekeepers)
@@ -48,12 +49,14 @@ public class TeleporterController extends BaseNPCController {
if (args.length >= 2) { if (args.length >= 2) {
switch (args[0]) { switch (args[0]) {
case "goto": case "goto":
final TeleportationTemplate tele = teleportationIdProvider.resolveID(Integer.parseInt(args[1])).getTemplate(); final TeleportationTemplate tele = teleportationIdProvider
.resolveID(Integer.parseInt(args[1])).getTemplate();
if (tele == null) { if (tele == null) {
throw new NPCControllerException(); throw new NPCControllerException();
} }
// TODO remove items from character inventory // TODO remove items from character inventory
spawnService.teleport(character, tele.getCoordinate()); spawnService.teleport(character,
Coordinate.fromTemplateCoordinate(tele.getPoint()));
return; return;
} }
} }

View File

@@ -32,11 +32,6 @@ import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller; import javax.xml.bind.Unmarshaller;
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;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
@@ -54,7 +49,6 @@ import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.template.SkillTemplate; import com.l2jserver.model.template.SkillTemplate;
import com.l2jserver.model.template.Teleports; import com.l2jserver.model.template.Teleports;
import com.l2jserver.model.template.Template; import com.l2jserver.model.template.Template;
import com.l2jserver.model.template.npc.TeleportationTemplate;
import com.l2jserver.service.AbstractConfigurableService; import com.l2jserver.service.AbstractConfigurableService;
import com.l2jserver.service.AbstractService.Depends; import com.l2jserver.service.AbstractService.Depends;
import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStartException;
@@ -257,8 +251,11 @@ public class XMLTemplateService extends
* if any error occur while processing the XML * if any error occur while processing the XML
* @throws IOException * @throws IOException
* if any error occur in the I/O level * if any error occur in the I/O level
* @throws ServiceStartException
* if the template type is not known
*/ */
public void loadTemplate(Path path) throws JAXBException, IOException { public void loadTemplate(Path path) throws JAXBException, IOException,
ServiceStartException {
Preconditions.checkNotNull(path, "path"); Preconditions.checkNotNull(path, "path");
log.debug("Loading template {}", path); log.debug("Loading template {}", path);
final InputStream in = Files.newInputStream(path, final InputStream in = Files.newInputStream(path,
@@ -270,12 +267,15 @@ public class XMLTemplateService extends
log.debug("Template loaded: {}", template); log.debug("Template loaded: {}", template);
if (template.getID() != null) if (template.getID() != null)
templates.put(template.getID(), template); templates.put(template.getID(), template);
} else if (obj instanceof TeleportationTemplateContainer) { } else if (obj instanceof Teleports) {
for (final Template template : ((TeleportationTemplateContainer) obj).templates) { for (final Template template : ((Teleports) obj).getTeleport()) {
log.debug("Template loaded: {}", template); log.debug("Template loaded: {}", template);
if (template.getID() != null) if (template.getID() != null)
templates.put(template.getID(), template); templates.put(template.getID(), template);
} }
} else {
throw new ServiceStartException(
"Unknown template container type: " + obj);
} }
} finally { } finally {
// in.close(); // in.close();
@@ -301,20 +301,4 @@ public class XMLTemplateService extends
unmarshaller = null; unmarshaller = null;
context = null; context = null;
} }
/**
* The teleportation template container
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
@XmlType(namespace = "http://schemas.l2jserver2.com/teleport", name = "TeleportsType")
@XmlAccessorType(XmlAccessType.FIELD)
public static class TeleportationTemplateContainer {
/**
* The list of all teleportation templates
*/
@XmlElement(namespace = "http://schemas.l2jserver2.com/teleport", name = "teleport")
public List<TeleportationTemplate> templates;
}
} }

View File

@@ -18,6 +18,8 @@ package com.l2jserver.util.geometry;
import org.apache.commons.math.geometry.Vector3D; import org.apache.commons.math.geometry.Vector3D;
import com.l2jserver.model.template.TemplateCoordinate;
/** /**
* Represents an coordinate in the game world. * Represents an coordinate in the game world.
* <p> * <p>
@@ -106,6 +108,19 @@ public class Coordinate {
return new Coordinate(x, y, z); return new Coordinate(x, y, z);
} }
/**
* Creates a new instance from the another {@link TemplateCoordinate}
*
* @param templateCoordinate
* the template coordinate
* @return the new {@link Coordinate} object created
*/
public static Coordinate fromTemplateCoordinate(
TemplateCoordinate templateCoordinate) {
return fromXYZ(templateCoordinate.getX(), templateCoordinate.getY(),
templateCoordinate.getZ());
}
@Override @Override
public String toString() { public String toString() {
return "Coordinate [" + vector + "]"; return "Coordinate [" + vector + "]";

View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with l2jserver2. If not, see <http://www.gnu.org/licenses/>. * along with l2jserver2. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.l2jserver.model.template.npc; package com.l2jserver.model.template;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -43,23 +43,20 @@ import com.l2jserver.model.id.template.ItemTemplateID;
import com.l2jserver.model.id.template.NPCTemplateID; import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.id.template.SkillTemplateID; import com.l2jserver.model.id.template.SkillTemplateID;
import com.l2jserver.model.id.template.TeleportationTemplateID; import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.template.NPCTemplate.Droplist; import com.l2jserver.model.template.NPCTemplate.Droplist;
import com.l2jserver.model.template.NPCTemplate.Droplist.Item.DropCategory; import com.l2jserver.model.template.NPCTemplate.Droplist.Item.DropCategory;
import com.l2jserver.model.template.NPCTemplate.Skills; import com.l2jserver.model.template.NPCTemplate.Skills;
import com.l2jserver.model.template.NPCTemplate.Talk; import com.l2jserver.model.template.NPCTemplate.Talk;
import com.l2jserver.model.template.NPCTemplate.Talk.Chat; import com.l2jserver.model.template.NPCTemplate.Talk.Chat;
import com.l2jserver.model.template.ObjectFactory; import com.l2jserver.model.template.TeleportationTemplate.Restrictions;
import com.l2jserver.model.template.actor.ActorSex; import com.l2jserver.model.template.actor.ActorSex;
import com.l2jserver.model.template.npc.TeleportationTemplate.TeleportRestriction; import com.l2jserver.model.template.npc.NPCRace;
import com.l2jserver.model.world.npc.BaseNPCController; import com.l2jserver.model.world.npc.BaseNPCController;
import com.l2jserver.model.world.npc.NPCController; import com.l2jserver.model.world.npc.NPCController;
import com.l2jserver.model.world.npc.controller.impl.MonsterController; import com.l2jserver.model.world.npc.controller.impl.MonsterController;
import com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController; import com.l2jserver.model.world.npc.controller.impl.NotImplementedNPCController;
import com.l2jserver.model.world.npc.controller.impl.TeleporterController; import com.l2jserver.model.world.npc.controller.impl.TeleporterController;
import com.l2jserver.service.game.template.XMLTemplateService.TeleportationTemplateContainer;
import com.l2jserver.util.factory.CollectionFactory; import com.l2jserver.util.factory.CollectionFactory;
import com.l2jserver.util.geometry.Coordinate;
import com.sun.org.apache.xml.internal.serialize.OutputFormat; import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer; import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
@@ -76,7 +73,7 @@ public class NPCTemplateConverter {
private static List<NPCTemplate> templates = CollectionFactory.newList(); private static List<NPCTemplate> templates = CollectionFactory.newList();
private static Collection<File> htmlScannedFiles; private static Collection<File> htmlScannedFiles;
private static TeleportationTemplateContainer teleportation = new TeleportationTemplateContainer(); private static Teleports teleportation = new Teleports();
public static void main(String[] args) throws SQLException, IOException, public static void main(String[] args) throws SQLException, IOException,
ClassNotFoundException, JAXBException { ClassNotFoundException, JAXBException {
@@ -94,13 +91,13 @@ public class NPCTemplateConverter {
"html", "htm" }, true); "html", "htm" }, true);
final JAXBContext c = JAXBContext.newInstance(NPCTemplate.class, final JAXBContext c = JAXBContext.newInstance(NPCTemplate.class,
TeleportationTemplateContainer.class); Teleports.class);
final Connection conn = DriverManager.getConnection(JDBC_URL, final Connection conn = DriverManager.getConnection(JDBC_URL,
JDBC_USERNAME, JDBC_PASSWORD); JDBC_USERNAME, JDBC_PASSWORD);
{ {
System.out.println("Converting teleport templates..."); System.out.println("Converting teleport templates...");
teleportation.templates = CollectionFactory.newList(); teleportation.teleport = CollectionFactory.newList();
final Marshaller m = c.createMarshaller(); final Marshaller m = c.createMarshaller();
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
@@ -114,16 +111,18 @@ public class NPCTemplateConverter {
template.id = new TeleportationTemplateID(rs.getInt("id"), null); template.id = new TeleportationTemplateID(rs.getInt("id"), null);
template.name = rs.getString("Description"); template.name = rs.getString("Description");
template.coordinate = Coordinate.fromXYZ(rs.getInt("loc_x"), TemplateCoordinate coord = new TemplateCoordinate();
rs.getInt("loc_y"), rs.getInt("loc_z")); coord.x = rs.getInt("loc_x");
coord.y = rs.getInt("loc_y");
coord.z = rs.getInt("loc_z");
template.point = coord;
template.price = rs.getInt("price"); template.price = rs.getInt("price");
template.itemTemplateID = new ItemTemplateID( template.item = rs.getInt("itemId");
rs.getInt("itemId"), null);
if (rs.getBoolean("fornoble")) { if (rs.getBoolean("fornoble")) {
template.restrictions = Arrays template.restrictions = new Restrictions();
.asList(TeleportRestriction.NOBLE); template.restrictions.restriction = Arrays.asList("NOBLE");
} }
teleportation.templates.add(template); teleportation.teleport.add(template);
} }
m.marshal(teleportation, getXMLSerializer(new FileOutputStream( m.marshal(teleportation, getXMLSerializer(new FileOutputStream(
new File(target, "../teleports.xml")))); new File(target, "../teleports.xml"))));