Change-Id: I0000000000000000000000000000000000000000

Change-Id: Idb54de2399013c159bda588be1ce065b8314af60
Change-Id: I8b913da4fe5139078b935b99e8e1aaa091480a75

data/script/template/script/template/armor/AbstractNoGradeArmorTemplate.java

@@ -1,10 +0,0 @@
-package script.template.armor;
-
-import com.l2jserver.model.id.TemplateID;
-import com.l2jserver.model.template.ArmorTemplate;
-
-public abstract class AbstractNoGradeArmorTemplate extends ArmorTemplate {
-	public AbstractNoGradeArmorTemplate(TemplateID id) {
-		super(id);
-	}
-}

data/script/template/script/template/item/AdenaItemTemplate.java

@@ -1,12 +1,24 @@
 package script.template.item;
 
-import com.l2jserver.model.id.TemplateID;
+import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;
 import com.l2jserver.model.template.ItemTemplate;
+import com.l2jserver.model.template.capability.Stackable;
+import com.l2jserver.model.world.Item;
 
-public class AdenaItemTemplate extends ItemTemplate {
-	public static final TemplateID ID = new TemplateID(57);
+public class AdenaItemTemplate extends ItemTemplate implements Stackable<Item> {
+	public static final int ID = 57;
 
-	public AdenaItemTemplate() {
-		super(ID);
+	public AdenaItemTemplate(ItemTemplateIDFactory factory) {
+		super(factory.createID(ID));
+	}
+
+	@Override
+	public void stack(Item... object) {
+		final Item item1 = object[0];
+		if (object.length >= 2) {
+			for (int i = 1; i < object.length; i++) {
+				// TODO set item amount
+			}
+		}
 	}
 }

data/script/template/script/template/item/TestPotionTemplate.java

@@ -1,16 +1,19 @@
 package script.template.item;
 
+import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;
 import com.l2jserver.model.template.PotionTemplate;
 import com.l2jserver.model.world.capability.Attackable;
 import com.l2jserver.model.world.capability.Attacker;
 
 public class TestPotionTemplate extends PotionTemplate {
-	public TestPotionTemplate() {
-		super(null);
+	public static final int ID = 15;
+
+	public TestPotionTemplate(ItemTemplateIDFactory factory) {
+		super(factory.createID(ID));
 	}
 
 	@Override
 	public void consume(Attacker source, Attackable target) {
-		//TODO consume item
+		// TODO Auto-generated method stub
 	}
 }

data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java

@@ -1,6 +1,6 @@
-package script.template.armor;
+package script.template.item.armor;
 
-import com.l2jserver.model.id.TemplateID;
+import com.l2jserver.model.id.template.ItemTemplateID;
 import com.l2jserver.model.template.ArmorTemplate;
 import com.l2jserver.model.template.capability.Enchantable;
 import com.l2jserver.model.template.capability.Penalty;
@@ -10,7 +10,7 @@ import com.l2jserver.model.world.capability.Levelable;
 
 public abstract class AbstractGradeAArmorTemplate extends ArmorTemplate
 		implements Enchantable, Penalty {
-	public AbstractGradeAArmorTemplate(TemplateID id) {
+	public AbstractGradeAArmorTemplate(ItemTemplateID id) {
 		super(id);
 	}
 

data/script/template/script/template/item/armor/AbstractNoGradeArmorTemplate.java

@@ -0,0 +1,10 @@
+package script.template.item.armor;
+
+import com.l2jserver.model.id.template.ItemTemplateID;
+import com.l2jserver.model.template.ArmorTemplate;
+
+public abstract class AbstractNoGradeArmorTemplate extends ArmorTemplate {
+	public AbstractNoGradeArmorTemplate(ItemTemplateID id) {
+		super(id);
+	}
+}

data/script/template/script/template/item/armor/Dummy2ArmorTemplate.java

@@ -1,17 +1,20 @@
-package script.template.armor;
+package script.template.item.armor;
 
+import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;
 import com.l2jserver.model.world.capability.Attackable;
 import com.l2jserver.model.world.capability.Attacker;
 import com.l2jserver.model.world.capability.Damagable;
 import com.l2jserver.model.world.capability.Enchantable;
 
 public class Dummy2ArmorTemplate extends AbstractGradeAArmorTemplate {
+	public static final int ID = 10;
+	
 	private static final int REDUCED_DAMAGE_PHYSICAL = 10;
 	private static final int REDUCED_DAMAGE_MAGICAL = 10;
 	private static final int MAX_ENCHANT = 10;
 
-	public Dummy2ArmorTemplate() {
-		super(null);
+	public Dummy2ArmorTemplate(ItemTemplateIDFactory factory) {
+		super(factory.createID(ID));
 	}
 
 	@Override

data/script/template/script/template/item/armor/DummyArmorTemplate.java

@@ -1,15 +1,18 @@
-package script.template.armor;
+package script.template.item.armor;
 
+import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory;
 import com.l2jserver.model.world.capability.Attackable;
 import com.l2jserver.model.world.capability.Attacker;
 import com.l2jserver.model.world.capability.Damagable;
 
 public class DummyArmorTemplate extends AbstractNoGradeArmorTemplate {
+	public static final int ID = 20;
+	
 	private static final int REDUCED_DAMAGE_PHYSICAL = 10;
 	private static final int REDUCED_DAMAGE_MAGICAL = 10;
 
-	public DummyArmorTemplate() {
-		super(null);
+	public DummyArmorTemplate(ItemTemplateIDFactory factory) {
+		super(factory.createID(ID));
 	}
 
 	@Override

data/script/template/script/template/item/weapon/TestWeaponTemplate.java

@@ -1,4 +1,4 @@
-package script.template.weapon;
+package script.template.item.weapon;
 
 import com.l2jserver.model.template.WeaponTemplate;
 import com.l2jserver.model.world.capability.Attackable;

data/script/template/script/template/skill/TestSkillTemplate.java

@@ -1,16 +1,19 @@
 package script.template.skill;
 
+import com.l2jserver.model.id.template.factory.SkillTemplateIDFactory;
 import com.l2jserver.model.template.SkillTemplate;
 import com.l2jserver.model.world.capability.Castable;
 import com.l2jserver.model.world.capability.Caster;
 
 public class TestSkillTemplate extends SkillTemplate {
-	public TestSkillTemplate() {
-		super(null);
+	public static final int ID = 10;
+
+	public TestSkillTemplate(SkillTemplateIDFactory factory) {
+		super(factory.createID(ID));
 	}
 
 	@Override
-	public void cast(Caster caster, Castable target) {
+	public void cast(Caster caster, Castable... targets) {
 		// TODO do casting
 	}
 }