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

Fixes issue loading teleportation templates

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-05-03 20:03:33 -03:00
parent c548c9205c
commit 74c894ae05
23 changed files with 7154 additions and 7008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
l2jserver2-gameserver/data/template/l2jserver2.xsd
View File

@@ -9,7 +9,8 @@
<xs:annotation>
<xs:appinfo>
<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:annotation>
<xs:sequence />
@@ -27,11 +28,11 @@
</xs:simpleType>
<xs:complexType name="Coordinate">
<!-- <xs:annotation> -->
<!-- <xs:appinfo> -->
<!-- <jaxb:javaType name="com.l2jserver.util.geometry.Coordinate" /> -->
<!-- </xs:appinfo> -->
<!-- </xs:annotation> -->
<xs:annotation>
<xs:appinfo>
<jaxb:class name="TemplateCoordinate" />
</xs:appinfo>
</xs:annotation>
<xs:sequence />
<xs:attribute name="x" type="xs:int" use="required" />
<xs:attribute name="y" type="xs:int" use="required" />

21
l2jserver2-gameserver/data/template/teleport.xsd
View File

@@ -18,16 +18,16 @@
<xs:restriction base="TemplateID" />
</xs:simpleType>
<xs:element name="teleports">
<xs:complexType>
<xs:sequence>
<xs:element name="teleport" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<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="point" type="Coordinate" minOccurs="0" />
<xs:element name="restrictions" minOccurs="0">
<xs:complexType>
<xs:sequence>
@@ -56,7 +56,12 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="teleports">
<xs:complexType>
<xs:sequence>
<xs:element name="teleport" type="ths:TeleportationTemplate"
minOccurs="1" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
</xs:element>

71
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode
View File

@@ -5,33 +5,9 @@
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.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:schemaBindings map="false">
<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:bindings>
<jaxb:bindings scd="~Coordinate">
<jaxb:class ref="com.l2jserver.model.template.Coordinate"/>
<jaxb:class ref="com.l2jserver.model.template.TemplateCoordinate"/>
</jaxb:bindings>
<jaxb:bindings scd="~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: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:schemaBindings map="false">
<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: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:schemaBindings map="false">
<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: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>

24
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
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.XmlType;
/**
* <p>
* Java class for AbstractTemplate complex type.
* <p>Java class for AbstractTemplate complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="AbstractTemplate">
@@ -35,8 +34,15 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "AbstractTemplate")
@XmlSeeAlso({ ItemTemplate.class, ActorTemplate.class, SkillTemplate.class,
com.l2jserver.model.template.Teleports.Teleport.class })
public abstract class AbstractTemplate implements Template {
@XmlSeeAlso({
ItemTemplate.class,
ActorTemplate.class,
SkillTemplate.class,
TeleportationTemplate.class
})
public abstract class AbstractTemplate
implements Template
{
}

21
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
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.XmlType;
/**
* <p>
* Java class for ActorTemplate complex type.
* <p>Java class for ActorTemplate complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="ActorTemplate">
@@ -33,7 +32,13 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ActorTemplate")
@XmlSeeAlso({ CharacterTemplate.class, NPCTemplate.class })
public abstract class ActorTemplate extends AbstractTemplate {
@XmlSeeAlso({
CharacterTemplate.class,
NPCTemplate.class
})
public abstract class ActorTemplate
extends AbstractTemplate
{
}

47
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
View File

@@ -2,22 +2,21 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
/**
* <p>
* Java class for CalculatorFunction complex type.
* <p>Java class for CalculatorFunction complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="CalculatorFunction">
@@ -37,8 +36,12 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CalculatorFunction", propOrder = { "set", "add", "subtract",
"random" })
@XmlType(name = "CalculatorFunction", propOrder = {
"set",
"add",
"subtract",
"random"
})
public class CalculatorFunction {
protected CalculatorFunctionOperation set;
@@ -49,7 +52,9 @@ public class CalculatorFunction {
/**
* Gets the value of the set property.
*
* @return possible object is {@link CalculatorFunctionOperation }
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSet() {
@@ -60,7 +65,8 @@ public class CalculatorFunction {
* Sets the value of the set property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setSet(CalculatorFunctionOperation value) {
@@ -70,7 +76,9 @@ public class CalculatorFunction {
/**
* Gets the value of the add property.
*
* @return possible object is {@link CalculatorFunctionOperation }
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getAdd() {
@@ -81,7 +89,8 @@ public class CalculatorFunction {
* Sets the value of the add property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setAdd(CalculatorFunctionOperation value) {
@@ -91,7 +100,9 @@ public class CalculatorFunction {
/**
* Gets the value of the subtract property.
*
* @return possible object is {@link CalculatorFunctionOperation }
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSubtract() {
@@ -102,7 +113,8 @@ public class CalculatorFunction {
* Sets the value of the subtract property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setSubtract(CalculatorFunctionOperation value) {
@@ -112,7 +124,9 @@ public class CalculatorFunction {
/**
* Gets the value of the random property.
*
* @return possible object is {@link CalculatorFunctionOperation }
* @return
* possible object is
* {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getRandom() {
@@ -123,7 +137,8 @@ public class CalculatorFunction {
* Sets the value of the random property.
*
* @param value
* allowed object is {@link CalculatorFunctionOperation }
* allowed object is
* {@link CalculatorFunctionOperation }
*
*/
public void setRandom(CalculatorFunctionOperation value) {

19
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
View File

@@ -2,25 +2,23 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
/**
* <p>
* Java class for CalculatorFunctionOperation complex type.
* <p>Java class for CalculatorFunctionOperation complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="CalculatorFunctionOperation">
@@ -47,7 +45,9 @@ public class CalculatorFunctionOperation {
/**
* Gets the value of the order property.
*
* @return possible object is {@link BigInteger }
* @return
* possible object is
* {@link BigInteger }
*
*/
public BigInteger getOrder() {
@@ -58,7 +58,8 @@ public class CalculatorFunctionOperation {
* Sets the value of the order property.
*
* @param value
* allowed object is {@link BigInteger }
* allowed object is
* {@link BigInteger }
*
*/
public void setOrder(BigInteger value) {

267
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,17 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.CharacterTemplateID;
import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
/**
* <p>
* Java class for character element declaration.
* <p>Java class for character element declaration.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;element name="character">
@@ -226,9 +224,14 @@ import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "stats", "collision" })
@XmlType(name = "", propOrder = {
"stats",
"collision"
})
@XmlRootElement(name = "character", namespace = "http://schemas.l2jserver2.com/character")
public class CharacterTemplate extends ActorTemplate {
public class CharacterTemplate
extends ActorTemplate
{
@XmlElement(required = true)
protected CharacterTemplate.Stats stats;
@@ -241,7 +244,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the stats property.
*
* @return possible object is {@link CharacterTemplate.Stats }
* @return
* possible object is
* {@link CharacterTemplate.Stats }
*
*/
public CharacterTemplate.Stats getStats() {
@@ -252,7 +257,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the stats property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats }
* allowed object is
* {@link CharacterTemplate.Stats }
*
*/
public void setStats(CharacterTemplate.Stats value) {
@@ -262,7 +268,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the collision property.
*
* @return possible object is {@link CharacterTemplate.Collision }
* @return
* possible object is
* {@link CharacterTemplate.Collision }
*
*/
public CharacterTemplate.Collision getCollision() {
@@ -273,7 +281,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the collision property.
*
* @param value
* allowed object is {@link CharacterTemplate.Collision }
* allowed object is
* {@link CharacterTemplate.Collision }
*
*/
public void setCollision(CharacterTemplate.Collision value) {
@@ -283,7 +292,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public CharacterTemplateID getID() {
@@ -294,20 +305,19 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setID(CharacterTemplateID value) {
this.id = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -347,7 +357,10 @@ public class CharacterTemplate extends ActorTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "male", "female" })
@XmlType(name = "", propOrder = {
"male",
"female"
})
public static class Collision {
@XmlElement(required = true)
@@ -358,7 +371,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the male property.
*
* @return possible object is {@link CharacterTemplate.Collision.Male }
* @return
* possible object is
* {@link CharacterTemplate.Collision.Male }
*
*/
public CharacterTemplate.Collision.Male getMale() {
@@ -369,7 +384,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the male property.
*
* @param value
* allowed object is {@link CharacterTemplate.Collision.Male }
* allowed object is
* {@link CharacterTemplate.Collision.Male }
*
*/
public void setMale(CharacterTemplate.Collision.Male value) {
@@ -379,7 +395,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the female property.
*
* @return possible object is {@link CharacterTemplate.Collision.Female }
* @return
* possible object is
* {@link CharacterTemplate.Collision.Female }
*
*/
public CharacterTemplate.Collision.Female getFemale() {
@@ -398,13 +416,11 @@ public class CharacterTemplate extends ActorTemplate {
this.female = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -464,13 +480,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -532,13 +546,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -693,8 +705,16 @@ public class CharacterTemplate extends ActorTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "hp", "mp", "cp", "attack", "defense",
"move", "base", "maxload" })
@XmlType(name = "", propOrder = {
"hp",
"mp",
"cp",
"attack",
"defense",
"move",
"base",
"maxload"
})
public static class Stats {
@XmlElement(required = true)
@@ -720,7 +740,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the hp property.
*
* @return possible object is {@link CharacterTemplate.Stats.Hp }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Hp }
*
*/
public CharacterTemplate.Stats.Hp getHp() {
@@ -731,7 +753,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the hp property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Hp }
* allowed object is
* {@link CharacterTemplate.Stats.Hp }
*
*/
public void setHp(CharacterTemplate.Stats.Hp value) {
@@ -741,7 +764,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the mp property.
*
* @return possible object is {@link CharacterTemplate.Stats.Mp }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Mp }
*
*/
public CharacterTemplate.Stats.Mp getMp() {
@@ -752,7 +777,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the mp property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Mp }
* allowed object is
* {@link CharacterTemplate.Stats.Mp }
*
*/
public void setMp(CharacterTemplate.Stats.Mp value) {
@@ -762,7 +788,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the cp property.
*
* @return possible object is {@link CharacterTemplate.Stats.Cp }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Cp }
*
*/
public CharacterTemplate.Stats.Cp getCp() {
@@ -773,7 +801,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the cp property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Cp }
* allowed object is
* {@link CharacterTemplate.Stats.Cp }
*
*/
public void setCp(CharacterTemplate.Stats.Cp value) {
@@ -783,7 +812,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the attack property.
*
* @return possible object is {@link CharacterTemplate.Stats.Attack }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Attack }
*
*/
public CharacterTemplate.Stats.Attack getAttack() {
@@ -794,7 +825,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the attack property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Attack }
* allowed object is
* {@link CharacterTemplate.Stats.Attack }
*
*/
public void setAttack(CharacterTemplate.Stats.Attack value) {
@@ -804,7 +836,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the defense property.
*
* @return possible object is {@link CharacterTemplate.Stats.Defense }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Defense }
*
*/
public CharacterTemplate.Stats.Defense getDefense() {
@@ -815,7 +849,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the defense property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Defense }
* allowed object is
* {@link CharacterTemplate.Stats.Defense }
*
*/
public void setDefense(CharacterTemplate.Stats.Defense value) {
@@ -825,7 +860,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the move property.
*
* @return possible object is {@link CharacterTemplate.Stats.Move }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Move }
*
*/
public CharacterTemplate.Stats.Move getMove() {
@@ -836,7 +873,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the move property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Move }
* allowed object is
* {@link CharacterTemplate.Stats.Move }
*
*/
public void setMove(CharacterTemplate.Stats.Move value) {
@@ -846,7 +884,9 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the base property.
*
* @return possible object is {@link CharacterTemplate.Stats.Base }
* @return
* possible object is
* {@link CharacterTemplate.Stats.Base }
*
*/
public CharacterTemplate.Stats.Base getBase() {
@@ -857,7 +897,8 @@ public class CharacterTemplate extends ActorTemplate {
* Sets the value of the base property.
*
* @param value
* allowed object is {@link CharacterTemplate.Stats.Base }
* allowed object is
* {@link CharacterTemplate.Stats.Base }
*
*/
public void setBase(CharacterTemplate.Stats.Base value) {
@@ -912,13 +953,11 @@ public class CharacterTemplate extends ActorTemplate {
this.crafter = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -961,7 +1000,10 @@ public class CharacterTemplate extends ActorTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "physical", "magical" })
@XmlType(name = "", propOrder = {
"physical",
"magical"
})
public static class Attack {
@XmlElement(required = true)
@@ -978,7 +1020,8 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the physical property.
*
* @return possible object is
* @return
* possible object is
* {@link CharacterTemplate.Stats.Attack.Physical }
*
*/
@@ -994,15 +1037,15 @@ public class CharacterTemplate extends ActorTemplate {
* {@link CharacterTemplate.Stats.Attack.Physical }
*
*/
public void setPhysical(
CharacterTemplate.Stats.Attack.Physical value) {
public void setPhysical(CharacterTemplate.Stats.Attack.Physical value) {
this.physical = value;
}
/**
* Gets the value of the magical property.
*
* @return possible object is
* @return
* possible object is
* {@link CharacterTemplate.Stats.Attack.Magical }
*
*/
@@ -1070,13 +1113,11 @@ public class CharacterTemplate extends ActorTemplate {
this.accuracy = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1136,13 +1177,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1204,13 +1243,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1346,13 +1383,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1431,13 +1466,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1475,7 +1508,10 @@ public class CharacterTemplate extends ActorTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "physical", "magical" })
@XmlType(name = "", propOrder = {
"physical",
"magical"
})
public static class Defense {
@XmlElement(required = true)
@@ -1486,7 +1522,8 @@ public class CharacterTemplate extends ActorTemplate {
/**
* Gets the value of the physical property.
*
* @return possible object is
* @return
* possible object is
* {@link CharacterTemplate.Stats.Defense.Physical }
*
*/
@@ -1502,15 +1539,15 @@ public class CharacterTemplate extends ActorTemplate {
* {@link CharacterTemplate.Stats.Defense.Physical }
*
*/
public void setPhysical(
CharacterTemplate.Stats.Defense.Physical value) {
public void setPhysical(CharacterTemplate.Stats.Defense.Physical value) {
this.physical = value;
}
/**
* Gets the value of the magical property.
*
* @return possible object is
* @return
* possible object is
* {@link CharacterTemplate.Stats.Defense.Magical }
*
*/
@@ -1530,13 +1567,11 @@ public class CharacterTemplate extends ActorTemplate {
this.magical = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1577,13 +1612,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1626,13 +1659,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1711,13 +1742,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -1777,13 +1806,11 @@ public class CharacterTemplate extends ActorTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>

311
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +16,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.ItemTemplateID;
import com.l2jserver.model.template.item.ArmorType;
import com.l2jserver.model.template.item.ItemMaterial;
@@ -27,13 +27,11 @@ import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
import com.l2jserver.util.jaxb.ItemTypeAdapter;
import com.l2jserver.util.jaxb.WeaponTypeAdapter;
/**
* <p>
* Java class for item element declaration.
* <p>Java class for item element declaration.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;element name="item">
@@ -156,10 +154,18 @@ import com.l2jserver.util.jaxb.WeaponTypeAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "attributes", "controller", "effect",
"etcItem", "weapon", "armor" })
@XmlType(name = "", propOrder = {
"attributes",
"controller",
"effect",
"etcItem",
"weapon",
"armor"
})
@XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item")
public class ItemTemplate extends AbstractTemplate {
public class ItemTemplate
extends AbstractTemplate
{
@XmlElement(required = true)
protected ItemTemplate.Attributes attributes;
@@ -181,7 +187,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the attributes property.
*
* @return possible object is {@link ItemTemplate.Attributes }
* @return
* possible object is
* {@link ItemTemplate.Attributes }
*
*/
public ItemTemplate.Attributes getAttributes() {
@@ -192,7 +200,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the attributes property.
*
* @param value
* allowed object is {@link ItemTemplate.Attributes }
* allowed object is
* {@link ItemTemplate.Attributes }
*
*/
public void setAttributes(ItemTemplate.Attributes value) {
@@ -202,7 +211,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the controller property.
*
* @return possible object is {@link ItemTemplate.Controller }
* @return
* possible object is
* {@link ItemTemplate.Controller }
*
*/
public ItemTemplate.Controller getController() {
@@ -213,7 +224,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the controller property.
*
* @param value
* allowed object is {@link ItemTemplate.Controller }
* allowed object is
* {@link ItemTemplate.Controller }
*
*/
public void setController(ItemTemplate.Controller value) {
@@ -223,7 +235,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the effect property.
*
* @return possible object is {@link ItemTemplate.Effect }
* @return
* possible object is
* {@link ItemTemplate.Effect }
*
*/
public ItemTemplate.Effect getEffect() {
@@ -234,7 +248,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the effect property.
*
* @param value
* allowed object is {@link ItemTemplate.Effect }
* allowed object is
* {@link ItemTemplate.Effect }
*
*/
public void setEffect(ItemTemplate.Effect value) {
@@ -244,7 +259,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the etcItem property.
*
* @return possible object is {@link ItemTemplate.EtcItem }
* @return
* possible object is
* {@link ItemTemplate.EtcItem }
*
*/
public ItemTemplate.EtcItem getEtcItem() {
@@ -255,7 +272,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the etcItem property.
*
* @param value
* allowed object is {@link ItemTemplate.EtcItem }
* allowed object is
* {@link ItemTemplate.EtcItem }
*
*/
public void setEtcItem(ItemTemplate.EtcItem value) {
@@ -265,7 +283,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the weapon property.
*
* @return possible object is {@link ItemTemplate.Weapon }
* @return
* possible object is
* {@link ItemTemplate.Weapon }
*
*/
public ItemTemplate.Weapon getWeapon() {
@@ -276,7 +296,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the weapon property.
*
* @param value
* allowed object is {@link ItemTemplate.Weapon }
* allowed object is
* {@link ItemTemplate.Weapon }
*
*/
public void setWeapon(ItemTemplate.Weapon value) {
@@ -286,7 +307,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the armor property.
*
* @return possible object is {@link ItemTemplate.Armor }
* @return
* possible object is
* {@link ItemTemplate.Armor }
*
*/
public ItemTemplate.Armor getArmor() {
@@ -297,7 +320,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the armor property.
*
* @param value
* allowed object is {@link ItemTemplate.Armor }
* allowed object is
* {@link ItemTemplate.Armor }
*
*/
public void setArmor(ItemTemplate.Armor value) {
@@ -307,7 +331,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public ItemTemplateID getID() {
@@ -318,7 +344,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setID(ItemTemplateID value) {
@@ -328,7 +355,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the name property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getName() {
@@ -339,7 +368,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the name property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setName(String value) {
@@ -349,7 +379,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the icon property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getIcon() {
@@ -360,20 +392,19 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the icon property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setIcon(String value) {
this.icon = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -409,7 +440,10 @@ public class ItemTemplate extends AbstractTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "cost", "equipment" })
@XmlType(name = "", propOrder = {
"cost",
"equipment"
})
public static class Armor {
@XmlElement(required = true)
@@ -426,7 +460,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the cost property.
*
* @return possible object is {@link ItemTemplate.Armor.Cost }
* @return
* possible object is
* {@link ItemTemplate.Armor.Cost }
*
*/
public ItemTemplate.Armor.Cost getCost() {
@@ -437,7 +473,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the cost property.
*
* @param value
* allowed object is {@link ItemTemplate.Armor.Cost }
* allowed object is
* {@link ItemTemplate.Armor.Cost }
*
*/
public void setCost(ItemTemplate.Armor.Cost value) {
@@ -447,7 +484,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the equipment property.
*
* @return possible object is {@link ItemTemplate.Armor.Equipment }
* @return
* possible object is
* {@link ItemTemplate.Armor.Equipment }
*
*/
public ItemTemplate.Armor.Equipment getEquipment() {
@@ -458,7 +497,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the equipment property.
*
* @param value
* allowed object is {@link ItemTemplate.Armor.Equipment }
* allowed object is
* {@link ItemTemplate.Armor.Equipment }
*
*/
public void setEquipment(ItemTemplate.Armor.Equipment value) {
@@ -468,7 +508,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the weigth property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getWeigth() {
@@ -479,7 +521,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the weigth property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setWeigth(String value) {
@@ -489,7 +532,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the type property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public ArmorType getType() {
@@ -500,20 +545,19 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the type property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setType(ArmorType value) {
this.type = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -538,7 +582,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the adena property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getAdena() {
@@ -549,7 +595,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the adena property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setAdena(String value) {
@@ -558,13 +605,11 @@ public class ItemTemplate extends AbstractTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -589,7 +634,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the part property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getPart() {
@@ -600,7 +647,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the part property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setPart(String value) {
@@ -611,13 +659,11 @@ public class ItemTemplate extends AbstractTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -644,7 +690,9 @@ public class ItemTemplate extends AbstractTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "cost" })
@XmlType(name = "", propOrder = {
"cost"
})
public static class Attributes {
@XmlElement(required = true)
@@ -658,7 +706,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the cost property.
*
* @return possible object is {@link ItemTemplate.Attributes.Cost }
* @return
* possible object is
* {@link ItemTemplate.Attributes.Cost }
*
*/
public ItemTemplate.Attributes.Cost getCost() {
@@ -669,7 +719,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the cost property.
*
* @param value
* allowed object is {@link ItemTemplate.Attributes.Cost }
* allowed object is
* {@link ItemTemplate.Attributes.Cost }
*
*/
public void setCost(ItemTemplate.Attributes.Cost value) {
@@ -679,7 +730,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the weigth property.
*
* @return possible object is {@link Integer }
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getWeigth() {
@@ -690,7 +743,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the weigth property.
*
* @param value
* allowed object is {@link Integer }
* allowed object is
* {@link Integer }
*
*/
public void setWeigth(Integer value) {
@@ -700,7 +754,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the material property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public ItemMaterial getMaterial() {
@@ -711,20 +767,19 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the material property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setMaterial(ItemMaterial value) {
this.material = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -748,7 +803,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the adena property.
*
* @return possible object is {@link Integer }
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getAdena() {
@@ -759,7 +816,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the adena property.
*
* @param value
* allowed object is {@link Integer }
* allowed object is
* {@link Integer }
*
*/
public void setAdena(Integer value) {
@@ -770,13 +828,11 @@ public class ItemTemplate extends AbstractTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -801,7 +857,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the defaultAction property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getDefaultAction() {
@@ -812,7 +870,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the defaultAction property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setDefaultAction(String value) {
@@ -821,13 +880,11 @@ public class ItemTemplate extends AbstractTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -857,7 +914,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the type property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getType() {
@@ -868,7 +927,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the type property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setType(String value) {
@@ -877,13 +937,11 @@ public class ItemTemplate extends AbstractTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -908,7 +966,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the type property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public ItemType getType() {
@@ -919,7 +979,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the type property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setType(ItemType value) {
@@ -928,13 +989,11 @@ public class ItemTemplate extends AbstractTemplate {
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -956,8 +1015,12 @@ public class ItemTemplate extends AbstractTemplate {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "physicalDamage", "magicalDamage",
"criticalChance", "physicalAttackSpeed" })
@XmlType(name = "", propOrder = {
"physicalDamage",
"magicalDamage",
"criticalChance",
"physicalAttackSpeed"
})
public static class Weapon {
@XmlElement(required = true)
@@ -978,7 +1041,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the physicalDamage property.
*
* @return possible object is {@link CalculatorFunction }
* @return
* possible object is
* {@link CalculatorFunction }
*
*/
public CalculatorFunction getPhysicalDamage() {
@@ -989,7 +1054,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the physicalDamage property.
*
* @param value
* allowed object is {@link CalculatorFunction }
* allowed object is
* {@link CalculatorFunction }
*
*/
public void setPhysicalDamage(CalculatorFunction value) {
@@ -999,7 +1065,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the magicalDamage property.
*
* @return possible object is {@link CalculatorFunction }
* @return
* possible object is
* {@link CalculatorFunction }
*
*/
public CalculatorFunction getMagicalDamage() {
@@ -1010,7 +1078,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the magicalDamage property.
*
* @param value
* allowed object is {@link CalculatorFunction }
* allowed object is
* {@link CalculatorFunction }
*
*/
public void setMagicalDamage(CalculatorFunction value) {
@@ -1020,7 +1089,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the criticalChance property.
*
* @return possible object is {@link CalculatorFunction }
* @return
* possible object is
* {@link CalculatorFunction }
*
*/
public CalculatorFunction getCriticalChance() {
@@ -1031,7 +1102,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the criticalChance property.
*
* @param value
* allowed object is {@link CalculatorFunction }
* allowed object is
* {@link CalculatorFunction }
*
*/
public void setCriticalChance(CalculatorFunction value) {
@@ -1041,7 +1113,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the physicalAttackSpeed property.
*
* @return possible object is {@link CalculatorFunction }
* @return
* possible object is
* {@link CalculatorFunction }
*
*/
public CalculatorFunction getPhysicalAttackSpeed() {
@@ -1052,7 +1126,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the physicalAttackSpeed property.
*
* @param value
* allowed object is {@link CalculatorFunction }
* allowed object is
* {@link CalculatorFunction }
*
*/
public void setPhysicalAttackSpeed(CalculatorFunction value) {
@@ -1062,7 +1137,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the part property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getPart() {
@@ -1073,7 +1150,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the part property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setPart(String value) {
@@ -1083,7 +1161,9 @@ public class ItemTemplate extends AbstractTemplate {
/**
* Gets the value of the type property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public WeaponType getType() {
@@ -1094,7 +1174,8 @@ public class ItemTemplate extends AbstractTemplate {
* Sets the value of the type property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setType(WeaponType value) {

601
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
View File

File diff suppressed because it is too large Load Diff

61
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
View File

@@ -2,30 +2,35 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlRegistry;
/**
* This object contains factory methods for each Java content interface and Java
* element interface generated in the com.l2jserver.model.template package.
* <p>
* An ObjectFactory allows you to programatically construct new instances of the
* Java representation for XML content. The Java representation of XML content
* can consist of schema derived interfaces and classes representing the binding
* of schema type definitions, element declarations and model groups. Factory
* methods for each of these are provided in this class.
* This object contains factory methods for each
* Java content interface and Java element interface
* generated in the com.l2jserver.model.template package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
* content can consist of schema derived interfaces
* and classes representing the binding of schema
* type definitions, element declarations and model
* groups. Factory methods for each of these are
* provided in this class.
*
*/
@XmlRegistry
public class ObjectFactory {
/**
* Create a new ObjectFactory that can be used to create new instances of
* schema derived classes for package: com.l2jserver.model.template
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template
*
*/
public ObjectFactory() {
@@ -55,14 +60,6 @@ public class ObjectFactory {
return new NPCTemplate.Droplist.Item();
}
/**
* Create an instance of {@link Teleports }
*
*/
public Teleports createTeleports() {
return new Teleports();
}
/**
* Create an instance of {@link Zones }
*
@@ -88,11 +85,11 @@ public class ObjectFactory {
}
/**
* Create an instance of {@link Teleports.Teleport }
* Create an instance of {@link TeleportationTemplate }
*
*/
public Teleports.Teleport createTeleportsTeleport() {
return new Teleports.Teleport();
public TeleportationTemplate createTeleportationTemplate() {
return new TeleportationTemplate();
}
/**
@@ -216,11 +213,11 @@ public class ObjectFactory {
}
/**
* Create an instance of {@link Coordinate }
* Create an instance of {@link TemplateCoordinate }
*
*/
public Coordinate createCoordinate() {
return new Coordinate();
public TemplateCoordinate createTemplateCoordinate() {
return new TemplateCoordinate();
}
/**
@@ -239,6 +236,14 @@ public class ObjectFactory {
return new SkillTemplate();
}
/**
* Create an instance of {@link Teleports }
*
*/
public Teleports createTeleports() {
return new Teleports();
}
/**
* Create an instance of {@link ZoneType.Point }
*
@@ -256,11 +261,11 @@ public class ObjectFactory {
}
/**
* Create an instance of {@link Teleports.Teleport.Restrictions }
* Create an instance of {@link TeleportationTemplate.Restrictions }
*
*/
public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
return new Teleports.Teleport.Restrictions();
public TeleportationTemplate.Restrictions createTeleportationTemplateRestrictions() {
return new TeleportationTemplate.Restrictions();
}
/**

34
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
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.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.SkillTemplateID;
import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
/**
* <p>
* Java class for skill element declaration.
* <p>Java class for skill element declaration.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;element name="skill">
@@ -46,9 +44,13 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "maximumLevel" })
@XmlType(name = "", propOrder = {
"maximumLevel"
})
@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
public class SkillTemplate extends AbstractTemplate {
public class SkillTemplate
extends AbstractTemplate
{
protected int maximumLevel;
@XmlAttribute(name = "id", required = true)
@@ -80,7 +82,9 @@ public class SkillTemplate extends AbstractTemplate {
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public SkillTemplateID getID() {
@@ -91,7 +95,8 @@ public class SkillTemplate extends AbstractTemplate {
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setID(SkillTemplateID value) {
@@ -101,7 +106,9 @@ public class SkillTemplate extends AbstractTemplate {
/**
* Gets the value of the name property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getName() {
@@ -112,7 +119,8 @@ public class SkillTemplate extends AbstractTemplate {
* Sets the value of the name property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setName(String value) {

286
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/TeleportationTemplate.java Normal file
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;
}
}
}

318
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
View File

@@ -2,70 +2,32 @@
// 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.03.25 at 01:03:28 PM BRT
// 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.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <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="teleport" 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;element name="teleport" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplate" maxOccurs="unbounded"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -75,25 +37,26 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "teleport" })
@XmlType(name = "", propOrder = {
"teleport"
})
@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
public class Teleports {
@XmlElement(required = true)
protected List<Teleports.Teleport> teleport;
protected List<TeleportationTemplate> teleport;
/**
* Gets the value of the teleport 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 teleport property.
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the teleport property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getTeleport().add(newItem);
* </pre>
@@ -101,264 +64,15 @@ public class Teleports {
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link Teleports.Teleport }
* {@link TeleportationTemplate }
*
*
*/
public List<Teleports.Teleport> getTeleport() {
public List<TeleportationTemplate> getTeleport() {
if (teleport == null) {
teleport = new ArrayList<Teleports.Teleport>();
teleport = new ArrayList<TeleportationTemplate>();
}
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;
}
}
}
}

13
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java → l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/TemplateCoordinate.java Executable file → Normal file
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
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.XmlType;
/**
* <p>
* Java class for Coordinate complex type.
* <p>Java class for Coordinate complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="Coordinate">
@@ -38,7 +37,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Coordinate")
public class Coordinate {
public class TemplateCoordinate {
@XmlAttribute(name = "x", required = true)
protected int x;

40
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
View File

@@ -2,27 +2,25 @@
// 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.03.25 at 01:03:28 PM BRT
// 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;
/**
* <p>
* Java class for ZoneType complex type.
* <p>Java class for ZoneType complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="ZoneType">
@@ -51,7 +49,9 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point" })
@XmlType(name = "ZoneType", namespace = "zones", propOrder = {
"point"
})
public class ZoneType {
@XmlElement(required = true)
@@ -63,14 +63,13 @@ public class ZoneType {
* Gets the value of the point 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 point property.
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the point property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getPoint().add(newItem);
* </pre>
@@ -92,7 +91,9 @@ public class ZoneType {
/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
* @return
* possible object is
* {@link String }
*
*/
public String getId() {
@@ -103,20 +104,19 @@ public class ZoneType {
* Sets the value of the id property.
*
* @param value
* allowed object is {@link String }
* allowed object is
* {@link String }
*
*/
public void setId(String value) {
this.id = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>

60
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
View File

@@ -2,9 +2,10 @@
// 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.03.25 at 01:03:28 PM BRT
// Generated on: 2012.05.03 at 07:58:30 PM BRT
//
package com.l2jserver.model.template;
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.XmlType;
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained within
* this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -56,7 +55,9 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "castle" })
@XmlType(name = "", propOrder = {
"castle"
})
@XmlRootElement(name = "zones", namespace = "zones")
public class Zones {
@@ -66,7 +67,9 @@ public class Zones {
/**
* 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() {
@@ -77,20 +80,19 @@ public class Zones {
* Sets the value of the castle property.
*
* @param value
* allowed object is {@link Zones.Castle }
* allowed object is
* {@link Zones.Castle }
*
*/
public void setCastle(Zones.Castle value) {
this.castle = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content contained
* within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -117,7 +119,9 @@ public class Zones {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "siege" })
@XmlType(name = "", propOrder = {
"siege"
})
public static class Castle {
@XmlElement(required = true)
@@ -126,7 +130,9 @@ public class Zones {
/**
* Gets the value of the siege property.
*
* @return possible object is {@link Zones.Castle.Siege }
* @return
* possible object is
* {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege getSiege() {
@@ -137,20 +143,19 @@ public class Zones {
* Sets the value of the siege property.
*
* @param value
* allowed object is {@link Zones.Castle.Siege }
* allowed object is
* {@link Zones.Castle.Siege }
*
*/
public void setSiege(Zones.Castle.Siege value) {
this.siege = value;
}
/**
* <p>
* Java class for anonymous complex type.
* <p>Java class for anonymous complex type.
*
* <p>
* The following schema fragment specifies the expected content
* contained within this class.
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
@@ -167,7 +172,9 @@ public class Zones {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { "zone" })
@XmlType(name = "", propOrder = {
"zone"
})
public static class Siege {
@XmlElement(required = true)
@@ -176,7 +183,9 @@ public class Zones {
/**
* Gets the value of the zone property.
*
* @return possible object is {@link ZoneType }
* @return
* possible object is
* {@link ZoneType }
*
*/
public ZoneType getZone() {
@@ -187,7 +196,8 @@ public class Zones {
* Sets the value of the zone property.
*
* @param value
* allowed object is {@link ZoneType }
* allowed object is
* {@link ZoneType }
*
*/
public void setZone(ZoneType value) {

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java
View File

@@ -22,7 +22,7 @@ import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.l2jserver.model.id.TemplateID;
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.util.jaxb.TeleportationTemplateIDAdapter;

146
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/npc/TeleportationTemplate.java
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;
}
}

9
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java
View File

@@ -18,12 +18,13 @@ package com.l2jserver.model.world.npc.controller.impl;
import com.google.inject.Inject;
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.NPC;
import com.l2jserver.model.world.npc.BaseNPCController;
import com.l2jserver.service.game.spawn.SpawnService;
import com.l2jserver.util.exception.L2Exception;
import com.l2jserver.util.geometry.Coordinate;
/**
* This controller is used to control teleporters (e.g. gatekeepers)
@@ -48,12 +49,14 @@ public class TeleporterController extends BaseNPCController {
if (args.length >= 2) {
switch (args[0]) {
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) {
throw new NPCControllerException();
}
// TODO remove items from character inventory
spawnService.teleport(character, tele.getCoordinate());
spawnService.teleport(character,
Coordinate.fromTemplateCoordinate(tele.getPoint()));
return;
}
}

34
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java
View File

@@ -32,11 +32,6 @@ import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
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.stream.StreamSource;
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.Teleports;
import com.l2jserver.model.template.Template;
import com.l2jserver.model.template.npc.TeleportationTemplate;
import com.l2jserver.service.AbstractConfigurableService;
import com.l2jserver.service.AbstractService.Depends;
import com.l2jserver.service.ServiceStartException;
@@ -257,8 +251,11 @@ public class XMLTemplateService extends
* if any error occur while processing the XML
* @throws IOException
* 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");
log.debug("Loading template {}", path);
final InputStream in = Files.newInputStream(path,
@@ -270,12 +267,15 @@ public class XMLTemplateService extends
log.debug("Template loaded: {}", template);
if (template.getID() != null)
templates.put(template.getID(), template);
} else if (obj instanceof TeleportationTemplateContainer) {
for (final Template template : ((TeleportationTemplateContainer) obj).templates) {
} else if (obj instanceof Teleports) {
for (final Template template : ((Teleports) obj).getTeleport()) {
log.debug("Template loaded: {}", template);
if (template.getID() != null)
templates.put(template.getID(), template);
}
} else {
throw new ServiceStartException(
"Unknown template container type: " + obj);
}
} finally {
// in.close();
@@ -301,20 +301,4 @@ public class XMLTemplateService extends
unmarshaller = 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;
}
}

15
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java
View File

@@ -18,6 +18,8 @@ package com.l2jserver.util.geometry;
import org.apache.commons.math.geometry.Vector3D;
import com.l2jserver.model.template.TemplateCoordinate;
/**
* Represents an coordinate in the game world.
* <p>
@@ -106,6 +108,19 @@ public class Coordinate {
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
public String toString() {
return "Coordinate [" + vector + "]";

31
l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java → l2jserver2-tools/src/main/java/com/l2jserver/model/template/NPCTemplateConverter.java
View File

@@ -14,7 +14,7 @@
* 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;
package com.l2jserver.model.template;
import java.io.File;
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.SkillTemplateID;
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.Item.DropCategory;
import com.l2jserver.model.template.NPCTemplate.Skills;
import com.l2jserver.model.template.NPCTemplate.Talk;
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.npc.TeleportationTemplate.TeleportRestriction;
import com.l2jserver.model.template.npc.NPCRace;
import com.l2jserver.model.world.npc.BaseNPCController;
import com.l2jserver.model.world.npc.NPCController;
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.TeleporterController;
import com.l2jserver.service.game.template.XMLTemplateService.TeleportationTemplateContainer;
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.XMLSerializer;
@@ -76,7 +73,7 @@ public class NPCTemplateConverter {
private static List<NPCTemplate> templates = CollectionFactory.newList();
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,
ClassNotFoundException, JAXBException {
@@ -94,13 +91,13 @@ public class NPCTemplateConverter {
"html", "htm" }, true);
final JAXBContext c = JAXBContext.newInstance(NPCTemplate.class,
TeleportationTemplateContainer.class);
Teleports.class);
final Connection conn = DriverManager.getConnection(JDBC_URL,
JDBC_USERNAME, JDBC_PASSWORD);
{
System.out.println("Converting teleport templates...");
teleportation.templates = CollectionFactory.newList();
teleportation.teleport = CollectionFactory.newList();
final Marshaller m = c.createMarshaller();
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
@@ -114,16 +111,18 @@ public class NPCTemplateConverter {
template.id = new TeleportationTemplateID(rs.getInt("id"), null);
template.name = rs.getString("Description");
template.coordinate = Coordinate.fromXYZ(rs.getInt("loc_x"),
rs.getInt("loc_y"), rs.getInt("loc_z"));
TemplateCoordinate coord = new TemplateCoordinate();
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.itemTemplateID = new ItemTemplateID(
rs.getInt("itemId"), null);
template.item = rs.getInt("itemId");
if (rs.getBoolean("fornoble")) {
template.restrictions = Arrays
.asList(TeleportRestriction.NOBLE);
template.restrictions = new Restrictions();
template.restrictions.restriction = Arrays.asList("NOBLE");
}
teleportation.templates.add(template);
teleportation.teleport.add(template);
}
m.marshal(teleportation, getXMLSerializer(new FileOutputStream(
new File(target, "../teleports.xml"))));