Fix /makeitem failing to persist items

MakeItemCmd left the container at NONE, which item_CREATE's cont
parameter rejects, so PERSIST returned null and addItemToInventory
threw a NullPointerException. Set the container to INVENTORY as
CreateItemCmd does, and report an error if PERSIST still fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/engine/db/handlers/dbItemHandler.java

@@ -201,23 +201,23 @@ public class dbItemHandler extends dbHandlerBase {
         }
     }
 
-    public void LOAD_TEMPLATE_MODTABLES() {
+    public HashMap<Integer, Integer> LOAD_TEMPLATE_MODTABLES() {
+
+        HashMap<Integer, Integer> modTables = new HashMap<>();
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_vendor_items`;");
              ResultSet rs = preparedStatement.executeQuery()) {
 
-            while (rs.next()) {
-                int templateID = rs.getInt("templateID");
-                int modTable = rs.getInt("modTable");
-                ItemTemplate template = ItemTemplate.templates.get(templateID);
-                template.modTable = modTable;
-            }
+            while (rs.next())
+                modTables.put(rs.getInt("templateID"), rs.getInt("modTable"));
 
         } catch (Exception e) {
             Logger.error(e);
         }
 
+        Logger.info("read: " + modTables.size());
+        return modTables;
     }
 
     public Item GET_ITEM(final int itemUUID) {
@@ -325,7 +325,7 @@ public class dbItemHandler extends dbHandlerBase {
 
         for (Item item : inventory) {
 
-            if (item.template.item_type.equals(ItemType.GOLD))
+            if (item.template.getItemType().equals(ItemType.GOLD))
                 continue;
 
             try (Connection connection = DbManager.getConnection();
@@ -474,7 +474,7 @@ public class dbItemHandler extends dbHandlerBase {
      */
     public boolean UPDATE_GOLD(final Item item, int newValue, int oldValue) {
 
-        if (!item.template.item_type.equals(ItemType.GOLD))
+        if (!item.template.getItemType().equals(ItemType.GOLD))
             return false;
 
         try (Connection connection = DbManager.getConnection();
@@ -554,7 +554,7 @@ public class dbItemHandler extends dbHandlerBase {
 
         // Write 0 if we will not modify the value from template
 
-        if (value == item.template.item_value)
+        if (value == item.template.getItemValue())
             value = 0;
 
         try (Connection connection = DbManager.getConnection();

src/engine/devcmd/cmds/CreateItemCmd.java

@@ -15,8 +15,8 @@ import engine.gameManager.DbManager;
 import engine.mbEnums;
 import engine.objects.AbstractGameObject;
 import engine.objects.Item;
-import engine.objects.ItemTemplate;
 import engine.objects.PlayerCharacter;
+import engine.parsers.objects.CObjectTemplate;
 import org.pmw.tinylog.Logger;
 
 /**
@@ -38,7 +38,7 @@ public class CreateItemCmd extends AbstractDevCmd {
         }
 
         int templateID = Integer.parseInt(words[0]);
-        ItemTemplate template = ItemTemplate.templates.get(templateID);
+        CObjectTemplate template = CObjectTemplate.lookup(templateID);
 
         if (template == null) {
             ChatManager.chatSystemInfo(playerCharacter, "No such template found.");
@@ -51,7 +51,7 @@ public class CreateItemCmd extends AbstractDevCmd {
 
         for (int i = 0; i < size; i++) {
 
-            if (!playerCharacter.charItemManager.hasRoomInventory(template.item_wt)) {
+            if (!playerCharacter.charItemManager.hasRoomInventory(template.getItemWt())) {
                 ChatManager.chatSystemInfo(playerCharacter, "You are encumbered!.");
                 break;
             }

src/engine/devcmd/cmds/InfoCmd.java

@@ -18,6 +18,7 @@ import engine.mbEnums.BuildingGroup;
 import engine.mbEnums.GameObjectType;
 import engine.mbEnums.TargetColor;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.util.StringUtils;
 
 import java.text.DecimalFormat;
@@ -507,17 +508,17 @@ public class InfoCmd extends AbstractDevCmd {
             case Item:  //intentional passthrough
             case MobLoot:
                 Item item = (Item) target;
-                ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-                output += StringUtils.addWS("Template: " + template.template_id, 20);
-                output += "Weight: " + template.item_wt;
+                CObjectTemplate template = CObjectTemplate.lookup(item.templateID);
+                output += StringUtils.addWS("Template: " + template.getTemplateId(), 20);
+                output += "Weight: " + template.getItemWt();
                 output += newline;
                 DecimalFormat df = new DecimalFormat("###,###,###,###,##0");
                 output += StringUtils.addWS("Qty: "
                         + df.format(item.getNumOfItems()), 20);
                 output += "Charges: " + (byte) item.chargesRemaining
-                        + '/' + item.template.item_initial_charges;
+                        + '/' + item.template.getItemInitialCharges();
                 output += newline;
-                output += "Name: " + template.item_base_name;
+                output += "Name: " + template.getItemBaseName();
                 output += newline;
                 output += item.getContainerInfo();
 

src/engine/devcmd/cmds/MakeItemCmd.java

@@ -11,9 +11,11 @@ package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
+import engine.mbEnums.ItemContainerType;
 import engine.mbEnums.ItemType;
 import engine.mbEnums.OwnerType;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.EffectsBase;
 
 /**
@@ -59,17 +61,17 @@ public class MakeItemCmd extends AbstractDevCmd {
         }
 
         int templateID;
-        ItemTemplate template;
+        CObjectTemplate template;
         try {
             templateID = Integer.parseInt(words[0]);
-            template = ItemTemplate.templates.get(templateID);
+            template = CObjectTemplate.lookup(templateID);
 
             if (template == null) {
                 throwbackError(pc, "No item template with id " + words[0]);
                 return;
             }
 
-            if (template.item_type == ItemType.GOLD) {
+            if (template.getItemType() == ItemType.GOLD) {
                 this.throwbackInfo(pc, "use /addgold to add gold.");
                 return;
             }
@@ -131,7 +133,7 @@ public class MakeItemCmd extends AbstractDevCmd {
                 return;
             }
         }
-        template = ItemTemplate.templates.get(templateID);
+        template = CObjectTemplate.lookup(templateID);
 
         if (template == null) {
             throwbackError(pc, "Unable to find template " + templateID);
@@ -139,8 +141,8 @@ public class MakeItemCmd extends AbstractDevCmd {
         }
 
         if ((numItems > 1)
-                && (template.item_type.equals(ItemType.RESOURCE) == false)
-                && (template.item_type.equals(ItemType.OFFERING)) == false)
+                && (template.getItemType().equals(ItemType.RESOURCE) == false)
+                && (template.getItemType().equals(ItemType.OFFERING)) == false)
             numItems = 1;
 
         CharacterItemManager cim = pc.charItemManager;
@@ -154,7 +156,7 @@ public class MakeItemCmd extends AbstractDevCmd {
 
         for (int i = 0; i < quantity; i++) {
 
-            int weight = template.item_wt;
+            int weight = template.getItemWt();
 
             if (!cim.hasRoomInventory(weight)) {
                 throwbackError(pc, "Not enough room in inventory for any more of this item. " + i + " produced.");
@@ -168,6 +170,7 @@ public class MakeItemCmd extends AbstractDevCmd {
             Item item = new Item(templateID);
             item.ownerID = pc.getObjectUUID();
             item.ownerType = OwnerType.PlayerCharacter;
+            item.containerType = ItemContainerType.INVENTORY;
 
             if (numItems > 1)
                 item.setNumOfItems(numItems);
@@ -179,6 +182,11 @@ public class MakeItemCmd extends AbstractDevCmd {
                 return;
             }
 
+            if (item == null) {
+                throwbackError(pc, "DB error 2: Unable to create item " + templateID + ".");
+                return;
+            }
+
             //create prefix
             if (!prefix.isEmpty())
                 item.addPermanentEnchantmentForDev(prefix, 0);

src/engine/devcmd/cmds/PrintBankCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 
 import java.util.ArrayList;
 
@@ -52,8 +53,8 @@ public class PrintBankCmd extends AbstractDevCmd {
         throwbackInfo(pc, "Bank for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
 
         for (Item item : list) {
-            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-            throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems());
+            CObjectTemplate template = CObjectTemplate.lookup(item.templateID);
+            throwbackInfo(pc, "    " + template.getItemBaseName() + ", count: " + item.getNumOfItems());
         }
 
         Item gold = cim.getGoldBank();

src/engine/devcmd/cmds/PrintBonusesCmd.java

@@ -13,6 +13,7 @@ import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 
 public class PrintBonusesCmd extends AbstractDevCmd {
@@ -33,8 +34,8 @@ public class PrintBonusesCmd extends AbstractDevCmd {
             if (target instanceof Item) {
                 type = "Item";
                 tar = (Item) target;
-                ItemTemplate template = ItemTemplate.templates.get(((Item) tar).templateID);
-                name = template.item_base_name;
+                CObjectTemplate template = CObjectTemplate.lookup(((Item) tar).templateID);
+                name = template.getItemBaseName();
             } else if (target instanceof AbstractCharacter) {
                 tar = (AbstractCharacter) target;
                 name = ((AbstractCharacter) tar).getFirstName();

src/engine/devcmd/cmds/PrintEquipCmd.java

@@ -66,7 +66,7 @@ public class PrintEquipCmd extends AbstractDevCmd {
             throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
             for (mbEnums.EquipSlotType slot : tarMob.charItemManager.equipped.keySet()) {
                 Item equip = tarMob.charItemManager.equipped.get(slot);
-                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.item_base_name + ", slot: " + slot);
+                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.getItemBaseName() + ", slot: " + slot);
             }
             return;
         }
@@ -76,7 +76,7 @@ public class PrintEquipCmd extends AbstractDevCmd {
             throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
             for (mbEnums.EquipSlotType slot : tarMob.charItemManager.equipped.keySet()) {
                 Item equip = tarMob.charItemManager.equipped.get(slot);
-                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.item_base_name + ", slot: " + slot);
+                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.getItemBaseName() + ", slot: " + slot);
             }
             return;
         }
@@ -87,7 +87,7 @@ public class PrintEquipCmd extends AbstractDevCmd {
 
         for (mbEnums.EquipSlotType slot : list.keySet()) {
             Item item = list.get(slot);
-            throwbackInfo(pc, "    " + item.template.item_base_name + ", slot: " + slot);
+            throwbackInfo(pc, "    " + item.template.getItemBaseName() + ", slot: " + slot);
         }
     }
 

src/engine/devcmd/cmds/PrintInventoryCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.devcmd.AbstractDevCmd;
 import engine.mbEnums.ItemType;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -75,18 +76,18 @@ public class PrintInventoryCmd extends AbstractDevCmd {
         int goldCount = 0;
 
         for (Item item : inventory) {
-            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
+            CObjectTemplate template = CObjectTemplate.lookup(item.templateID);
 
-            if (item.template.item_type.equals(ItemType.GOLD) == false) {
+            if (item.template.getItemType().equals(ItemType.GOLD) == false) {
 
                 String chargeInfo = "";
-                int chargeMax = template.item_initial_charges;
+                int chargeMax = template.getItemInitialCharges();
 
                 if (chargeMax > 0) {
                     int charges = item.chargesRemaining;
                     chargeInfo = " charges: " + charges + '/' + chargeMax;
                 }
-                throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems() + chargeInfo);
+                throwbackInfo(pc, "    " + template.getItemBaseName() + ", count: " + item.getNumOfItems() + chargeInfo);
             } else
                 goldCount += item.getNumOfItems();
         }

src/engine/devcmd/cmds/PrintVaultCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 
 import java.util.ArrayList;
 
@@ -50,8 +51,8 @@ public class PrintVaultCmd extends AbstractDevCmd {
         ArrayList<Item> list = cim.getVault();
         throwbackInfo(pc, "Vault for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
         for (Item item : list) {
-            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-            throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems());
+            CObjectTemplate template = CObjectTemplate.lookup(item.templateID);
+            throwbackInfo(pc, "    " + template.getItemBaseName() + ", count: " + item.getNumOfItems());
         }
         Item gold = cim.getGoldVault();
         if (gold != null)

src/engine/devcmd/cmds/SimulateBootyCmd.java

@@ -5,6 +5,7 @@ import engine.gameManager.LootManager;
 import engine.gameManager.ZoneManager;
 import engine.loot.BootySetEntry;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 
 import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
@@ -34,10 +35,10 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         if (mob.bootySet != 0) {
             for (BootySetEntry entry : LootManager._bootySetMap.get(mob.bootySet)) {
 
-                ItemTemplate template = ItemTemplate.templates.get(entry.templateID);
+                CObjectTemplate template = CObjectTemplate.lookup(entry.templateID);
 
                 if (template != null)
-                    output += "[" + entry.bootyType + "] " + template.item_base_name + " [Chance] " + entry.dropChance + newline;
+                    output += "[" + entry.bootyType + "] " + template.getItemBaseName() + " [Chance] " + entry.dropChance + newline;
             }
         }
 
@@ -57,7 +58,7 @@ public class SimulateBootyCmd extends AbstractDevCmd {
             try {
                 mob.loadInventory();
                 for (Item lootItem : mob.charItemManager.getInventory()) {
-                    switch (lootItem.template.item_type) {
+                    switch (lootItem.template.getItemType()) {
                         case EMPLOYMENTCONTRACT: //CONTRACT
                             Contracts.add(lootItem);
                             break;

src/engine/gameManager/BuildingManager.java

@@ -22,6 +22,7 @@ import engine.mbEnums.BuildingGroup;
 import engine.mbEnums.GameObjectType;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -199,12 +200,12 @@ public enum BuildingManager {
                     return false;
                 }
 
-                ItemTemplate template = ItemTemplate.templates.get(1705032); // Elan Stone
+                CObjectTemplate template = CObjectTemplate.lookup(1705032); // Elan Stone
 
-                if (!player.charItemManager.hasRoomInventory(template.item_wt))
+                if (!player.charItemManager.hasRoomInventory(template.getItemWt()))
                     return false;
 
-                if (!ItemManager.MakeItemForPlayer(template.template_id, player, amount))
+                if (!ItemManager.MakeItemForPlayer(template.getTemplateId(), player, amount))
                     return false;
 
                 shrine.setFavors(0);
@@ -218,12 +219,12 @@ public enum BuildingManager {
 
                 for (mbEnums.ResourceType resourceType : EnumSet.allOf(mbEnums.ResourceType.class)) {
 
-                    ItemTemplate resourceTemplate = ItemTemplate.templates.get(resourceType.templateID);
+                    CObjectTemplate resourceTemplate = CObjectTemplate.lookup(resourceType.templateID);
 
                     if (resourceTemplate == null)
                         continue;
 
-                    if (!player.charItemManager.hasRoomInventory(resourceTemplate.item_wt)) {
+                    if (!player.charItemManager.hasRoomInventory(resourceTemplate.getItemWt())) {
                         ChatManager.chatSystemInfo(player, "You can not carry any more of that item.");
                         return false;
                     }

src/engine/gameManager/ChatManager.java

@@ -22,6 +22,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.handlers.ClientAdminCommandMsgHandler;
 import engine.net.client.msg.chat.*;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.server.MBServerStatics;
 import engine.server.world.WorldServer;
 import org.pmw.tinylog.Logger;
@@ -535,12 +536,12 @@ public enum ChatManager {
         if (item != null) //Steal
             if (success) {
                 String name = "";
-                if (item.template.item_type.equals(mbEnums.ItemType.GOLD))
+                if (item.template.getItemType().equals(mbEnums.ItemType.GOLD))
                     name = amount + " gold ";
                 else {
                     String vowels = "aeiou";
-                    ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-                    String iName = template.item_base_name;
+                    CObjectTemplate template = CObjectTemplate.lookup(item.templateID);
+                    String iName = template.getItemBaseName();
                     if (iName.length() > 0)
                         if (vowels.indexOf(iName.substring(0, 1).toLowerCase()) >= 0)
                             name = "an " + iName + ' ';

src/engine/gameManager/CombatManager.java

@@ -18,6 +18,8 @@ import engine.net.client.msg.PowerProjectileMsg;
 import engine.net.client.msg.TargetedActionMsg;
 import engine.net.client.msg.UpdateStateMsg;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
+import engine.parsers.objects.RuneTemplate;
 import engine.powers.DamageShield;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.powers.effectmodifiers.WeaponProcEffectModifier;
@@ -92,25 +94,25 @@ public enum CombatManager {
             return;
         }
 
-        if (mainWeapon == null && offWeapon != null && !offWeapon.template.item_skill_used.equals("Block")) {
+        if (mainWeapon == null && offWeapon != null && !offWeapon.template.getItemSkillUsed().equals("Block")) {
             //swing left hand only
             processAttack(attacker, target, mbEnums.EquipSlotType.LHELD);
             return;
         }
 
-        if (mainWeapon == null && offWeapon != null && offWeapon.template.item_skill_used.equals("Block")) {
+        if (mainWeapon == null && offWeapon != null && offWeapon.template.getItemSkillUsed().equals("Block")) {
             //no weapon equipped with a shield, punch with one hand
             processAttack(attacker, target, mbEnums.EquipSlotType.RHELD);
             return;
         }
 
-        if (mainWeapon != null && offWeapon != null && offWeapon.template.item_skill_used.equals("Block")) {
+        if (mainWeapon != null && offWeapon != null && offWeapon.template.getItemSkillUsed().equals("Block")) {
             //one weapon equipped with a shield, swing with one hand
             processAttack(attacker, target, mbEnums.EquipSlotType.RHELD);
             return;
         }
 
-        if (mainWeapon != null && offWeapon != null && !offWeapon.template.item_skill_used.equals("Block")) {
+        if (mainWeapon != null && offWeapon != null && !offWeapon.template.getItemSkillUsed().equals("Block")) {
             //two weapons equipped, swing both hands
             processAttack(attacker, target, mbEnums.EquipSlotType.RHELD);
             if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))
@@ -146,7 +148,7 @@ public enum CombatManager {
             if (bonus != null)
                 rangeMod += bonus.getFloatPercentAll(mbEnums.ModType.WeaponRange, mbEnums.SourceType.None);
 
-            attackRange += weapon.template.item_weapon_max_range * rangeMod;
+            attackRange += engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_max_range * rangeMod;
         } else if (attacker.getObjectType().equals(mbEnums.GameObjectType.Mob)) {
 
             //unarmed mob, add the natural attack range from its rune (0 for most melee mobs)
@@ -211,7 +213,7 @@ public enum CombatManager {
 
         if (weapon != null) {
 
-            float wepSpeed = (int) (weapon.template.item_weapon_wepspeed);
+            float wepSpeed = (int) (engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_wepspeed);
 
             if (weapon.getBonusPercent(mbEnums.ModType.WeaponSpeed, mbEnums.SourceType.None) != 0f) //add weapon speed bonus
                 wepSpeed *= (1 + weapon.getBonus(mbEnums.ModType.WeaponSpeed, mbEnums.SourceType.None));
@@ -270,13 +272,13 @@ public enum CombatManager {
             if (weapon != null && !attacker.getObjectType().equals(mbEnums.GameObjectType.Mob)) {
                 //check if Out of Stamina
                 if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
-                    if (attacker.getStamina() < (weapon.template.item_wt / 3f)) {
+                    if (attacker.getStamina() < (weapon.template.getItemWt() / 3f)) {
                         //set auto attack job
                         setAutoAttackJob(attacker, slot, delay);
                         return;
                     }
                 }
-                float stam = weapon.template.item_wt / 3f;
+                float stam = weapon.template.getItemWt() / 3f;
                 stam = (stam < 1) ? 1 : stam;
                 attacker.modifyStamina(-(stam), attacker, true);
             } else
@@ -416,7 +418,7 @@ public enum CombatManager {
                     if (((Mob) attacker).isSiege())
                         damageType = mbEnums.DamageType.SIEGE;
             } else {
-                damageType = (mbEnums.DamageType) attacker.charItemManager.getEquipped().get(slot).template.item_weapon_damage.keySet().toArray()[0];
+                damageType = engine.parsers.objects.ItemTemplate.getWeapon(attacker.charItemManager.getEquipped().get(slot).templateID).weapon_damage.get(0).damage_type;
             }
 
             //get resists
@@ -577,13 +579,14 @@ public enum CombatManager {
             target.setCombatTarget(attacker);
     }
 
-    public static int getSwingAnimation(ItemTemplate wb, DeferredPowerJob dpj, mbEnums.EquipSlotType slot) {
+    public static int getSwingAnimation(CObjectTemplate wb, DeferredPowerJob dpj, mbEnums.EquipSlotType slot) {
 
         //No weapon, return default animation
         if (wb == null)
             return 75;
 
         int token;
+        engine.parsers.objects.ItemTemplate.Weapon weapon = engine.parsers.objects.ItemTemplate.getWeapon(wb.getTemplateId());
 
         if (dpj != null) {
 
@@ -594,7 +597,7 @@ public enum CombatManager {
         }
 
         //Item has no equipment slots and should not try to return an animation, return default instead
-        if (wb.item_eq_slots_or == null || wb.item_eq_slots_or.isEmpty()) {
+        if (wb.getItemEqSlotsOr().isEmpty()) {
             return 75;
         }
 
@@ -603,18 +606,18 @@ public enum CombatManager {
         int random;
 
         //Item can only be equipped in one slot, return animation for that slot
-        if (wb.item_eq_slots_or.size() == 1) {
-            if (wb.item_eq_slots_or.iterator().next().equals(mbEnums.EquipSlotType.RHELD)) {
-                anim = wb.weapon_attack_anim_right.get(0)[0];
+        if (wb.getItemEqSlotsOr().size() == 1) {
+            if (wb.getItemEqSlotsOr().iterator().next().equals(mbEnums.EquipSlotType.RHELD)) {
+                anim = weapon.weapon_attack_anim_right.get(0)[0];
                 if (dpj != null) {
-                    random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_right.size());
-                    anim = wb.weapon_attack_anim_right.get(random)[0];
+                    random = ThreadLocalRandom.current().nextInt(weapon.weapon_attack_anim_right.size());
+                    anim = weapon.weapon_attack_anim_right.get(random)[0];
                 }
             } else {
-                anim = wb.weapon_attack_anim_left.get(0)[0];
+                anim = weapon.weapon_attack_anim_left.get(0)[0];
                 if (dpj != null) {
-                    random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_left.size());
-                    anim = wb.weapon_attack_anim_left.get(random)[0];
+                    random = ThreadLocalRandom.current().nextInt(weapon.weapon_attack_anim_left.size());
+                    anim = weapon.weapon_attack_anim_left.get(random)[0];
                 }
             }
             return anim;
@@ -622,16 +625,16 @@ public enum CombatManager {
 
         //Item can be equipped in either hand, and should have animation sets for each hand
         if (slot.equals(mbEnums.EquipSlotType.RHELD)) {
-            anim = wb.weapon_attack_anim_right.get(0)[0];
+            anim = weapon.weapon_attack_anim_right.get(0)[0];
             if (dpj != null) {
-                random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_right.size());
-                anim = wb.weapon_attack_anim_right.get(random)[0];
+                random = ThreadLocalRandom.current().nextInt(weapon.weapon_attack_anim_right.size());
+                anim = weapon.weapon_attack_anim_right.get(random)[0];
             }
         } else {
-            anim = wb.weapon_attack_anim_left.get(0)[0];
+            anim = weapon.weapon_attack_anim_left.get(0)[0];
             if (dpj != null) {
-                random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_left.size());
-                anim = wb.weapon_attack_anim_left.get(random)[0];
+                random = ThreadLocalRandom.current().nextInt(weapon.weapon_attack_anim_left.size());
+                anim = weapon.weapon_attack_anim_left.get(random)[0];
             }
         }
         return anim;
@@ -713,7 +716,7 @@ public enum CombatManager {
         // Mobs use their mobbase rune, players use their race rune.
 
         int runeID;
-        ItemTemplate rune;
+        RuneTemplate rune;
         int hand = slot.equals(mbEnums.EquipSlotType.LHELD) ? 2 : 1;
 
         switch (attacker.getObjectType()) {
@@ -727,18 +730,18 @@ public enum CombatManager {
                 return null;
         }
 
-        rune = ItemTemplate.templates.get(runeID);
+        rune = RuneTemplate._runes.get(runeID);
 
-        if (rune == null || rune.rune_natural_attacks.isEmpty())
+        if (rune == null || rune.rune_naturalattacks.isEmpty())
             return null;
 
-        for (float[] attack : rune.rune_natural_attacks)
+        for (float[] attack : rune.rune_naturalattacks)
             if (attack.length > 3 && (int) attack[3] == hand)
                 return attack;
 
         // No entry for this hand, fall back to the first natural attack
 
-        return rune.rune_natural_attacks.get(0);
+        return rune.rune_naturalattacks.get(0);
     }
 
     public static int calculatePetDamage(AbstractCharacter agent) {

src/engine/gameManager/ForgeManager.java

@@ -15,8 +15,8 @@ import engine.mbEnums;
 import engine.net.client.msg.ItemProductionMsg;
 import engine.objects.City;
 import engine.objects.Item;
-import engine.objects.ItemTemplate;
 import engine.objects.NPC;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.EffectsBase;
 import org.pmw.tinylog.Logger;
 
@@ -49,6 +49,9 @@ public enum ForgeManager implements Runnable {
     public static final ConcurrentHashMap<NPC, ConcurrentHashMap.KeySetView<WorkOrder, Boolean>> vendorWorkOrderLookup = new ConcurrentHashMap<>();
     public static final ConcurrentHashMap<Item, WorkOrder> itemWorkOrderLookup = new ConcurrentHashMap<>();
 
+    // Server-only data from static_vendor_items; the client templates have no mod table.
+    public static HashMap<Integer, Integer> vendorModTables = new HashMap<>();
+
     public static void start() {
 
         Thread forgeManager;
@@ -222,12 +225,12 @@ public enum ForgeManager implements Runnable {
         // Calculate production cost for a single run of the workOrder
 
         HashMap<mbEnums.ResourceType, Integer> production_cost = new HashMap<>();
-        ItemTemplate template = ItemTemplate.templates.get(workOrder.templateID);
+        CObjectTemplate template = CObjectTemplate.lookup(workOrder.templateID);
 
         // Add gold and resource costs from template
 
-        production_cost.put(mbEnums.ResourceType.GOLD, template.item_value);
-        production_cost.putAll(template.item_resource_cost);
+        production_cost.put(mbEnums.ResourceType.GOLD, template.getItemValue());
+        production_cost.putAll(template.getItemResourceCosts());
 
         // Calculate cost of prefix and suffix
 
@@ -248,8 +251,8 @@ public enum ForgeManager implements Runnable {
 
         // Create new virtual item from specified template
 
-        ItemTemplate template = ItemTemplate.templates.get(workOrder.templateID);
         Item forgedItem = new Item(workOrder.templateID);
+        int modTable = getVendorModTable(workOrder.templateID);
 
         // forgedItem gets a negative id; a virtual item which is not persisted
 
@@ -264,13 +267,13 @@ public enum ForgeManager implements Runnable {
 
         // Assign a prefix and suffix to this item if random rolled
 
-        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
-            forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
+        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains(modTable))
+            forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
-            forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
+        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains(modTable))
+            forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, modTable);
         else
             forgedItem.suffixToken = workOrder.suffixToken;
 
@@ -364,6 +367,10 @@ public enum ForgeManager implements Runnable {
         DbManager.WarehouseQueries.WRITE_WORKORDER(workOrder);
     }
 
+    public static int getVendorModTable(int templateID) {
+        return vendorModTables.getOrDefault(templateID, 0);
+    }
+
     public static int calcRandomMod(NPC vendor, mbEnums.ItemModType itemModType, int modTable) {
 
         // Random prefix or suffix token based on item.template.modtable

src/engine/gameManager/GroupManager.java

@@ -307,7 +307,7 @@ public enum GroupManager {
             return false;
         }
 
-        if (!item.template.item_type.equals(mbEnums.ItemType.GOLD)) //only split goldItem
+        if (!item.template.getItemType().equals(mbEnums.ItemType.GOLD)) //only split goldItem
             return false;
 
         Group group = getGroup(pc);

src/engine/gameManager/ItemManager.java

@@ -2,6 +2,7 @@ package engine.gameManager;
 
 import engine.mbEnums;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.EffectsBase;
 import org.pmw.tinylog.Logger;
 
@@ -21,66 +22,46 @@ public enum ItemManager {
 
     public static final AtomicInteger lastNegativeID = new AtomicInteger(0);
 
+    // restrict true: the set is a blacklist; false: a whitelist. An empty set allows everyone.
+
     public static Boolean ValidRace(Item item, mbEnums.MonsterType race) {
 
-        if (item.template.item_race_req.isEmpty() && item.template.item_race_res.isEmpty())
+        EnumSet<mbEnums.MonsterType> races = item.template.getItemRaceReq();
+        boolean restrict = item.template.getItemRaceReqRestrict();
+
+        if (races.isEmpty())
             return true;
 
-        if (item.template.item_race_req.isEmpty() == false)
-            if (item.template.item_race_req.contains(race))
-                return true;
-
-        if (item.template.item_race_res.isEmpty() == false)
-            if (item.template.item_race_res.contains(race) == false)
-                return true;
-
-        return false;
+        return races.contains(race) != restrict;
     }
 
     public static Boolean ValidClass(Item item, mbEnums.ClassType base, mbEnums.ClassType profession) {
 
-        // Early exit if no entry
+        EnumSet<mbEnums.ClassType> classes = item.template.getItemClassReq();
+        boolean restrict = item.template.getItemClassReqRestrict();
+        boolean listed;
 
-        if (item.template.item_class_req.isEmpty() && item.template.item_class_res.isEmpty())
+        if (classes.isEmpty())
             return true;
 
-        if (item.template.item_class_req.isEmpty() == false)
-            if (item.template.item_class_req.contains(base) || item.template.item_class_req.contains(profession))
-                return true;
+        listed = classes.contains(base) || classes.contains(profession);
 
-        if (item.template.item_class_res.isEmpty() == false)
-            if (item.template.item_class_res.contains(base) == false && item.template.item_class_res.contains(profession) == false)
-                return true;
-
-        return false;
+        return listed != restrict;
     }
 
     public static Boolean ValidDiscipline(Item item, EnumSet<mbEnums.DisciplineType> discs) {
 
-        // Early exit if no entry
+        EnumSet<mbEnums.DisciplineType> disciplines = item.template.getItemDiscReq();
+        boolean restrict = item.template.getItemDiscReqRestrict();
+        EnumSet<mbEnums.DisciplineType> workSet;
 
-        if (item.template.item_disc_req.isEmpty() && item.template.item_disc_res.isEmpty())
+        if (disciplines.isEmpty())
             return true;
 
-        EnumSet<mbEnums.DisciplineType> workSet = EnumSet.copyOf(discs);
+        workSet = EnumSet.copyOf(discs);
+        workSet.retainAll(disciplines);
 
-        if (item.template.item_disc_req.isEmpty() == false) {
-
-            workSet.retainAll(item.template.item_disc_req);
-
-            if (workSet.isEmpty() == false)
-                return true;
-        }
-
-        if (item.template.item_disc_res.isEmpty() == false) {
-
-            workSet.retainAll(item.template.item_disc_res);
-
-            if (workSet.isEmpty() == false)
-                return true;
-        }
-
-        return false;
+        return workSet.isEmpty() == restrict;
     }
 
     public static Boolean canCharacterEquip(Item item, AbstractCharacter character) {
@@ -91,12 +72,12 @@ public enum ItemManager {
 
         CharacterSkill characterSkill;
 
-        if (item.template.item_skill_required.isEmpty())
+        if (item.template.getItemSkillReq().isEmpty())
             return true;
 
-        for (String skillRequired : item.template.item_skill_required.keySet()) {
+        for (String skillRequired : item.template.getItemSkillReq().keySet()) {
 
-            int required_value = item.template.item_skill_required.get(skillRequired);
+            int required_value = item.template.getItemSkillReq().get(skillRequired);
             characterSkill = skills.get(skillRequired);
 
             if (characterSkill == null)
@@ -112,31 +93,31 @@ public enum ItemManager {
 
     public static boolean isTwoHanded(Item item) {
 
-        if (!item.template.item_type.equals(mbEnums.ItemType.WEAPON))
+        if (!item.template.getItemType().equals(mbEnums.ItemType.WEAPON))
             return false;
 
-        return item.template.item_eq_slots_and.contains(EnumSet.of(mbEnums.EquipSlotType.LHELD, mbEnums.EquipSlotType.RHELD));
+        return item.template.getItemEqSlotsAnd().containsAll(EnumSet.of(mbEnums.EquipSlotType.LHELD, mbEnums.EquipSlotType.RHELD));
     }
 
-    public static boolean isTwoHanded(ItemTemplate template) {
+    public static boolean isTwoHanded(CObjectTemplate template) {
 
-        if (!template.item_type.equals(mbEnums.ItemType.WEAPON))
+        if (!template.getItemType().equals(mbEnums.ItemType.WEAPON))
             return false;
 
-        return template.item_eq_slots_and.contains(EnumSet.of(mbEnums.EquipSlotType.LHELD, mbEnums.EquipSlotType.RHELD));
+        return template.getItemEqSlotsAnd().containsAll(EnumSet.of(mbEnums.EquipSlotType.LHELD, mbEnums.EquipSlotType.RHELD));
     }
 
     public static boolean isShield(Item item) {
 
-        if (item.template.item_skill_required.containsKey("Block"))
+        if (item.template.getItemSkillReq().containsKey("Block"))
             return true;
 
         return false;
     }
 
-    public static boolean isShield(ItemTemplate template) {
+    public static boolean isShield(CObjectTemplate template) {
 
-        if (template.item_skill_required.containsKey("Block"))
+        if (template.getItemSkillReq().containsKey("Block"))
             return true;
 
         return false;
@@ -150,7 +131,7 @@ public enum ItemManager {
             return false;
         //Item not valid for slot
 
-        if (item.template.item_eq_slots_or.contains(slot) == false)
+        if (item.template.getItemEqSlotsOr().contains(slot) == false)
             return false;
 
         // Slot is taken
@@ -165,7 +146,7 @@ public enum ItemManager {
                         (slot == mbEnums.EquipSlotType.RHELD && equipped.get(mbEnums.EquipSlotType.LHELD) != null)))
             return false;
 
-        if (item.template.item_type.equals(mbEnums.ItemType.WEAPON))
+        if (item.template.getItemType().equals(mbEnums.ItemType.WEAPON))
             if (equipped.get(slot) != null && equipped.get(slot).equals(item) == false)
                 return false;
 
@@ -197,7 +178,7 @@ public enum ItemManager {
 
         //players can't wear 0 value items.
 
-        return item.template.item_value != 0 || Kit.IsNoobGear(item.templateID);
+        return item.template.getItemValue() != 0 || Kit.IsNoobGear(item.templateID);
 
     }
 

src/engine/gameManager/LootManager.java

@@ -13,6 +13,7 @@ import engine.mbEnums;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -91,8 +92,8 @@ public enum LootManager {
         //lastly, check mobs inventory for godly or disc runes to send a server announcement
         for (Item item : mob.getInventory()) {
 
-            if ((item.templateID > 2499 && item.templateID <= 3050) || item.template.item_base_name.toLowerCase().contains("of the gods")) {
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().zoneName + " has found the " + item.template.item_base_name + ". Are you tough enough to take it?");
+            if ((item.templateID > 2499 && item.templateID <= 3050) || item.template.getItemBaseName().toLowerCase().contains("of the gods")) {
+                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().zoneName + " has found the " + item.template.getItemBaseName() + ". Are you tough enough to take it?");
                 chatMsg.setMessageType(10);
                 chatMsg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
                 DispatchManager.dispatchMsgToAll(chatMsg);
@@ -179,12 +180,12 @@ public enum LootManager {
         if (itemUUID == 0)
             return null;
 
-        if (ItemTemplate.templates.get(itemUUID).item_type.equals(mbEnums.ItemType.RESOURCE)) {
+        if (CObjectTemplate.lookup(itemUUID).getItemType().equals(mbEnums.ItemType.RESOURCE)) {
             int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1);
-            return new MobLoot(mob, ItemTemplate.templates.get(itemUUID), amount, false);
+            return new MobLoot(mob, CObjectTemplate.lookup(itemUUID), amount, false);
         }
 
-        outItem = new MobLoot(mob, ItemTemplate.templates.get(itemUUID), false);
+        outItem = new MobLoot(mob, CObjectTemplate.lookup(itemUUID), false);
 
         if (selectedRow.pModTable != 0)
             try {
@@ -374,7 +375,7 @@ public enum LootManager {
         if (chanceRoll > bse.dropChance)
             return;
 
-        MobLoot lootItem = new MobLoot(mob, ItemTemplate.templates.get(bse.templateID), true);
+        MobLoot lootItem = new MobLoot(mob, CObjectTemplate.lookup(bse.templateID), true);
 
         if (lootItem != null)
             mob.charItemManager.addItemToInventory(lootItem);
@@ -422,14 +423,14 @@ public enum LootManager {
 
         //create the item from the table, quantity is always 1
 
-        MobLoot winnings = new MobLoot(playerCharacter, ItemTemplate.templates.get(selectedItem.templateID), 1, false);
+        MobLoot winnings = new MobLoot(playerCharacter, CObjectTemplate.lookup(selectedItem.templateID), 1, false);
 
         if (winnings == null)
             return;
 
         //early exit if the inventory of the player will not old the item
 
-        if (itemMan.hasRoomInventory(winnings.template.item_wt) == false) {
+        if (itemMan.hasRoomInventory(winnings.template.getItemWt()) == false) {
             ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
             return;
         }

src/engine/gameManager/NPCManager.java

@@ -19,12 +19,14 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.PetMsg;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.EffectsBase;
 import engine.powers.RuneSkillAdjustEntry;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
@@ -315,26 +317,26 @@ public enum NPCManager {
                 //has main hand weapon
                 Item weapon = guard.charItemManager.equipped.get(mbEnums.EquipSlotType.RHELD);
 
-                if (weapon.template.item_primary_attr.equals(mbEnums.AttributeType.Strength))
+                if (engine.parsers.objects.ItemTemplate._items.get(weapon.templateID).item_primary_attr == mbEnums.AttributeType.Strength)
                     primaryStat = guard.getStatStrCurrent();
                 else
                     primaryStat = guard.getStatDexCurrent();
 
-                guard.minDamageHandOne = (int) ((guard.mobBase.getDamageMin() + weapon.template.item_weapon_damage.values().iterator().next()[0]) * rankModifier) + primaryStat;
-                guard.maxDamageHandOne = (int) ((guard.mobBase.getDamageMax() + weapon.template.item_weapon_damage.values().iterator().next()[1]) * rankModifier) + primaryStat;
-                guard.speedHandOne = weapon.template.item_weapon_wepspeed;
-                guard.rangeHandOne = weapon.template.item_weapon_max_range;
+                guard.minDamageHandOne = (int) ((guard.mobBase.getDamageMin() + engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_damage.get(0).damage_min) * rankModifier) + primaryStat;
+                guard.maxDamageHandOne = (int) ((guard.mobBase.getDamageMax() + engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_damage.get(0).damage_max) * rankModifier) + primaryStat;
+                guard.speedHandOne = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_wepspeed;
+                guard.rangeHandOne = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_max_range;
             } else if (guard.charItemManager.equipped.containsKey(mbEnums.EquipSlotType.LHELD) && !ItemManager.isShield(guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD).template)) {
                 //has off hand weapon
                 Item weapon = guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD);
-                if (weapon.template.item_primary_attr.equals(mbEnums.AttributeType.Strength))
+                if (engine.parsers.objects.ItemTemplate._items.get(weapon.templateID).item_primary_attr == mbEnums.AttributeType.Strength)
                     primaryStat = guard.getStatStrCurrent();
                 else
                     primaryStat = guard.getStatDexCurrent();
-                guard.minDamageHandOne = (int) ((guard.mobBase.getDamageMin() + weapon.template.item_weapon_damage.values().iterator().next()[0]) * rankModifier) + primaryStat;
-                guard.maxDamageHandOne = (int) ((guard.mobBase.getDamageMax() + weapon.template.item_weapon_damage.values().iterator().next()[1]) * rankModifier) + primaryStat;
-                guard.speedHandOne = weapon.template.item_weapon_wepspeed;
-                guard.rangeHandOne = weapon.template.item_weapon_max_range;
+                guard.minDamageHandOne = (int) ((guard.mobBase.getDamageMin() + engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_damage.get(0).damage_min) * rankModifier) + primaryStat;
+                guard.maxDamageHandOne = (int) ((guard.mobBase.getDamageMax() + engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_damage.get(0).damage_max) * rankModifier) + primaryStat;
+                guard.speedHandOne = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_wepspeed;
+                guard.rangeHandOne = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_max_range;
             } else {
                 primaryStat = guard.getStatStrCurrent();
                 guard.minDamageHandOne = (int) ((guard.mobBase.getDamageMin()) * rankModifier) + primaryStat;
@@ -352,8 +354,8 @@ public enum NPCManager {
         int baseDef = guard.mobBase.getDefenseRating();
         int armorDefense = 0;
         for (Item equipped : guard.charItemManager.equipped.values())
-            if (equipped.template.item_type.equals(mbEnums.ItemType.ARMOR) || ItemManager.isShield(equipped.template))
-                armorDefense += equipped.template.item_defense_rating;
+            if (equipped.template.getItemType().equals(mbEnums.ItemType.ARMOR) || ItemManager.isShield(equipped.template))
+                armorDefense += engine.parsers.objects.ItemTemplate._items.get(equipped.templateID).item_defense_rating;
         guard.defenseRating = dexterity + baseDef + armorDefense;
     }
 
@@ -361,9 +363,9 @@ public enum NPCManager {
         int strength = guard.getStatStrCurrent();
         int baseAtr = guard.mobBase.getAttackRating();
         if (guard.charItemManager.equipped.get(mbEnums.EquipSlotType.RHELD) != null)
-            guard.atrHandOne = baseAtr + (int) ((strength * 0.5f) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.RHELD).template.item_skill_required.values().toArray()[0] * 4) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.RHELD).template.item_skill_required.values().toArray()[0] * 3));
+            guard.atrHandOne = baseAtr + (int) ((strength * 0.5f) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.RHELD).template.getItemSkillReq().values().toArray()[0] * 4) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.RHELD).template.getItemSkillReq().values().toArray()[0] * 3));
         else if (guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD) != null && !ItemManager.isShield(guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD).template))
-            guard.atrHandTwo = baseAtr + (int) ((strength * 0.5f) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD).template.item_skill_required.values().toArray()[0] * 4) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD).template.item_skill_required.values().toArray()[0] * 3));
+            guard.atrHandTwo = baseAtr + (int) ((strength * 0.5f) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD).template.getItemSkillReq().values().toArray()[0] * 4) + ((int) guard.charItemManager.equipped.get(mbEnums.EquipSlotType.LHELD).template.getItemSkillReq().values().toArray()[0] * 3));
         else
             guard.atrHandOne = baseAtr;
     }
@@ -438,14 +440,17 @@ public enum NPCManager {
 
     public static void applyEquipmentResists(Mob mob) {
 
+        EnumMap<mbEnums.DamageType, Float> armorResists;
+
         if (mob.charItemManager.equipped.isEmpty())
             return;
 
         for (Item equipped : mob.charItemManager.equipped.values()) {
-            if (equipped.template.item_type.equals(mbEnums.ItemType.ARMOR)) {
-                mob.resists.setResist(mbEnums.DamageType.SLASHING, mob.resists.getResist(mbEnums.DamageType.SLASHING, 0) + equipped.template.combat_attack_resist.get("SLASHING"));
-                mob.resists.setResist(mbEnums.DamageType.CRUSHING, mob.resists.getResist(mbEnums.DamageType.CRUSHING, 0) + equipped.template.combat_attack_resist.get("CRUSHING"));
-                mob.resists.setResist(mbEnums.DamageType.PIERCING, mob.resists.getResist(mbEnums.DamageType.PIERCING, 0) + equipped.template.combat_attack_resist.get("PIERCING"));
+            if (equipped.template.getItemType().equals(mbEnums.ItemType.ARMOR)) {
+                armorResists = equipped.template.getCombatAttackResist();
+                mob.resists.setResist(mbEnums.DamageType.SLASHING, mob.resists.getResist(mbEnums.DamageType.SLASHING, 0) + armorResists.getOrDefault(mbEnums.DamageType.SLASHING, 0f));
+                mob.resists.setResist(mbEnums.DamageType.CRUSHING, mob.resists.getResist(mbEnums.DamageType.CRUSHING, 0) + armorResists.getOrDefault(mbEnums.DamageType.CRUSHING, 0f));
+                mob.resists.setResist(mbEnums.DamageType.PIERCING, mob.resists.getResist(mbEnums.DamageType.PIERCING, 0) + armorResists.getOrDefault(mbEnums.DamageType.PIERCING, 0f));
             }
         }
     }
@@ -541,14 +546,14 @@ public enum NPCManager {
 
     public static long calcRollingDuration(NPC vendor, int templateID) {
 
-        ItemTemplate template = ItemTemplate.templates.get(templateID);
+        CObjectTemplate template = CObjectTemplate.lookup(templateID);
         float rollingDuration;
 
         if (template == null)
             return 0;
 
-        if (template.item_bane_rank > 0)
-            return (long) (template.item_bane_rank * 60 * 60 * 3 * 1000 * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue()));
+        if (template.getItemBaneRank() > 0)
+            return (long) (template.getItemBaneRank() * 60 * 60 * 3 * 1000 * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue()));
 
         if (vendor.building == null)
             return 600;

src/engine/gameManager/PowersManager.java

@@ -2255,12 +2255,12 @@ public enum PowersManager {
             if (pb.targetItem())
                 return true;
                 // TODO add these checks later
-            else if (pb.targetArmor() && item.template.item_type.equals(ItemType.ARMOR))
+            else if (pb.targetArmor() && item.template.getItemType().equals(ItemType.ARMOR))
                 return true;
-            else if (pb.targetJewelry() && item.template.item_type.equals(ItemType.JEWELRY))
+            else if (pb.targetJewelry() && item.template.getItemType().equals(ItemType.JEWELRY))
                 return true;
             else
-                return pb.targetWeapon() && item.template.item_type.equals(ItemType.WEAPON);
+                return pb.targetWeapon() && item.template.getItemType().equals(ItemType.WEAPON);
         } // How did we get here? all valid targets have been covered
         else
             return false;

src/engine/loot/WorkOrder.java

@@ -12,9 +12,9 @@ import engine.gameManager.DbManager;
 import engine.gameManager.ForgeManager;
 import engine.mbEnums;
 import engine.objects.Item;
-import engine.objects.ItemTemplate;
 import engine.objects.NPC;
 import engine.objects.Warehouse;
+import engine.parsers.objects.CObjectTemplate;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -127,16 +127,16 @@ public class WorkOrder implements Delayed {
 
         int validation_result = 0;
 
-        ItemTemplate template = ItemTemplate.templates.get(workOrder.templateID);
+        CObjectTemplate template = CObjectTemplate.lookup(workOrder.templateID);
 
         if (workOrder.vendor.getBuilding() == null)
             return 58; //58: The formula is beyond the means of this facility
 
-        if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
+        if (!workOrder.vendor.charItemManager.hasRoomInventory(template.getItemWt()))
             return 30;  //30: That person cannot carry that item
 
         if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
-                !workOrder.vendor.getItemModTable().contains((template.modTable)))
+                !workOrder.vendor.getItemModTable().contains(ForgeManager.getVendorModTable(workOrder.templateID)))
             return 59;   //59: This hireling does not have this formula
 
         if (!Warehouse.calcCostOverrun(workOrder).isEmpty())

src/engine/net/client/handlers/ActivateNPCMsgHandler.java

@@ -46,7 +46,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
         // Filter hirelings by slot type
 
         for (Item hirelings : player.getInventory()) {
-            if (hirelings.template.item_type.equals(ItemType.EMPLOYMENTCONTRACT)) {
+            if (hirelings.template.getItemType().equals(ItemType.EMPLOYMENTCONTRACT)) {
 
                 contract = DbManager.ContractQueries.GET_CONTRACT(hirelings.templateID);
 

src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java

@@ -78,7 +78,7 @@ public class AddItemToTradeWindowMsgHandler extends AbstractClientMsgHandler {
         if (!item.validForInventory(source.getClientConnection(), source, source.charItemManager))
             return false;
 
-        if (!tradingWith.hasRoomTrade(item.template.item_wt)) {
+        if (!tradingWith.hasRoomTrade(item.template.getItemWt())) {
             dispatch = Dispatch.borrow(source, msg);
             DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
             return false;

src/engine/net/client/handlers/GuildCreationFinalizeHandler.java

@@ -24,6 +24,7 @@ import engine.net.client.msg.guild.GuildInfoMsg;
 import engine.objects.Guild;
 import engine.objects.Item;
 import engine.objects.PlayerCharacter;
+import engine.parsers.objects.DeedTemplate;
 import engine.util.StringUtils;
 
 public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
@@ -42,6 +43,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
         Guild playerGuild;
 
         Item charter;
+        DeedTemplate charterDeed;
         Dispatch dispatch;
 
         msg = (GuildCreationFinalizeMsg) baseMsg;
@@ -65,7 +67,9 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
 
         // Item must be a valid charterType (type 10 in db)
 
-        if (charter == null || (charter.template.item_type.equals(ItemType.CHARTER) == false)) {
+        charterDeed = DeedTemplate._deeds.get(charter.templateID);
+
+        if (charterDeed == null || (charterDeed.item_type.equals(ItemType.CHARTER) == false)) {
             ErrorPopupMsg.sendErrorPopup(player, GuildManager.NO_CHARTER_FOUND);
             return true;
         }

src/engine/net/client/handlers/ItemProductionMsgHandler.java

@@ -238,10 +238,10 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                 if (targetItem == null)
                     return;
 
-                if (targetItem.template.item_type.equals(ItemType.GOLD))
+                if (targetItem.template.getItemType().equals(ItemType.GOLD))
                     return;
 
-                if (!vendor.charItemManager.hasRoomInventory(targetItem.template.item_wt)) {
+                if (!vendor.charItemManager.hasRoomInventory(targetItem.template.getItemWt())) {
                     ErrorPopupMsg.sendErrorPopup(player, 21);
                     return;
                 }
@@ -319,7 +319,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                     if (targetItem == null)
                         continue;
 
-                    if (targetItem.template.item_type.equals(ItemType.GOLD))
+                    if (targetItem.template.getItemType().equals(ItemType.GOLD))
                         return;
 
                     if (!vendor.charItemManager.doesCharOwnThisItem(targetItem.getObjectUUID()))
@@ -328,14 +328,14 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                     if (!vendor.charItemManager.inventoryContains(targetItem))
                         continue;
 
-                    itemValue = targetItem.template.item_value;
+                    itemValue = targetItem.template.getItemValue();
 
                     if (vendor.getBuilding().getStrongboxValue() + itemValue > vendor.getBuilding().getMaxGold()) {
                         ErrorPopupMsg.sendErrorPopup(player, 201);
                         break;
                     }
 
-                    switch (targetItem.template.item_type) {
+                    switch (targetItem.template.getItemType()) {
                         case EMPLOYMENTCONTRACT:
                         case CHARTER:
                         case DEED:
@@ -465,13 +465,13 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
             if (targetItem == null)
                 return;
 
-            if (targetItem.template.item_type.equals(ItemType.GOLD))
+            if (targetItem.template.getItemType().equals(ItemType.GOLD))
                 return;
 
             if (!vendor.charItemManager.inventoryContains(targetItem))
                 return;
 
-            if (!player.charItemManager.hasRoomInventory(targetItem.template.item_wt))
+            if (!player.charItemManager.hasRoomInventory(targetItem.template.getItemWt()))
                 return;
 
             player.charItemManager.buyFromNPC(targetItem, vendor);

src/engine/net/client/handlers/LootMsgHandler.java

@@ -161,7 +161,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler {
                         if (itemRet == null)
                             return true;
 
-                        if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) {
+                        if (item.template.getItemType().equals(mbEnums.ItemType.GOLD)) {
                             // this is done to prevent the temporary goldItem item
                             // (from the mob) from appearing in player's inventory.
                             // It also updates the goldItem quantity display
@@ -187,7 +187,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler {
                         //TODO send group loot message if player is grouped and visible
                         Group group = GroupManager.getGroup(player);
 
-                        if (group != null && group.getSplitGold() && (item.template.item_type.equals(mbEnums.ItemType.GOLD) == false)) {
+                        if (group != null && group.getSplitGold() && (item.template.getItemType().equals(mbEnums.ItemType.GOLD) == false)) {
                             String name = item.getName();
                             String text = player.getFirstName() + " has looted " + name + '.';
                             ChatManager.chatGroupInfoCanSee(player, text);
@@ -202,7 +202,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler {
                 if (itemRet == null)
                     return true;
 
-                if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) {
+                if (item.template.getItemType().equals(mbEnums.ItemType.GOLD)) {
                     // this is done to prevent the temporary goldItem item
                     // (from the mob) from appearing in player's inventory.
                     // It also updates the goldItem quantity display
@@ -241,7 +241,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler {
                 //TODO send group loot message if player is grouped and visible
                 Group group = GroupManager.getGroup(player);
 
-                if (group != null && group.getSplitGold() && (item.template.item_type.equals(mbEnums.ItemType.GOLD) == false)) {
+                if (group != null && group.getSplitGold() && (item.template.getItemType().equals(mbEnums.ItemType.GOLD) == false)) {
                     String name = item.getName();
                     String text = player.getFirstName() + " has looted " + name + '.';
                     ChatManager.chatGroupInfoCanSee(player, text);

src/engine/net/client/handlers/ObjectActionMsgHandler.java

@@ -8,6 +8,7 @@ import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.objects.*;
+import engine.parsers.objects.DeedTemplate;
 import engine.powers.PowersBase;
 
 import java.util.ArrayList;
@@ -78,7 +79,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
 
                 int uuid = item.templateID;
 
-                switch (item.template.item_type) {
+                switch (item.template.getItemType()) {
 
                     case DEED: //buildings
                         //Call add building screen here, ib.getUseID() get's building ID
@@ -99,7 +100,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                         pam.setX(loc.getX() + 64); //offset grid from tol
                         pam.setY(loc.getY());
                         pam.setZ(loc.getZ() + 64); //offset grid from tol
-                        pam.addPlacementInfo(item.template.deed_structure_id);
+                        pam.addPlacementInfo(DeedTemplate._deeds.get(item.templateID).deed_structure_id);
 
                         dispatch = Dispatch.borrow(player, pam);
                         DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
@@ -187,14 +188,14 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                         if (uuid > 680069 && uuid < 680074) //Handle Charter, Deed, Petition, Warrant here
                             break;
 
-                        if (item.template.item_bane_rank > 0) {
+                        if (item.template.getItemBaneRank() > 0) {
 
                             // Only one banestone at a time
 
                             lock.writeLock().lock();
 
                             try {
-                                if (Bane.summonBanestone(player, origin, item.template.item_bane_rank) == true)
+                                if (Bane.summonBanestone(player, origin, item.template.getItemBaneRank()) == true)
                                     itemMan.consume(item);
                             } finally {
                                 lock.writeLock().unlock();
@@ -225,7 +226,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
 
                             // Bypass for waterbuckets
 
-                            if (item.template.item_type.equals(mbEnums.ItemType.BUCKET)) {
+                            if (item.template.getItemType().equals(mbEnums.ItemType.BUCKET)) {
 
                                 // test for valid target type
                                 if (target.getObjectType() == mbEnums.GameObjectType.PlayerCharacter)
@@ -250,10 +251,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             }
 
                             if (waterbucketBypass == false) {
-                                String powerString = item.template.item_power_grant.keySet().iterator().next();
-                                PowersBase powerAction = PowersManager.powersBaseByIDString.get(powerString);
-                                int powerValue = item.template.item_power_grant.get(powerString);
-                                PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, powerAction.getToken(), powerValue, true);
+                                engine.parsers.objects.PowerGrant powerGrant = item.template.getItemPowerGrant().get(0);
+                                PowersBase powerAction = PowersManager.powersBaseByIDString.get(powerGrant.power_type);
+                                PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, powerAction.getToken(), powerGrant.power_value, true);
                             }
                             itemMan.consume(item);
                         } else //just remove the item at this point

src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@@ -18,6 +18,7 @@ import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.PlaceAssetMsg;
 import engine.net.client.msg.PlaceAssetMsg.PlacementInfo;
 import engine.objects.*;
+import engine.parsers.objects.DeedTemplate;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
@@ -356,8 +357,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         Item contract = null;
 
         for (Item inventoryItem : playerCharacter.getInventory()) {
-            if (inventoryItem.template.item_type.equals(ItemType.DEED) &&
-                    inventoryItem.template.deed_structure_id == buildingList.getBlueprintUUID()) {
+            if (inventoryItem.template.getItemType().equals(ItemType.DEED) &&
+                    DeedTemplate._deeds.get(inventoryItem.templateID).deed_structure_id == buildingList.getBlueprintUUID()) {
                 contract = inventoryItem;
                 break;
             }

src/engine/net/client/handlers/RepairMsgHandler.java

@@ -85,7 +85,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
             //make sure item is damaged and not destroyed
 
             short dur = (short) toRepair.combat_health_current;
-            short max = (short) toRepair.template.combat_health_full;
+            short max = (short) toRepair.template.getCombatHealthFull();
 
             //account for durability modifications
 

src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java

@@ -68,7 +68,7 @@ public class TransferItemFromBankMsgHandler extends AbstractClientMsgHandler {
             return true;
         ;
 
-        if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) {
+        if (item.template.getItemType().equals(mbEnums.ItemType.GOLD)) {
 
             if (!itemManager.moveGoldToInventory(item, msg.getNumItems()))
                 return true;
@@ -85,7 +85,7 @@ public class TransferItemFromBankMsgHandler extends AbstractClientMsgHandler {
 
         // Not gold, process update here
 
-        if (!itemManager.hasRoomInventory(item.template.item_wt))
+        if (!itemManager.hasRoomInventory(item.template.getItemWt()))
             return true;
 
         if (itemManager.moveItemToInventory(item) == false)

src/engine/net/client/handlers/TransferItemToBankMsgHandler.java

@@ -65,7 +65,7 @@ public class TransferItemToBankMsgHandler extends AbstractClientMsgHandler {
             return true;
 
         if (item.containerType == mbEnums.ItemContainerType.INVENTORY && itemManager.isBankOpen())
-            if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) {
+            if (item.template.getItemType().equals(mbEnums.ItemType.GOLD)) {
                 if (!itemManager.moveGoldToBank(item, msg.getNumItems()))
                     return true;
                 UpdateGoldMsg goldMes = new UpdateGoldMsg(player);
@@ -76,7 +76,7 @@ public class TransferItemToBankMsgHandler extends AbstractClientMsgHandler {
 
             } else {
 
-                if (!itemManager.hasRoomBank(item.template.item_wt))
+                if (!itemManager.hasRoomBank(item.template.getItemWt()))
                     return true;
 
                 if (!itemManager.moveItemToBank(item))

src/engine/net/client/handlers/VendorBuyMsgHandler.java

@@ -86,7 +86,7 @@ public class VendorBuyMsgHandler extends AbstractClientMsgHandler {
                         if (me.objectUUID == vendorBuyMsg.getItemID()) {
 
                             //test room available for item
-                            if (!itemMan.hasRoomInventory(me.template.item_wt))
+                            if (!itemMan.hasRoomInventory(me.template.getItemWt()))
                                 return true;
 
                             int cost = me.getValue();
@@ -148,10 +148,10 @@ public class VendorBuyMsgHandler extends AbstractClientMsgHandler {
 
                 //test room available for item
 
-                if (!itemMan.hasRoomInventory(vendorItem.template.item_wt))
+                if (!itemMan.hasRoomInventory(vendorItem.template.getItemWt()))
                     return true;
 
-                int cost = vendorItem.template.item_value;
+                int cost = vendorItem.template.getItemValue();
 
                 if (vendorItem.flags.contains(mbEnums.ItemFlags.Identified) || vendorItem.isCustomValue())
                     cost = vendorItem.magicValue;

src/engine/net/client/handlers/VendorSellMsgHandler.java

@@ -94,7 +94,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler {
                     return true;
 
                 if (npc.getParentZone() != null && npc.getParentZone().playerCityUUID != 0)
-                    if (!npc.charItemManager.hasRoomInventory(sell.template.item_wt)) {
+                    if (!npc.charItemManager.hasRoomInventory(sell.template.getItemWt())) {
                         ErrorPopupMsg.sendErrorPopup(player, 21);
                         return true;
                     }
@@ -104,7 +104,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler {
 
                 //get goldItem cost to sell
 
-                cost = (int) (sell.template.item_value * (sell.combat_health_current / sell.template.combat_health_full));
+                cost = (int) (sell.template.getItemValue() * (sell.combat_health_current / sell.template.getCombatHealthFull()));
 
                 float bargain = player.getBargain();
                 float profit = npc.getBuyPercent(player) + bargain;

src/engine/net/client/msg/ManageNPCMsg.java

@@ -19,6 +19,7 @@ import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
 import engine.net.Protocol;
 import engine.objects.*;
+import engine.parsers.objects.CObjectTemplate;
 import org.joda.time.DateTime;
 import org.joda.time.Period;
 import org.joda.time.Seconds;
@@ -420,17 +421,18 @@ public class ManageNPCMsg extends ClientNetMsg {
                         writer.putInt(rollableSet.size());
 
                         for (int templateID : rollableSet) {
-                            ItemTemplate template = ItemTemplate.templates.get(templateID);
+                            CObjectTemplate template = CObjectTemplate.lookup(templateID);
+                            int modTable = ForgeManager.getVendorModTable(templateID);
                             writer.put((byte) 1);
                             writer.putInt(0);
                             writer.putInt(templateID); //itemID
-                            writer.putInt(template.item_value);
+                            writer.putInt(template.getItemValue());
                             writer.putInt(600);
                             writer.put((byte) 1);
-                            writer.put((byte) template.modTable);
-                            writer.put((byte) template.modTable);
-                            writer.put((byte) template.modTable);
-                            writer.put((byte) template.modTable);//EffectItemType
+                            writer.put((byte) modTable);
+                            writer.put((byte) modTable);
+                            writer.put((byte) modTable);
+                            writer.put((byte) modTable);//EffectItemType
                         }
 
                         ArrayList<Item> cooking = NPCManager.getAllCookingForVendor(npc);
@@ -444,7 +446,7 @@ public class ManageNPCMsg extends ClientNetMsg {
 
                             writer.putInt(0);
                             writer.putInt(item.templateID);
-                            writer.putInt(item.template.item_value);
+                            writer.putInt(item.template.getItemValue());
 
                             long timeLife = item.getDateToUpgrade() - System.currentTimeMillis();
 

src/engine/net/client/msg/UpdateInventoryMsg.java

@@ -54,7 +54,7 @@ public class UpdateInventoryMsg extends ClientNetMsg {
 
 
         for (Item item : list) {
-            if (item.template.item_type.equals(ItemType.GOLD)) {
+            if (item.template.getItemType().equals(ItemType.GOLD)) {
                 if (item.getNumOfItems() == 0)
                     continue;
             }

src/engine/net/client/msg/UseCharterMsg.java

@@ -16,6 +16,7 @@ import engine.net.ByteBufferWriter;
 import engine.net.Protocol;
 import engine.objects.Item;
 import engine.objects.PlayerCharacter;
+import engine.parsers.objects.DeedTemplate;
 
 
 public class UseCharterMsg extends ClientNetMsg {
@@ -61,9 +62,13 @@ public class UseCharterMsg extends ClientNetMsg {
 
     public void configure() {
 
+        DeedTemplate charterDeed;
+
         if (close) {
             for (Item i : player.getInventory()) {
-                if (i.template.item_type.equals(ItemType.CHARTER)) {
+                charterDeed = DeedTemplate._deeds.get(i.templateID);
+
+                if (charterDeed != null && charterDeed.item_type.equals(ItemType.CHARTER)) {
                     charterUUID = i.getObjectUUID();
                     break;
                 }

src/engine/net/client/msg/VendorBuyWindowMsg.java

@@ -156,7 +156,7 @@ public class VendorBuyWindowMsg extends ClientNetMsg {
             for (Item item : inventory) {
                 if (item.getOwnerID() != ownerID)
                     continue;
-                if (item.template.item_type.equals(ItemType.GOLD)) {
+                if (item.template.getItemType().equals(ItemType.GOLD)) {
                     if (item.getNumOfItems() == 0)
                         continue;
                 }

src/engine/objects/AbstractCharacter.java

@@ -29,6 +29,8 @@ import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ApplyRuneMsg;
 import engine.net.client.msg.UpdateStateMsg;
+import engine.parsers.objects.CObjectTemplate;
+import engine.parsers.objects.RuneTemplate;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
@@ -652,11 +654,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         AssignDefenseValue(abstractCharacter);
         // calculate atr and damage for each hand
         ConcurrentHashMap<EquipSlotType, Item> equipped = abstractCharacter.charItemManager.getEquipped();
-        AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.RHELD), true, equipped.get(EquipSlotType.RHELD));
-        AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.LHELD));
+        AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.RHELD), true, equipped.get(EquipSlotType.LHELD));
+        AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.RHELD));
         if (abstractCharacter.getObjectType().equals(GameObjectType.Mob)) {
             Mob mob = (Mob) abstractCharacter;
-            ItemTemplate rune = ItemTemplate.templates.get(mob.loadID);
+            RuneTemplate rune = RuneTemplate._runes.get(mob.loadID);
             float minDamage = mob.mobBase.getDamageMin();
             float maxDamage = mob.mobBase.getDamageMax();
             int attackRating = mob.mobBase.getAttackRating();
@@ -691,16 +693,17 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
         // make sure weapon exists
         boolean noWeapon = false;
-        ItemTemplate weaponTemplate = null;
+        CObjectTemplate weaponTemplate = null;
+        engine.parsers.objects.ItemTemplate.Damage damage;
 
         if (weapon == null)
             noWeapon = true;
         else {
-            ItemTemplate itemTemplate = weapon.template;
+            CObjectTemplate itemTemplate = weapon.template;
 
             if (itemTemplate == null)
                 noWeapon = true;
-            else if (!weapon.template.item_type.equals(ItemType.WEAPON)) {
+            else if (!weapon.template.getItemType().equals(ItemType.WEAPON)) {
                 defaultAtrAndDamage(abstractCharacter, mainHand);
                 return;
             } else
@@ -717,7 +720,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         if (noWeapon) {
             if (mainHand) {
                 Item off = abstractCharacter.charItemManager.getEquipped().get(EquipSlotType.LHELD);
-                if (off != null && off.template != null && off.template.item_type.equals(ItemType.WEAPON))
+                if (off != null && off.template != null && off.template.getItemType().equals(ItemType.WEAPON))
                     abstractCharacter.rangeHandOne = 10 * (1 + (abstractCharacter.statStrBase / 600)); // Set
                     // to
                     // no
@@ -750,9 +753,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
         } else {
             if (mainHand)
-                abstractCharacter.rangeHandOne = weapon.template.item_weapon_max_range * (1 + (abstractCharacter.statStrBase / 600));
+                abstractCharacter.rangeHandOne = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_max_range * (1 + (abstractCharacter.statStrBase / 600));
             else
-                abstractCharacter.rangeHandTwo = weapon.template.item_weapon_max_range * (1 + (abstractCharacter.statStrBase / 600));
+                abstractCharacter.rangeHandTwo = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_max_range * (1 + (abstractCharacter.statStrBase / 600));
 
             if (abstractCharacter.bonuses != null) {
                 float range_bonus = 1 + abstractCharacter.bonuses.getFloatPercentAll(ModType.WeaponRange, SourceType.None);
@@ -764,20 +767,20 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
             }
 
-            skillPercentage = getModifiedAmount(abstractCharacter.skills.get(weapon.template.item_skill_used));
-            masteryPercentage = getModifiedAmount(abstractCharacter.skills.get(weaponTemplate.item_skill_mastery_used));
+            skillPercentage = getModifiedAmount(abstractCharacter.skills.get(weapon.template.getItemSkillUsed()));
+            masteryPercentage = getModifiedAmount(abstractCharacter.skills.get(weaponTemplate.getItemSkillMasteryUsed()));
 
             if (masteryPercentage == 0f)
                 mastDam = 0f;
                 //				mastDam = CharacterSkill.getQuickMastery(this, wb.getMastery());
             else
                 mastDam = masteryPercentage;
-            int[] damages = (int[]) weaponTemplate.item_weapon_damage.values().toArray()[0];
+            damage = engine.parsers.objects.ItemTemplate.getWeapon(weapon.templateID).weapon_damage.get(0);
 
-            min = damages[0];
-            max = damages[1];
+            min = damage.damage_min;
+            max = damage.damage_max;
 
-            strBased = weaponTemplate.item_primary_attr.equals(AttributeType.Strength);
+            strBased = engine.parsers.objects.ItemTemplate._items.get(weapon.templateID).item_primary_attr == AttributeType.Strength;
         }
 
         if (abstractCharacter.effects != null && abstractCharacter.effects.containsKey("DeathShroud"))
@@ -826,7 +829,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
         //calculate speed
         if (weaponTemplate != null)
-            speed = weaponTemplate.item_weapon_wepspeed;
+            speed = engine.parsers.objects.ItemTemplate.getWeapon(weaponTemplate.getTemplateId()).weapon_wepspeed;
         else
             speed = 20f; //unarmed attack speed
         if (weapon != null)
@@ -881,15 +884,12 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             max *= percentMaxDamage;
         }
 
-        //if duel wielding, cut damage by 30%
+        // Client (0x466EB0 sets char+0xD0C, 0x46D200 applies it): 30% cut only when both hands hold a WEAPON.
 
-        if (otherHand != null) {
-            ItemTemplate ibo = otherHand.template;
-
-            if (ibo != null && otherHand.template.equals(ItemType.WEAPON)) {
-                min *= 0.7f;
-                max *= 0.7f;
-            }
+        if (!noWeapon && otherHand != null && otherHand.template != null
+                && otherHand.template.getItemType().equals(ItemType.WEAPON)) {
+            min *= 0.7f;
+            max *= 0.7f;
         }
 
         // calculate damage
@@ -955,7 +955,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         if (ItemManager.isShield(shield) == false)
             return 0;
 
-        ItemTemplate template = shield.template;
+        CObjectTemplate template = shield.template;
 
         if (template == null)
             return 0;
@@ -969,7 +969,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         } else
             skillMod = blockSkill.getModifiedAmount();
 
-        float def = template.item_defense_rating;
+        float def = engine.parsers.objects.ItemTemplate._items.get(shield.templateID).item_defense_rating;
 
         //apply item defense bonuses
 
@@ -991,29 +991,30 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         if (armor == null)
             return 0;
 
-        ItemTemplate template = armor.template;
+        CObjectTemplate template = armor.template;
 
         if (template == null)
             return 0;
 
-        if (!armor.template.item_type.equals(ItemType.ARMOR))
+        if (!armor.template.getItemType().equals(ItemType.ARMOR))
             return 0;
 
-        if (armor.template.item_skill_used.isEmpty())
-            return template.item_defense_rating;
+        // "Cloth" is a placeholder in Skills.cfg (token 0) that no character learns
+        if (armor.template.getItemSkillUsed().isEmpty() || armor.template.getItemSkillUsed().equals("Cloth"))
+            return engine.parsers.objects.ItemTemplate._items.get(armor.templateID).item_defense_rating;
 
-        CharacterSkill armorSkill = abstractCharacter.skills.get(armor.template.item_skill_used);
+        CharacterSkill armorSkill = abstractCharacter.skills.get(armor.template.getItemSkillUsed());
 
         if (abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter) && armorSkill == null) {
             Logger.error("Player " + abstractCharacter.getObjectUUID()
                     + " has armor equipped without the nescessary skill to equip it");
-            return template.item_defense_rating;
+            return engine.parsers.objects.ItemTemplate._items.get(armor.templateID).item_defense_rating;
         }
 
         if (armorSkill == null)
-            return template.item_defense_rating;  // Mobiles do not have armor skills @TODO
+            return engine.parsers.objects.ItemTemplate._items.get(armor.templateID).item_defense_rating;  // Mobiles do not have armor skills @TODO
 
-        float def = template.item_defense_rating;
+        float def = engine.parsers.objects.ItemTemplate._items.get(armor.templateID).item_defense_rating;
 
         //apply item defense bonuses
 
@@ -1031,7 +1032,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     private static float getWeaponDefense(AbstractCharacter abstractCharacter, ConcurrentHashMap<EquipSlotType, Item> equipped) {
 
         Item weapon = equipped.get(EquipSlotType.RHELD);
-        ItemTemplate weaponTemplate = null;
+        CObjectTemplate weaponTemplate = null;
         CharacterSkill skill, mastery;
         float val = 0;
         boolean unarmed = false;
@@ -1052,8 +1053,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             skill = abstractCharacter.skills.get("Unarmed Combat");
             mastery = abstractCharacter.skills.get("Unarmed Combat Mastery");
         } else {
-            skill = abstractCharacter.skills.get(weapon.template.item_skill_used);
-            mastery = abstractCharacter.skills.get(weaponTemplate.item_skill_mastery_used);
+            skill = abstractCharacter.skills.get(weapon.template.getItemSkillUsed());
+            mastery = abstractCharacter.skills.get(weaponTemplate.getItemSkillMasteryUsed());
         }
 
         if (skill != null)
@@ -1088,7 +1089,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
         for (Item item : equipped.values()) {
 
-            ItemTemplate ib = item.template;
+            CObjectTemplate ib = item.template;
 
             if (ib == null)
                 continue;
@@ -1507,9 +1508,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             }
             float range = 8;
             if ((this).charItemManager.equipped.get(EquipSlotType.RHELD) != null) {
-                range = ((Mob) this).charItemManager.equipped.get(EquipSlotType.RHELD).template.item_weapon_max_range;
+                range = engine.parsers.objects.ItemTemplate.getWeapon(((Mob) this).charItemManager.equipped.get(EquipSlotType.RHELD).templateID).weapon_max_range;
             } else if (((Mob) this).charItemManager.equipped.get(EquipSlotType.LHELD) != null) {
-                range = ((Mob) this).charItemManager.equipped.get(EquipSlotType.LHELD).template.item_weapon_max_range;
+                range = engine.parsers.objects.ItemTemplate.getWeapon(((Mob) this).charItemManager.equipped.get(EquipSlotType.LHELD).templateID).weapon_max_range;
             } else {
 
                 // Unarmed: use the rune natural attack range when it has one (e.g. Gasser 150), not clamped.

src/engine/objects/Account.java

@@ -172,7 +172,7 @@ public class Account extends AbstractGameObject {
                 this.vault = DbManager.ItemQueries.GET_ITEMS_FOR_ACCOUNT(this.getObjectUUID());
 
                 for (Item item : this.vault) {
-                    if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) {
+                    if (item.template.getItemType().equals(mbEnums.ItemType.GOLD)) {
                         this.vaultGold = item;
                     }
                 }
@@ -216,7 +216,7 @@ public class Account extends AbstractGameObject {
             return;
 
         if (item.containerType == mbEnums.ItemContainerType.INVENTORY && player.charItemManager.isVaultOpen()) {
-            if (!player.charItemManager.hasRoomVault(item.template.item_wt)) {
+            if (!player.charItemManager.hasRoomVault(item.template.getItemWt())) {
                 ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "There is no room in your vault.");
                 return;
             }
@@ -262,7 +262,7 @@ public class Account extends AbstractGameObject {
             return;
 
         if (item.containerType == mbEnums.ItemContainerType.VAULT && itemManager.isVaultOpen()) {
-            if (!itemManager.hasRoomInventory(item.template.item_wt)) {
+            if (!itemManager.hasRoomInventory(item.template.getItemWt())) {
                 ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "There is no room in your inventory.");
                 return;
             }

src/engine/objects/CharacterItemManager.java

@@ -17,6 +17,7 @@ import engine.mbEnums.ItemType;
 import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -130,19 +131,19 @@ public class CharacterItemManager {
                         this.equipped.put(i.equipSlot, i);
                     break;
                 case BANK:
-                    if (i.template.item_type.equals(ItemType.GOLD))
+                    if (i.template.getItemType().equals(ItemType.GOLD))
                         this.goldBank = i;
                     else if (this.bank.contains(i) == false)
                         this.bank.add(i);
                     break;
                 case INVENTORY:
-                    if (i.template.item_type.equals(ItemType.GOLD))
+                    if (i.template.getItemType().equals(ItemType.GOLD))
                         this.goldInventory = i;
                     else if (this.inventory.contains(i) == false)
                         this.inventory.add(i);
                     break;
                 case VAULT:
-                    if (i.template.item_type.equals(ItemType.GOLD))
+                    if (i.template.getItemType().equals(ItemType.GOLD))
                         this.goldVault = i;
                     else if (this.vault.contains(i) == false)
                         this.vault.add(i);
@@ -175,13 +176,13 @@ public class CharacterItemManager {
                         this.equipped.put(i.equipSlot, i);
                     break;
                 case BANK:
-                    if (i.template.item_type.equals(ItemType.GOLD))
+                    if (i.template.getItemType().equals(ItemType.GOLD))
                         this.goldBank = i;
                     else if (this.bank.contains(i) == false)
                         this.bank.add(i);
                     break;
                 case INVENTORY:
-                    if (i.template.item_type.equals(ItemType.GOLD))
+                    if (i.template.getItemType().equals(ItemType.GOLD))
                         this.goldInventory = i;
                     else if (this.inventory.contains(i) == false)
                         this.inventory.add(i);
@@ -511,7 +512,7 @@ public class CharacterItemManager {
         if (i == null)
             return false;
 
-        if (i.template.item_type.equals(ItemType.GOLD)) {
+        if (i.template.getItemType().equals(ItemType.GOLD)) {
             if (this.getGoldInventory() != null) {
                 if (i.getObjectUUID() == this.getGoldInventory().getObjectUUID())
                     this.goldInventory = null;
@@ -541,7 +542,7 @@ public class CharacterItemManager {
     }
 
     private synchronized boolean junk(Item i, boolean updateInventory) {
-        if (i.template.item_type.equals(ItemType.GOLD)) {
+        if (i.template.getItemType().equals(ItemType.GOLD)) {
             if (this.getGoldInventory().getObjectUUID() == i.getObjectUUID())
                 if (DbManager.ItemQueries.UPDATE_GOLD(i, 0)) {
                     this.getGoldInventory().setNumOfItems(0);
@@ -596,7 +597,7 @@ public class CharacterItemManager {
 
             if (equippedContains(item)) {
                 fromEquip = true;
-                if (item.template.item_type.equals(ItemType.GOLD))
+                if (item.template.getItemType().equals(ItemType.GOLD))
                     this.absCharacter.cancelOnUnEquip();
             }
 
@@ -814,7 +815,7 @@ public class CharacterItemManager {
 
     // This removes ingame item from inventory for loot.
     private synchronized boolean removeItemFromInventory(Item i) {
-        if (i.template.item_type.equals(ItemType.GOLD)) {
+        if (i.template.getItemType().equals(ItemType.GOLD)) {
             if (i.getObjectUUID() != this.getGoldInventory().getObjectUUID())
                 return false;
             if (!DbManager.ItemQueries.UPDATE_GOLD(this.goldInventory, 0)) {
@@ -837,7 +838,7 @@ public class CharacterItemManager {
 
     // This adds item to inventory for loot. Validity checks already handled
     public synchronized boolean addItemToInventory(Item i) {
-        if (i.template.item_type.equals(ItemType.GOLD))
+        if (i.template.getItemType().equals(ItemType.GOLD))
             if (this.absCharacter.getObjectType() == GameObjectType.Mob) {
                 if (this.goldInventory == null)
                     loadGoldItems();
@@ -856,7 +857,7 @@ public class CharacterItemManager {
         this.itemIDtoType.put(i.getObjectUUID(), i.getObjectType().ordinal());
 
         if (i.template != null)
-            this.inventoryWeight += i.template.item_wt;
+            this.inventoryWeight += i.template.getItemWt();
 
         return true;
     }
@@ -1041,7 +1042,7 @@ public class CharacterItemManager {
                 if (npc.getContractID() >= 1900 && npc.getContractID() <= 1906)
                     eatItem = true;
 
-                if (itemToSell.template.item_type.equals(ItemType.POTION))
+                if (itemToSell.template.getItemType().equals(ItemType.POTION))
                     eatItem = true;
 
                 if (eatItem) {
@@ -1085,14 +1086,14 @@ public class CharacterItemManager {
 
         synchronized (this) {
             synchronized (itemMan) {
-                ItemTemplate template = purchasedItem.template;
+                CObjectTemplate template = purchasedItem.template;
 
                 if (template == null)
                     return false;
 
                 //test inventory is not full
 
-                if (!hasRoomInventory(template.item_wt))
+                if (!hasRoomInventory(template.getItemWt()))
                     return false;
 
                 if (!itemMan.inventory.contains(purchasedItem))
@@ -1105,8 +1106,8 @@ public class CharacterItemManager {
 
                 // Reset value
 
-                purchasedItem.value = (int) (purchasedItem.template.item_value * (purchasedItem.combat_health_current / purchasedItem.template.combat_health_full));
-                purchasedItem.magicValue = purchasedItem.template.item_value + purchasedItem.calcMagicValue();
+                purchasedItem.value = (int) (purchasedItem.template.getItemValue() * (purchasedItem.combat_health_current / purchasedItem.template.getCombatHealthFull()));
+                purchasedItem.magicValue = purchasedItem.template.getItemValue() + purchasedItem.calcMagicValue();
 
                 // db transfer successfully, remove from this character
                 // skip this check if this is a mobLoot item (which is not in any inventory)
@@ -1184,9 +1185,9 @@ public class CharacterItemManager {
         synchronized (lockFirst) {
             synchronized (lockSecond) {
                 // make sure current player has item in inventory
-                if (lootItem.template.item_type.equals(ItemType.GOLD) && lootItem.getObjectUUID() != this.getGoldInventory().getObjectUUID() && !(this.absCharacter.getObjectType().equals(GameObjectType.Mob)))
+                if (lootItem.template.getItemType().equals(ItemType.GOLD) && lootItem.getObjectUUID() != this.getGoldInventory().getObjectUUID() && !(this.absCharacter.getObjectType().equals(GameObjectType.Mob)))
                     return null;
-                else if (!this.inventory.contains(lootItem) && !this.equipped.containsValue(lootItem) && !lootItem.template.item_type.equals(ItemType.GOLD))
+                else if (!this.inventory.contains(lootItem) && !this.equipped.containsValue(lootItem) && !lootItem.template.getItemType().equals(ItemType.GOLD))
                     return null;
 
                 // get weight of item
@@ -1194,13 +1195,13 @@ public class CharacterItemManager {
                 if (lootItem.template == null)
                     return null;
 
-                int weight = lootItem.template.item_wt;
+                int weight = lootItem.template.getItemWt();
 
                 // make sure lootingPlayer has room for item
-                if (!lootItem.template.item_type.equals(ItemType.GOLD) && !looterItems.hasRoomInventory(weight))
+                if (!lootItem.template.getItemType().equals(ItemType.GOLD) && !looterItems.hasRoomInventory(weight))
                     return null;
 
-                if (lootItem.template.item_type.equals(ItemType.GOLD))
+                if (lootItem.template.getItemType().equals(ItemType.GOLD))
                     if (amount != -1) { //from steal
                         int total = lootItem.getNumOfItems();
                         amount = (amount > total) ? total : amount;
@@ -1263,19 +1264,19 @@ public class CharacterItemManager {
      * Delegates
      */
     public synchronized boolean bankContains(Item item) {
-        if (item.template.item_type.equals(ItemType.GOLD))
+        if (item.template.getItemType().equals(ItemType.GOLD))
             return (this.getGoldBank() != null && this.goldBank.getObjectUUID() == item.getObjectUUID());
         return bank.contains(item);
     }
 
     public synchronized boolean inventoryContains(Item item) {
-        if (item.template.item_type.equals(ItemType.GOLD))
+        if (item.template.getItemType().equals(ItemType.GOLD))
             return (this.getGoldInventory() != null && this.goldInventory.getObjectUUID() == item.getObjectUUID());
         return inventory.contains(item);
     }
 
     public synchronized boolean vaultContains(Item item) {
-        if (item.template.item_type.equals(ItemType.GOLD))
+        if (item.template.getItemType().equals(ItemType.GOLD))
             return (this.getGoldVault() != null && this.goldVault.getObjectUUID() == item.getObjectUUID());
         return this.account.getVault().contains(item);
     }
@@ -1518,13 +1519,13 @@ public class CharacterItemManager {
                     item.zeroItem();
                     item.containerType = mbEnums.ItemContainerType.INVENTORY;
 
-                    if (item.template.item_type.equals(ItemType.GOLD))
+                    if (item.template.getItemType().equals(ItemType.GOLD))
                         //only add gold item once
                         if (!corpse.hasGold())
                             corpse.setHasGold(true);
                     newInventory.add(item);
                 } else //item
-                    if (item.template.item_type.equals(ItemType.GOLD)) {
+                    if (item.template.getItemType().equals(ItemType.GOLD)) {
                         int amt = item.getNumOfItems();
                         item.setNumOfItems(0);
                         MobLoot ml = new MobLoot(this.absCharacter, amt);
@@ -1676,7 +1677,7 @@ public class CharacterItemManager {
             if (item == null)
                 continue;
 
-            weight += item.template.item_wt;
+            weight += item.template.getItemWt();
         }
         return weight;
     }
@@ -1696,7 +1697,7 @@ public class CharacterItemManager {
         this.bankWeight = 0;
         for (Item item : this.bank) {
             if (item.template != null)
-                this.bankWeight += item.template.item_wt;
+                this.bankWeight += item.template.getItemWt();
         }
     }
 
@@ -1707,7 +1708,7 @@ public class CharacterItemManager {
         while (it.hasNext()) {
             Item item = it.next();
             if (item.template != null)
-                this.equipWeight += item.template.item_wt;
+                this.equipWeight += item.template.getItemWt();
         }
     }
 
@@ -1715,7 +1716,7 @@ public class CharacterItemManager {
         this.inventoryWeight = 0;
         for (Item item : this.inventory) {
             if (item.template != null)
-                this.inventoryWeight += item.template.item_wt;
+                this.inventoryWeight += item.template.getItemWt();
         }
     }
 
@@ -1723,7 +1724,7 @@ public class CharacterItemManager {
         this.vaultWeight = 0;
         for (Item item : this.vault) {
             if (item.template != null)
-                this.vaultWeight += item.template.item_wt;
+                this.vaultWeight += item.template.getItemWt();
         }
     }
 
@@ -1755,7 +1756,7 @@ public class CharacterItemManager {
             return;
 
         if (!item.moveItemToInventory(player))
-            Logger.error("templateL " + item.template.template_id);
+            Logger.error("templateL " + item.template.getTemplateId());
 
         // remove it from other lists:
         this.remItemFromLists(item);
@@ -1932,7 +1933,7 @@ public class CharacterItemManager {
             return;
 
         //don't damage noob gear, hair or beards.
-        if (item.template.combat_health_full == 0)
+        if (item.template.getCombatHealthFull() == 0)
             return;
 
         if (!item.isCanDestroy())

src/engine/objects/Corpse.java

@@ -296,14 +296,14 @@ public class Corpse extends AbstractWorldObject {
 
             //get weight of item
 
-            int weight = item.template.item_wt;
+            int weight = item.template.getItemWt();
 
             //make sure looter has room for item
-            if (item.template.item_type.equals(ItemType.GOLD) == false && !looterItems.hasRoomInventory(weight))
+            if (item.template.getItemType().equals(ItemType.GOLD) == false && !looterItems.hasRoomInventory(weight))
                 return null;
 
             //attempt to transfer item in db
-            if (item.template.item_type.equals(ItemType.GOLD)) {
+            if (item.template.getItemType().equals(ItemType.GOLD)) {
                 if (!looterItems.moveGoldToInventory(item, item.getNumOfItems()))
                     return null;
             } else if (!item.moveItemToInventory(looter))

src/engine/objects/Item.java

@@ -20,6 +20,8 @@ import engine.net.ByteBufferWriter;
 import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.DeleteItemMsg;
+import engine.parsers.objects.CObjectTemplate;
+import engine.parsers.objects.UserPowerAction;
 import engine.powers.EffectsBase;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.powers.poweractions.AbstractPowerAction;
@@ -31,6 +33,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -55,7 +58,7 @@ public class Item extends AbstractWorldObject {
     public int templateID;
     private long dateToUpgrade;
     public int magicValue;
-    public ItemTemplate template;
+    public CObjectTemplate template;
     public String name = "";
     public int prefixToken; // Forge support
     public int suffixToken; // Forge support
@@ -68,14 +71,14 @@ public class Item extends AbstractWorldObject {
     public Item(int templateID) {
         super();
         this.templateID = templateID;
-        this.template = ItemTemplate.templates.get(templateID);
-        this.chargesRemaining = this.template.item_initial_charges;
-        this.combat_health_current = this.template.combat_health_full;
+        this.template = CObjectTemplate.lookup(templateID);
+        this.chargesRemaining = this.template.getItemInitialCharges();
+        this.combat_health_current = this.template.getCombatHealthFull();
         this.equipSlot = EquipSlotType.NONE;
         this.containerType = ItemContainerType.NONE;
         this.numberOfItems = 1;
-        this.flags.addAll(this.template.item_flags);
-        this.value = this.template.item_value;
+        this.flags.addAll(this.template.getItemFlags());
+        this.value = this.template.getItemValue();
         this.magicValue = this.value + calcMagicValue();
         loadTemplateEnchantments();
     }
@@ -87,7 +90,7 @@ public class Item extends AbstractWorldObject {
         super(rs);
 
         this.templateID = rs.getInt("templateID");
-        this.template = ItemTemplate.templates.get(this.templateID);
+        this.template = CObjectTemplate.lookup(this.templateID);
 
         if (this.template == null)
             Logger.error("Null template of " + this.templateID);
@@ -166,7 +169,7 @@ public class Item extends AbstractWorldObject {
         this.value = rs.getInt("value");
 
         if (this.value == 0) {
-            this.value = this.template.item_value;
+            this.value = this.template.getItemValue();
             this.magicValue = this.value + calcMagicValue();
         } else
             this.magicValue = this.value; // Value was overridden in vendor inventory
@@ -238,7 +241,7 @@ public class Item extends AbstractWorldObject {
         writer.putString(item.name); // Unknown. pad?
         writer.put((byte) 1); // End Datablock byte
 
-        writer.putFloat(item.template.combat_health_full);
+        writer.putFloat(item.template.getCombatHealthFull());
         writer.putFloat((float) item.combat_health_current);
 
         writer.put((byte) 1); // End Datablock byte
@@ -255,7 +258,7 @@ public class Item extends AbstractWorldObject {
             } else
                 writer.putInt(item.numberOfItems); // Amount of gold
         } else
-            writer.putInt(item.template.item_value);
+            writer.putInt(item.template.getItemValue());
 
         writer.putInt(item.getValue());
 
@@ -288,7 +291,7 @@ public class Item extends AbstractWorldObject {
                 writer.putInt(36); //Magical, blue name
             else
                 writer.putInt(40); //Magical, unidentified
-        else if (item.template.item_user_power_action.size() > 0)
+        else if (item.template.getItemUserPowerAction().isEmpty() == false)
             writer.putInt(36); //Magical, blue name
         else
             writer.putInt(4); //Non-Magical, grey name
@@ -298,7 +301,7 @@ public class Item extends AbstractWorldObject {
         writer.put((byte) 0);
 
 
-        if (item.template.item_type.equals(ItemType.EMPLOYMENTCONTRACT) == false) {
+        if (item.template.getItemType().equals(ItemType.EMPLOYMENTCONTRACT) == false) {
             writer.putShort((short) 0);
             return;
         }
@@ -463,7 +466,7 @@ public class Item extends AbstractWorldObject {
         int serialized = 0;
         for (Item item : list) {
 
-            if (item.template.item_type.equals(ItemType.GOLD))
+            if (item.template.getItemType().equals(ItemType.GOLD))
                 if (item.numberOfItems == 0)
                     continue;
             try {
@@ -497,7 +500,7 @@ public class Item extends AbstractWorldObject {
         int serialized = 0;
         for (Item item : list) {
 
-            if (item.template.item_type.equals(ItemType.GOLD))
+            if (item.template.getItemType().equals(ItemType.GOLD))
                 if (item.numberOfItems == 0)
                     continue;
             try {
@@ -931,12 +934,16 @@ public class Item extends AbstractWorldObject {
     private void loadTemplateEnchantments() {
 
         EffectsBase effect;
+        LinkedHashMap<String, int[]> templateEnchantments = new LinkedHashMap<>();
 
         if (ConfigManager.serverType.equals(mbEnums.ServerType.LOGINSERVER))
             return;
 
+        // Duplicate powers collapse to the last entry; applying one twice would double its magic value.
+        for (UserPowerAction userPowerAction : this.template.getItemUserPowerAction())
+            templateEnchantments.put(userPowerAction.power, userPowerAction.arguments);
 
-        for (String effectID : this.template.item_user_power_action.keySet()) {
+        for (String effectID : templateEnchantments.keySet()) {
 
             effect = PowersManager.getEffectByIDString(effectID);
 
@@ -946,7 +953,7 @@ public class Item extends AbstractWorldObject {
             }
 
             AbstractPowerAction apa = PowersManager.getPowerActionByIDString(effect.getIDString());
-            apa.applyBakedInStatsForItem(this, this.template.item_user_power_action.get(effectID)[0]);
+            apa.applyBakedInStatsForItem(this, templateEnchantments.get(effectID)[0]);
         }
     }
 
@@ -955,7 +962,7 @@ public class Item extends AbstractWorldObject {
         // No enchantments for negative id items in the db.  Early exit.
 
         if (this.objectUUID < 0) {
-            this.magicValue = this.template.item_value + calcMagicValue();
+            this.magicValue = this.template.getItemValue() + calcMagicValue();
             return;
         }
 
@@ -971,8 +978,8 @@ public class Item extends AbstractWorldObject {
 
         // Value is overridden the db
 
-        if (this.value == this.template.item_value)
-            this.magicValue = this.template.item_value + calcMagicValue();
+        if (this.value == this.template.getItemValue())
+            this.magicValue = this.template.getItemValue() + calcMagicValue();
     }
 
     public void addPermanentEnchantment(String enchantID, int rank) {
@@ -1116,11 +1123,11 @@ public class Item extends AbstractWorldObject {
         else
             modifiedValue = this.value;
 
-        if (this.template.item_initial_charges > 0)
-            modifiedValue = modifiedValue * (this.chargesRemaining / this.template.item_initial_charges);
+        if (this.template.getItemInitialCharges() > 0)
+            modifiedValue = modifiedValue * (this.chargesRemaining / this.template.getItemInitialCharges());
 
-        if (this.template.combat_health_full > 0)
-            modifiedValue = (int) (modifiedValue * (this.combat_health_current / this.template.combat_health_full));
+        if (this.template.getCombatHealthFull() > 0)
+            modifiedValue = (int) (modifiedValue * (this.combat_health_current / this.template.getCombatHealthFull()));
 
         return modifiedValue;
     }

src/engine/objects/ItemTemplate.java

@@ -10,6 +10,7 @@ package engine.objects;
 
 import engine.math.Vector3fImmutable;
 import engine.mbEnums;
+import engine.parsers.objects.CObjectTemplate;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.pmw.tinylog.Logger;
@@ -100,7 +101,6 @@ public class ItemTemplate {
     // engine.parsers.objects.RuneTemplate keeps the full list.
     public final HashMap<String, int[]> item_power_action = new HashMap<>();
     public final HashMap<mbEnums.ResourceType, Integer> item_resource_cost = new HashMap<>();
-    public int modTable;
     public int deed_type;
     public int deed_furniture_id;
     public int deed_target_id;
@@ -157,6 +157,9 @@ public class ItemTemplate {
     public final ArrayList<Integer> rune_helper_monster_types = new ArrayList<>();
     public int item_bane_rank;
 
+    // Cache JSON counterpart, so consumers can move to the new templates one field at a time.
+    public CObjectTemplate cacheTemplate;
+
     public ItemTemplate(JSONObject jsonObject) {
 
         try {
@@ -646,4 +649,22 @@ public class ItemTemplate {
         }
     }
 
+    // Run after CObjectIndex.build(); the DB templates load before the cache parsers.
+
+    public static void linkCacheTemplates() {
+
+        int missingCount = 0;
+
+        for (ItemTemplate template : templates.values()) {
+            template.cacheTemplate = CObjectTemplate.lookup(template.template_id);
+
+            if (template.cacheTemplate == null) {
+                missingCount++;
+                Logger.warn(template.template_id + ": " + template.obj_name + " has no cache template");
+            }
+        }
+
+        Logger.info("Linked " + (templates.size() - missingCount) + " of " + templates.size() + " item templates to cache templates");
+    }
+
 }

src/engine/objects/MobBase.java

@@ -127,9 +127,13 @@ public class MobBase extends AbstractGameObject {
         for (BootySetEntry equipmentSetEntry : equipList) {
 
             Item item = new Item(equipmentSetEntry.templateID);
+
+            if (item.template.getItemEqSlotsOr().isEmpty())
+                continue;
+
             item.objectUUID = ItemManager.lastNegativeID.decrementAndGet();
             item.drop_chance = equipmentSetEntry.dropChance;
-            item.equipSlot = item.template.item_eq_slots_or.iterator().next();
+            item.equipSlot = item.template.getItemEqSlotsOr().iterator().next();
             equip.put(item.equipSlot, item);
 
         }

src/engine/objects/MobLoot.java

@@ -15,6 +15,7 @@ import engine.gameManager.PowersManager;
 import engine.mbEnums;
 import engine.mbEnums.ItemType;
 import engine.mbEnums.OwnerType;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.poweractions.AbstractPowerAction;
 import org.pmw.tinylog.Logger;
 
@@ -30,22 +31,22 @@ public final class MobLoot extends Item {
     private String prefix = "";
     private String suffix = "";
 
-    public MobLoot(AbstractCharacter mob, ItemTemplate template, boolean noSteal) {
+    public MobLoot(AbstractCharacter mob, CObjectTemplate template, boolean noSteal) {
         this(mob, template, 0, noSteal);
     }
 
     public MobLoot(AbstractCharacter mob, int qtyOfGold) {
-        this(mob, ItemTemplate.templates.get(mbEnums.ResourceType.GOLD.templateID), qtyOfGold, false);
+        this(mob, CObjectTemplate.lookup(mbEnums.ResourceType.GOLD.templateID), qtyOfGold, false);
     }
 
-    public MobLoot(AbstractCharacter mob, ItemTemplate template, int quantity, boolean noSteal) {
+    public MobLoot(AbstractCharacter mob, CObjectTemplate template, int quantity, boolean noSteal) {
 
-        super(template.template_id);
+        super(template.getTemplateId());
         this.ownerType = OwnerType.Mob;
         this.ownerID = mob.getObjectUUID();
         this.objectUUID = generateId();
 
-        if (quantity == 0 && template.item_type == ItemType.RESOURCE)
+        if (quantity == 0 && template.getItemType() == ItemType.RESOURCE)
             quantity = 1;
 
         if (quantity > 0)
@@ -105,7 +106,7 @@ public final class MobLoot extends Item {
         if (isDeleted)
             return null;
 
-        if (this.template.item_type.equals(ItemType.GOLD))
+        if (this.template.getItemType().equals(ItemType.GOLD))
             return null;
 
         Item item = this;

src/engine/objects/NPC.java

@@ -23,6 +23,7 @@ import engine.net.ByteBufferWriter;
 import engine.net.Dispatch;
 import engine.net.client.msg.PetMsg;
 import engine.net.client.msg.PlaceAssetMsg;
+import engine.parsers.objects.CObjectTemplate;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
@@ -961,15 +962,15 @@ public class NPC extends AbstractCharacter {
                 maxSkill = 110;
                 break;
         }
-        ItemTemplate itemTemplate;
+        CObjectTemplate itemTemplate;
         int skillRequired = 0;
         for (Integer itemID : fullItemList) {
-            itemTemplate = ItemTemplate.templates.get(itemID);
+            itemTemplate = CObjectTemplate.lookup(itemID);
 
-            if (itemTemplate.item_skill_required.values().iterator().hasNext())
-                skillRequired = itemTemplate.item_skill_required.values().iterator().next();
+            if (itemTemplate.getItemSkillReq().values().iterator().hasNext())
+                skillRequired = itemTemplate.getItemSkillReq().values().iterator().next();
 
-            boolean exclude = skillRequired == 0 && ItemTemplate.templates.get(itemID).item_type.equals(ItemType.WEAPON);
+            boolean exclude = skillRequired == 0 && CObjectTemplate.lookup(itemID).getItemType().equals(ItemType.WEAPON);
             if (skillRequired <= maxSkill && !exclude)
                 filteredItemList.add(itemID);
         }

src/engine/objects/PlayerCharacter.java

@@ -32,6 +32,7 @@ import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.net.client.msg.login.CommitNewCharacterMsg;
+import engine.parsers.objects.CObjectTemplate;
 import engine.powers.EffectsBase;
 import engine.server.MBServerStatics;
 import engine.server.login.LoginServer;
@@ -1353,10 +1354,10 @@ public class PlayerCharacter extends AbstractCharacter {
     public static float getDexPenalty(Item armor) {
         if (armor == null)
             return 0f;
-        ItemTemplate ab = armor.template;
+        CObjectTemplate ab = armor.template;
         if (ab == null)
             return 0f;
-        return ab.item_bulk_factor;
+        return engine.parsers.objects.ItemTemplate._items.get(armor.templateID).item_bulk_factor;
     }
 
     public static void InitializeSkillsOnLoad(PlayerCharacter pc) {
@@ -2816,15 +2817,15 @@ public class PlayerCharacter extends AbstractCharacter {
         if (item == null)
             return false;
 
-        ItemTemplate ib = item.template;
+        CObjectTemplate ib = item.template;
         if (ib != null) {
 
-            if ((item.template.item_type.equals(ItemType.WEAPON))
-                    && (item.template.item_skill_used.equals(type) || ib.item_skill_mastery_used.equals(type)))
+            if ((item.template.getItemType().equals(ItemType.WEAPON))
+                    && (item.template.getItemSkillUsed().equals(type) || ib.getItemSkillMasteryUsed().equals(type)))
                 return true;
 
-            return (item.template.item_type.equals(ItemType.ARMOR))
-                    && (item.template.item_skill_used.equals(type));
+            return (item.template.getItemType().equals(ItemType.ARMOR))
+                    && (item.template.getItemSkillUsed().equals(type));
         }
 
         return false;
@@ -3768,8 +3769,8 @@ public class PlayerCharacter extends AbstractCharacter {
             ConcurrentHashMap<EquipSlotType, Item> equipped = this.charItemManager.getEquipped();
             Item off = equipped.get(EquipSlotType.LHELD);
             Item main = equipped.get(EquipSlotType.RHELD);
-            ItemTemplate wbMain = null;
-            ItemTemplate wbOff = null;
+            CObjectTemplate wbMain = null;
+            CObjectTemplate wbOff = null;
             if (main != null)
                 wbMain = main.template;
             if (off != null)
@@ -3791,8 +3792,8 @@ public class PlayerCharacter extends AbstractCharacter {
             this.bonuses.setBool(ModType.Parry, SourceType.None, false);
             if ((this.baseClass != null && this.baseClass.getObjectUUID() == 2500)
                     || (this.promotionClass != null && this.promotionClass.getObjectUUID() == 2520))
-                if (wbMain == null || wbMain.item_weapon_max_range < MBServerStatics.RANGED_WEAPON_RANGE)
-                    if (wbOff == null || wbOff.item_weapon_max_range < MBServerStatics.RANGED_WEAPON_RANGE)
+                if (wbMain == null || engine.parsers.objects.ItemTemplate.getWeapon(wbMain.getTemplateId()).weapon_max_range < MBServerStatics.RANGED_WEAPON_RANGE)
+                    if (wbOff == null || engine.parsers.objects.ItemTemplate.getWeapon(wbOff.getTemplateId()).weapon_max_range < MBServerStatics.RANGED_WEAPON_RANGE)
                         this.bonuses.setBool(ModType.Parry, SourceType.None, true);
 
         }

src/engine/objects/Resists.java

@@ -19,6 +19,7 @@ import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.EnumMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
@@ -159,13 +160,16 @@ public class Resists {
 
     private static float[] getArmorResists(Item armor, float[] phys) {
 
+        EnumMap<mbEnums.DamageType, Float> armorResists;
+
         if (armor == null)
             return phys;
 
-        if (armor.template.item_type.equals(mbEnums.ItemType.ARMOR)) {
-            phys[0] += armor.template.combat_attack_resist.get("SLASHING");
-            phys[1] += armor.template.combat_attack_resist.get("CRUSHING");
-            phys[2] += armor.template.combat_attack_resist.get("PIERCING");
+        if (armor.template.getItemType().equals(mbEnums.ItemType.ARMOR)) {
+            armorResists = armor.template.getCombatAttackResist();
+            phys[0] += armorResists.getOrDefault(mbEnums.DamageType.SLASHING, 0f);
+            phys[1] += armorResists.getOrDefault(mbEnums.DamageType.CRUSHING, 0f);
+            phys[2] += armorResists.getOrDefault(mbEnums.DamageType.PIERCING, 0f);
         }
 
         return phys;

src/engine/objects/Shrine.java

@@ -256,13 +256,13 @@ public class Shrine extends AbstractWorldObject implements Comparable<Shrine> {
         if (!boonOwner.charItemManager.doesCharOwnThisItem(boonItem.getObjectUUID()))
             return false;
 
-        for (ShrineType boonShrineType : boonItem.template.item_offering_info.keySet()) {
+        for (ShrineType boonShrineType : boonItem.template.getItemOfferingInfo().keySet()) {
 
             if (boonShrineType != shrineType)
                 continue;
 
             //Same Shrine Type, add favors and stop loop.
-            int amount = boonItem.template.item_offering_info.get(boonShrineType) * boonItem.getNumOfItems();
+            int amount = boonItem.template.getItemOfferingInfo().get(boonShrineType) * boonItem.getNumOfItems();
             int oldAmount = this.favors;
 
             if (!DbManager.ShrineQueries.updateFavors(this, this.favors + amount, oldAmount)) {

src/engine/objects/Warehouse.java

@@ -17,6 +17,7 @@ import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
+import engine.parsers.objects.CObjectTemplate;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
 import org.json.JSONArray;
@@ -304,10 +305,10 @@ public class Warehouse {
             return false;
         }
 
-        if (resource.template.item_type.equals(mbEnums.ItemType.GOLD))
+        if (resource.template.getItemType().equals(mbEnums.ItemType.GOLD))
             resourceType = mbEnums.ResourceType.GOLD;
         else
-            resourceType = mbEnums.ResourceType.valueOf(ItemTemplate.templates.get(resource.templateID).item_base_name.toUpperCase());
+            resourceType = mbEnums.ResourceType.valueOf(CObjectTemplate.lookup(resource.templateID).getItemBaseName().toUpperCase());
 
         if (transaction)
             AddTransactionToWarehouse(warehouse, playerCharacter.getObjectType(), playerCharacter.getObjectUUID(), mbEnums.TransactionType.DEPOSIT, resourceType, amount);
@@ -418,7 +419,7 @@ public class Warehouse {
         if (playerCharacter == null)
             return false;
 
-        ItemTemplate template = ItemTemplate.templates.get(resourceType.templateID);
+        CObjectTemplate template = CObjectTemplate.lookup(resourceType.templateID);
 
         if (warehouse.resources.get(resourceType) == null)
             return false;
@@ -432,7 +433,7 @@ public class Warehouse {
             return false;
 
         if (addToInventory)
-            if (!itemMan.hasRoomInventory(template.item_wt)) {
+            if (!itemMan.hasRoomInventory(template.getItemWt())) {
                 ChatManager.chatSystemInfo(playerCharacter, "You can not carry any more of that item.");
                 return false;
             }
@@ -501,7 +502,7 @@ public class Warehouse {
         if (playerCharacter == null)
             return false;
 
-        ItemTemplate template = ItemTemplate.templates.get(resourceType.templateID);
+        CObjectTemplate template = CObjectTemplate.lookup(resourceType.templateID);
 
         if (template == null)
             return false;
@@ -517,7 +518,7 @@ public class Warehouse {
         if (itemMan == null)
             return false;
 
-        if (!itemMan.hasRoomInventory(template.item_wt)) {
+        if (!itemMan.hasRoomInventory(template.getItemWt())) {
             ChatManager.chatSystemInfo(playerCharacter, "You can not carry any more of that item.");
             return false;
         }

src/engine/parsers/cache/DeedParser.java

@@ -97,8 +97,14 @@ public class DeedParser {
         deed.item_type = CacheParserUtil.readEnum(mbEnums.ItemType.class, deedJson.getString("item_type"), templateId, "item_type");
         deed.item_eq_slots_value = deedJson.getInt("item_eq_slots_value");
         deed.item_eq_slots_type = deedJson.getBoolean("item_eq_slots_type");
+
+        // The exporter writes ["NONE"] for an empty slot mask
+
         deed.item_eq_slots_or.addAll(CacheParserUtil.readEnumSet(mbEnums.EquipSlotType.class, deedJson.getJSONArray("item_eq_slots_or"), templateId, "item_eq_slots_or"));
+        deed.item_eq_slots_or.remove(mbEnums.EquipSlotType.NONE);
         deed.item_eq_slots_and.addAll(CacheParserUtil.readEnumSet(mbEnums.EquipSlotType.class, deedJson.getJSONArray("item_eq_slots_and"), templateId, "item_eq_slots_and"));
+        deed.item_eq_slots_and.remove(mbEnums.EquipSlotType.NONE);
+
         deed.item_takeable = deedJson.getBoolean("item_takeable");
         deed.item_value = deedJson.getInt("item_value");
         deed.item_wt = deedJson.getInt("item_wt");

src/engine/parsers/cache/RuneParser.java

@@ -112,8 +112,14 @@ public class RuneParser {
         rune.item_type = CacheParserUtil.readEnum(mbEnums.ItemType.class, runeJson.getString("item_type"), templateId, "item_type");
         rune.item_eq_slots_value = runeJson.getInt("item_eq_slots_value");
         rune.item_eq_slots_type = runeJson.getBoolean("item_eq_slots_type");
+
+        // The exporter writes ["NONE"] for an empty slot mask
+
         rune.item_eq_slots_or.addAll(CacheParserUtil.readEnumSet(mbEnums.EquipSlotType.class, runeJson.getJSONArray("item_eq_slots_or"), templateId, "item_eq_slots_or"));
+        rune.item_eq_slots_or.remove(mbEnums.EquipSlotType.NONE);
         rune.item_eq_slots_and.addAll(CacheParserUtil.readEnumSet(mbEnums.EquipSlotType.class, runeJson.getJSONArray("item_eq_slots_and"), templateId, "item_eq_slots_and"));
+        rune.item_eq_slots_and.remove(mbEnums.EquipSlotType.NONE);
+
         rune.item_takeable = runeJson.getBoolean("item_takeable");
         rune.item_value = runeJson.getInt("item_value");
         rune.item_wt = runeJson.getInt("item_wt");

src/engine/parsers/objects/CObjectTemplate.java

@@ -8,8 +8,92 @@
 
 package engine.parsers.objects;
 
+import engine.math.Vector3fImmutable;
+import engine.mbEnums;
+import engine.parsers.cache.CObjectIndex;
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+
 // Common type for ITEM, DEED and RUNE cache templates, which share one id space.
-// Shared obj_/combat_/item_ getters arrive with JSON-Refactor-Plan Task 1.1.
+// Getters cover only the obj_/combat_/item_ fields all three define (JSON-Refactor-Plan D1).
+// Returned collections are the template's own; never modify them.
 
 public interface CObjectTemplate {
+
+    static CObjectTemplate lookup(int templateId) {
+        return CObjectIndex.lookup(templateId);
+    }
+
+    int getTemplateId();
+    String getObjName();
+    boolean getObjPickable();
+    float getObjGravity();
+    float getObjCullDistance();
+    Vector3fImmutable getObjScale();
+    int getObjRenderObject();
+    boolean getObjDoubleFusion();
+    Vector3fImmutable getObjForwardVector();
+    String getObjTrackingName();
+    float getObjMaxTrackingDistance();
+    int getObjIcon();
+    float getObjGravityF();
+    LinkedHashMap<String, Integer> getObjSoundEvents();
+    JSONArray getObjArcHardpointList();
+    HashMap<String, String> getObjSparseData();
+    int getObjRenderObjectLowDetail();
+    Vector3fImmutable getObjDefaultAlignment();
+    String getObjSoundTable();
+
+    float getCombatHealthCurrent();
+    float getCombatHealthFull();
+    EnumMap<mbEnums.DamageType, Float> getCombatAttackResist();
+    JSONArray getCombatPowers();
+
+    mbEnums.ItemType getItemType();
+    int getItemEqSlotsValue();
+    boolean getItemEqSlotsType();
+    EnumSet<mbEnums.EquipSlotType> getItemEqSlotsOr();
+    EnumSet<mbEnums.EquipSlotType> getItemEqSlotsAnd();
+    boolean getItemTakeable();
+    int getItemValue();
+    int getItemWt();
+    float getItemPassiveDefenseMod();
+    String getItemBaseName();
+    String getItemDsc();
+    int getItemRenderObjectFemale();
+    float getItemHealthFull();
+    String getItemSkillUsed();
+    String getItemSkillMasteryUsed();
+    int getItemParryAnimId();
+    EnumMap<mbEnums.ShrineType, Integer> getItemOfferingInfo();
+    EnumSet<mbEnums.ItemFlags> getItemFlags();
+    EnumSet<mbEnums.ItemUseFlags> getItemUseFlags();
+    int getItemPostItemId();
+    int getItemInitialCharges();
+    int getItemBookArcana();
+    LinkedHashMap<String, Integer> getItemSkillReq();
+    boolean getItemRaceReqRestrict();
+    EnumSet<mbEnums.MonsterType> getItemRaceReq();
+    boolean getItemClassReqRestrict();
+    EnumSet<mbEnums.ClassType> getItemClassReq();
+    boolean getItemDiscReqRestrict();
+    EnumSet<mbEnums.DisciplineType> getItemDiscReq();
+    EnumMap<mbEnums.AttributeType, Integer> getItemAttrReq();
+    int getItemLevelReq();
+    int getItemRankReq();
+    mbEnums.SexType getItemSexReq();
+    ArrayList<UserPowerAction> getItemUserPowerAction();
+    ArrayList<PowerGrant> getItemPowerGrant();
+    LinkedHashMap<String, ArrayList<int[]>> getItemPowerAction();
+    boolean getItemSheathable();
+    boolean getItemHasStub();
+    EnumMap<mbEnums.ShrineType, Integer> getItemOfferingAdjustments();
+    EnumMap<mbEnums.ResourceType, Integer> getItemResourceCosts();
+    int getItemBaneRank();
+    boolean getItemIgnoreSavedActions();
 }

src/engine/parsers/objects/DeedTemplate.java

@@ -119,4 +119,329 @@ public class DeedTemplate implements CObjectTemplate {
     public float deed_namelookup_val;
     public boolean deed_custom_city;
     public int deed_structure_id;
+
+    @Override
+    public int getTemplateId() {
+        return template_id;
+    }
+
+    @Override
+    public String getObjName() {
+        return obj_name;
+    }
+
+    @Override
+    public boolean getObjPickable() {
+        return obj_pickable;
+    }
+
+    @Override
+    public float getObjGravity() {
+        return obj_gravity;
+    }
+
+    @Override
+    public float getObjCullDistance() {
+        return obj_cull_distance;
+    }
+
+    @Override
+    public Vector3fImmutable getObjScale() {
+        return obj_scale;
+    }
+
+    @Override
+    public int getObjRenderObject() {
+        return obj_render_object;
+    }
+
+    @Override
+    public boolean getObjDoubleFusion() {
+        return obj_double_fusion;
+    }
+
+    @Override
+    public Vector3fImmutable getObjForwardVector() {
+        return obj_forward_vector;
+    }
+
+    @Override
+    public String getObjTrackingName() {
+        return obj_tracking_name;
+    }
+
+    @Override
+    public float getObjMaxTrackingDistance() {
+        return obj_max_tracking_distance;
+    }
+
+    @Override
+    public int getObjIcon() {
+        return obj_icon;
+    }
+
+    @Override
+    public float getObjGravityF() {
+        return obj_gravity_f;
+    }
+
+    @Override
+    public LinkedHashMap<String, Integer> getObjSoundEvents() {
+        return obj_sound_events;
+    }
+
+    @Override
+    public JSONArray getObjArcHardpointList() {
+        return obj_arc_hardpoint_list;
+    }
+
+    @Override
+    public HashMap<String, String> getObjSparseData() {
+        return obj_sparse_data;
+    }
+
+    @Override
+    public int getObjRenderObjectLowDetail() {
+        return obj_render_object_low_detail;
+    }
+
+    @Override
+    public Vector3fImmutable getObjDefaultAlignment() {
+        return obj_default_alignment;
+    }
+
+    @Override
+    public String getObjSoundTable() {
+        return obj_sound_table;
+    }
+
+    @Override
+    public float getCombatHealthCurrent() {
+        return combat_health_current;
+    }
+
+    @Override
+    public float getCombatHealthFull() {
+        return combat_health_full;
+    }
+
+    @Override
+    public EnumMap<mbEnums.DamageType, Float> getCombatAttackResist() {
+        return combat_attack_resist;
+    }
+
+    @Override
+    public JSONArray getCombatPowers() {
+        return combat_powers;
+    }
+
+    @Override
+    public mbEnums.ItemType getItemType() {
+        return item_type;
+    }
+
+    @Override
+    public int getItemEqSlotsValue() {
+        return item_eq_slots_value;
+    }
+
+    @Override
+    public boolean getItemEqSlotsType() {
+        return item_eq_slots_type;
+    }
+
+    @Override
+    public EnumSet<mbEnums.EquipSlotType> getItemEqSlotsOr() {
+        return item_eq_slots_or;
+    }
+
+    @Override
+    public EnumSet<mbEnums.EquipSlotType> getItemEqSlotsAnd() {
+        return item_eq_slots_and;
+    }
+
+    @Override
+    public boolean getItemTakeable() {
+        return item_takeable;
+    }
+
+    @Override
+    public int getItemValue() {
+        return item_value;
+    }
+
+    @Override
+    public int getItemWt() {
+        return item_wt;
+    }
+
+    @Override
+    public float getItemPassiveDefenseMod() {
+        return item_passive_defense_mod;
+    }
+
+    @Override
+    public String getItemBaseName() {
+        return item_base_name;
+    }
+
+    @Override
+    public String getItemDsc() {
+        return item_dsc;
+    }
+
+    @Override
+    public int getItemRenderObjectFemale() {
+        return item_render_object_female;
+    }
+
+    @Override
+    public float getItemHealthFull() {
+        return item_health_full;
+    }
+
+    @Override
+    public String getItemSkillUsed() {
+        return item_skill_used;
+    }
+
+    @Override
+    public String getItemSkillMasteryUsed() {
+        return item_skill_mastery_used;
+    }
+
+    @Override
+    public int getItemParryAnimId() {
+        return item_parry_anim_id;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ShrineType, Integer> getItemOfferingInfo() {
+        return item_offering_info;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ItemFlags> getItemFlags() {
+        return item_flags;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ItemUseFlags> getItemUseFlags() {
+        return item_use_flags;
+    }
+
+    @Override
+    public int getItemPostItemId() {
+        return item_post_item_id;
+    }
+
+    @Override
+    public int getItemInitialCharges() {
+        return item_initial_charges;
+    }
+
+    @Override
+    public int getItemBookArcana() {
+        return item_book_arcana;
+    }
+
+    @Override
+    public LinkedHashMap<String, Integer> getItemSkillReq() {
+        return item_skill_req;
+    }
+
+    @Override
+    public boolean getItemRaceReqRestrict() {
+        return item_race_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.MonsterType> getItemRaceReq() {
+        return item_race_req;
+    }
+
+    @Override
+    public boolean getItemClassReqRestrict() {
+        return item_class_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ClassType> getItemClassReq() {
+        return item_class_req;
+    }
+
+    @Override
+    public boolean getItemDiscReqRestrict() {
+        return item_disc_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.DisciplineType> getItemDiscReq() {
+        return item_disc_req;
+    }
+
+    @Override
+    public EnumMap<mbEnums.AttributeType, Integer> getItemAttrReq() {
+        return item_attr_req;
+    }
+
+    @Override
+    public int getItemLevelReq() {
+        return item_level_req;
+    }
+
+    @Override
+    public int getItemRankReq() {
+        return item_rank_req;
+    }
+
+    @Override
+    public mbEnums.SexType getItemSexReq() {
+        return item_sex_req;
+    }
+
+    @Override
+    public ArrayList<UserPowerAction> getItemUserPowerAction() {
+        return item_user_power_action;
+    }
+
+    @Override
+    public ArrayList<PowerGrant> getItemPowerGrant() {
+        return item_power_grant;
+    }
+
+    @Override
+    public LinkedHashMap<String, ArrayList<int[]>> getItemPowerAction() {
+        return item_power_action;
+    }
+
+    @Override
+    public boolean getItemSheathable() {
+        return item_sheathable;
+    }
+
+    @Override
+    public boolean getItemHasStub() {
+        return item_has_stub;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ShrineType, Integer> getItemOfferingAdjustments() {
+        return item_offering_adjustments;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ResourceType, Integer> getItemResourceCosts() {
+        return item_resource_costs;
+    }
+
+    @Override
+    public int getItemBaneRank() {
+        return item_bane_rank;
+    }
+
+    @Override
+    public boolean getItemIgnoreSavedActions() {
+        return item_ignore_saved_actions;
+    }
 }

src/engine/parsers/objects/ItemTemplate.java

@@ -33,6 +33,9 @@ public class ItemTemplate implements CObjectTemplate {
 
     public static HashMap<Integer, ItemTemplate> _items = new HashMap<>();
 
+    // Legacy templates zero-filled the weapon block on non-weapons; held shields and the like rely on it.
+    private static final Weapon NO_WEAPON = new Weapon();
+
     public int template_id;
 
     // obj_
@@ -138,6 +141,341 @@ public class ItemTemplate implements CObjectTemplate {
     public int item_bane_rank;
     public boolean item_ignore_saved_actions;
 
+    @Override
+    public int getTemplateId() {
+        return template_id;
+    }
+
+    @Override
+    public String getObjName() {
+        return obj_name;
+    }
+
+    @Override
+    public boolean getObjPickable() {
+        return obj_pickable;
+    }
+
+    @Override
+    public float getObjGravity() {
+        return obj_gravity;
+    }
+
+    @Override
+    public float getObjCullDistance() {
+        return obj_cull_distance;
+    }
+
+    @Override
+    public Vector3fImmutable getObjScale() {
+        return obj_scale;
+    }
+
+    @Override
+    public int getObjRenderObject() {
+        return obj_render_object;
+    }
+
+    @Override
+    public boolean getObjDoubleFusion() {
+        return obj_double_fusion;
+    }
+
+    @Override
+    public Vector3fImmutable getObjForwardVector() {
+        return obj_forward_vector;
+    }
+
+    @Override
+    public String getObjTrackingName() {
+        return obj_tracking_name;
+    }
+
+    @Override
+    public float getObjMaxTrackingDistance() {
+        return obj_max_tracking_distance;
+    }
+
+    @Override
+    public int getObjIcon() {
+        return obj_icon;
+    }
+
+    @Override
+    public float getObjGravityF() {
+        return obj_gravity_f;
+    }
+
+    @Override
+    public LinkedHashMap<String, Integer> getObjSoundEvents() {
+        return obj_sound_events;
+    }
+
+    @Override
+    public JSONArray getObjArcHardpointList() {
+        return obj_arc_hardpoint_list;
+    }
+
+    @Override
+    public HashMap<String, String> getObjSparseData() {
+        return obj_sparse_data;
+    }
+
+    @Override
+    public int getObjRenderObjectLowDetail() {
+        return obj_render_object_low_detail;
+    }
+
+    @Override
+    public Vector3fImmutable getObjDefaultAlignment() {
+        return obj_default_alignment;
+    }
+
+    @Override
+    public String getObjSoundTable() {
+        return obj_sound_table;
+    }
+
+    @Override
+    public float getCombatHealthCurrent() {
+        return combat_health_current;
+    }
+
+    @Override
+    public float getCombatHealthFull() {
+        return combat_health_full;
+    }
+
+    @Override
+    public EnumMap<mbEnums.DamageType, Float> getCombatAttackResist() {
+        return combat_attack_resist;
+    }
+
+    @Override
+    public JSONArray getCombatPowers() {
+        return combat_powers;
+    }
+
+    @Override
+    public mbEnums.ItemType getItemType() {
+        return item_type;
+    }
+
+    @Override
+    public int getItemEqSlotsValue() {
+        return item_eq_slots_value;
+    }
+
+    @Override
+    public boolean getItemEqSlotsType() {
+        return item_eq_slots_type;
+    }
+
+    @Override
+    public EnumSet<mbEnums.EquipSlotType> getItemEqSlotsOr() {
+        return item_eq_slots_or;
+    }
+
+    @Override
+    public EnumSet<mbEnums.EquipSlotType> getItemEqSlotsAnd() {
+        return item_eq_slots_and;
+    }
+
+    @Override
+    public boolean getItemTakeable() {
+        return item_takeable;
+    }
+
+    @Override
+    public int getItemValue() {
+        return item_value;
+    }
+
+    @Override
+    public int getItemWt() {
+        return item_wt;
+    }
+
+    @Override
+    public float getItemPassiveDefenseMod() {
+        return item_passive_defense_mod;
+    }
+
+    @Override
+    public String getItemBaseName() {
+        return item_base_name;
+    }
+
+    @Override
+    public String getItemDsc() {
+        return item_dsc;
+    }
+
+    @Override
+    public int getItemRenderObjectFemale() {
+        return item_render_object_female;
+    }
+
+    @Override
+    public float getItemHealthFull() {
+        return item_health_full;
+    }
+
+    @Override
+    public String getItemSkillUsed() {
+        return item_skill_used;
+    }
+
+    @Override
+    public String getItemSkillMasteryUsed() {
+        return item_skill_mastery_used;
+    }
+
+    @Override
+    public int getItemParryAnimId() {
+        return item_parry_anim_id;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ShrineType, Integer> getItemOfferingInfo() {
+        return item_offering_info;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ItemFlags> getItemFlags() {
+        return item_flags;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ItemUseFlags> getItemUseFlags() {
+        return item_use_flags;
+    }
+
+    @Override
+    public int getItemPostItemId() {
+        return item_post_item_id;
+    }
+
+    @Override
+    public int getItemInitialCharges() {
+        return item_initial_charges;
+    }
+
+    @Override
+    public int getItemBookArcana() {
+        return item_book_arcana;
+    }
+
+    @Override
+    public LinkedHashMap<String, Integer> getItemSkillReq() {
+        return item_skill_req;
+    }
+
+    @Override
+    public boolean getItemRaceReqRestrict() {
+        return item_race_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.MonsterType> getItemRaceReq() {
+        return item_race_req;
+    }
+
+    @Override
+    public boolean getItemClassReqRestrict() {
+        return item_class_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ClassType> getItemClassReq() {
+        return item_class_req;
+    }
+
+    @Override
+    public boolean getItemDiscReqRestrict() {
+        return item_disc_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.DisciplineType> getItemDiscReq() {
+        return item_disc_req;
+    }
+
+    @Override
+    public EnumMap<mbEnums.AttributeType, Integer> getItemAttrReq() {
+        return item_attr_req;
+    }
+
+    @Override
+    public int getItemLevelReq() {
+        return item_level_req;
+    }
+
+    @Override
+    public int getItemRankReq() {
+        return item_rank_req;
+    }
+
+    @Override
+    public mbEnums.SexType getItemSexReq() {
+        return item_sex_req;
+    }
+
+    @Override
+    public ArrayList<UserPowerAction> getItemUserPowerAction() {
+        return item_user_power_action;
+    }
+
+    @Override
+    public ArrayList<PowerGrant> getItemPowerGrant() {
+        return item_power_grant;
+    }
+
+    @Override
+    public LinkedHashMap<String, ArrayList<int[]>> getItemPowerAction() {
+        return item_power_action;
+    }
+
+    @Override
+    public boolean getItemSheathable() {
+        return item_sheathable;
+    }
+
+    @Override
+    public boolean getItemHasStub() {
+        return item_has_stub;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ShrineType, Integer> getItemOfferingAdjustments() {
+        return item_offering_adjustments;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ResourceType, Integer> getItemResourceCosts() {
+        return item_resource_costs;
+    }
+
+    @Override
+    public int getItemBaneRank() {
+        return item_bane_rank;
+    }
+
+    @Override
+    public boolean getItemIgnoreSavedActions() {
+        return item_ignore_saved_actions;
+    }
+
+    public static Weapon getWeapon(int templateID) {
+
+        ItemTemplate template = _items.get(templateID);
+
+        if (template == null || template.item_weapon == null)
+            return NO_WEAPON;
+
+        return template.item_weapon;
+    }
+
     // item_weapon (ArcAttackInfo_LoadWeapon, sb.exe 0x61FA60).
 
     public static class Weapon {

src/engine/parsers/objects/RuneTemplate.java

@@ -191,6 +191,331 @@ public class RuneTemplate implements CObjectTemplate {
     public int rune_natural_power_attack;
     public final HashMap<String, String> rune_sparse_data = new HashMap<>();
 
+    @Override
+    public int getTemplateId() {
+        return template_id;
+    }
+
+    @Override
+    public String getObjName() {
+        return obj_name;
+    }
+
+    @Override
+    public boolean getObjPickable() {
+        return obj_pickable;
+    }
+
+    @Override
+    public float getObjGravity() {
+        return obj_gravity;
+    }
+
+    @Override
+    public float getObjCullDistance() {
+        return obj_cull_distance;
+    }
+
+    @Override
+    public Vector3fImmutable getObjScale() {
+        return obj_scale;
+    }
+
+    @Override
+    public int getObjRenderObject() {
+        return obj_render_object;
+    }
+
+    @Override
+    public boolean getObjDoubleFusion() {
+        return obj_double_fusion;
+    }
+
+    @Override
+    public Vector3fImmutable getObjForwardVector() {
+        return obj_forward_vector;
+    }
+
+    @Override
+    public String getObjTrackingName() {
+        return obj_tracking_name;
+    }
+
+    @Override
+    public float getObjMaxTrackingDistance() {
+        return obj_max_tracking_distance;
+    }
+
+    @Override
+    public int getObjIcon() {
+        return obj_icon;
+    }
+
+    @Override
+    public float getObjGravityF() {
+        return obj_gravity_f;
+    }
+
+    @Override
+    public LinkedHashMap<String, Integer> getObjSoundEvents() {
+        return obj_sound_events;
+    }
+
+    @Override
+    public JSONArray getObjArcHardpointList() {
+        return obj_arc_hardpoint_list;
+    }
+
+    @Override
+    public HashMap<String, String> getObjSparseData() {
+        return obj_sparse_data;
+    }
+
+    @Override
+    public int getObjRenderObjectLowDetail() {
+        return obj_render_object_low_detail;
+    }
+
+    @Override
+    public Vector3fImmutable getObjDefaultAlignment() {
+        return obj_default_alignment;
+    }
+
+    @Override
+    public String getObjSoundTable() {
+        return obj_sound_table;
+    }
+
+    @Override
+    public float getCombatHealthCurrent() {
+        return combat_health_current;
+    }
+
+    @Override
+    public float getCombatHealthFull() {
+        return combat_health_full;
+    }
+
+    @Override
+    public EnumMap<mbEnums.DamageType, Float> getCombatAttackResist() {
+        return combat_attack_resist;
+    }
+
+    @Override
+    public JSONArray getCombatPowers() {
+        return combat_powers;
+    }
+
+    @Override
+    public mbEnums.ItemType getItemType() {
+        return item_type;
+    }
+
+    @Override
+    public int getItemEqSlotsValue() {
+        return item_eq_slots_value;
+    }
+
+    @Override
+    public boolean getItemEqSlotsType() {
+        return item_eq_slots_type;
+    }
+
+    @Override
+    public EnumSet<mbEnums.EquipSlotType> getItemEqSlotsOr() {
+        return item_eq_slots_or;
+    }
+
+    @Override
+    public EnumSet<mbEnums.EquipSlotType> getItemEqSlotsAnd() {
+        return item_eq_slots_and;
+    }
+
+    @Override
+    public boolean getItemTakeable() {
+        return item_takeable;
+    }
+
+    @Override
+    public int getItemValue() {
+        return item_value;
+    }
+
+    @Override
+    public int getItemWt() {
+        return item_wt;
+    }
+
+    @Override
+    public float getItemPassiveDefenseMod() {
+        return item_passive_defense_mod;
+    }
+
+    @Override
+    public String getItemBaseName() {
+        return item_base_name;
+    }
+
+    @Override
+    public String getItemDsc() {
+        return item_dsc;
+    }
+
+    @Override
+    public int getItemRenderObjectFemale() {
+        return item_render_object_female;
+    }
+
+    @Override
+    public float getItemHealthFull() {
+        return item_health_full;
+    }
+
+    @Override
+    public String getItemSkillUsed() {
+        return item_skill_used;
+    }
+
+    @Override
+    public String getItemSkillMasteryUsed() {
+        return item_skill_mastery_used;
+    }
+
+    @Override
+    public int getItemParryAnimId() {
+        return item_parry_anim_id;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ShrineType, Integer> getItemOfferingInfo() {
+        return item_offering_info;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ItemFlags> getItemFlags() {
+        return item_flags;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ItemUseFlags> getItemUseFlags() {
+        return item_use_flags;
+    }
+
+    @Override
+    public int getItemPostItemId() {
+        return item_post_item_id;
+    }
+
+    @Override
+    public int getItemInitialCharges() {
+        return item_initial_charges;
+    }
+
+    @Override
+    public int getItemBookArcana() {
+        return item_book_arcana;
+    }
+
+    @Override
+    public LinkedHashMap<String, Integer> getItemSkillReq() {
+        return item_skill_req;
+    }
+
+    @Override
+    public boolean getItemRaceReqRestrict() {
+        return item_race_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.MonsterType> getItemRaceReq() {
+        return item_race_req;
+    }
+
+    @Override
+    public boolean getItemClassReqRestrict() {
+        return item_class_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.ClassType> getItemClassReq() {
+        return item_class_req;
+    }
+
+    @Override
+    public boolean getItemDiscReqRestrict() {
+        return item_disc_req_restrict;
+    }
+
+    @Override
+    public EnumSet<mbEnums.DisciplineType> getItemDiscReq() {
+        return item_disc_req;
+    }
+
+    @Override
+    public EnumMap<mbEnums.AttributeType, Integer> getItemAttrReq() {
+        return item_attr_req;
+    }
+
+    @Override
+    public int getItemLevelReq() {
+        return item_level_req;
+    }
+
+    @Override
+    public int getItemRankReq() {
+        return item_rank_req;
+    }
+
+    @Override
+    public mbEnums.SexType getItemSexReq() {
+        return item_sex_req;
+    }
+
+    @Override
+    public ArrayList<UserPowerAction> getItemUserPowerAction() {
+        return item_user_power_action;
+    }
+
+    @Override
+    public ArrayList<PowerGrant> getItemPowerGrant() {
+        return item_power_grant;
+    }
+
+    @Override
+    public LinkedHashMap<String, ArrayList<int[]>> getItemPowerAction() {
+        return item_power_action;
+    }
+
+    @Override
+    public boolean getItemSheathable() {
+        return item_sheathable;
+    }
+
+    @Override
+    public boolean getItemHasStub() {
+        return item_has_stub;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ShrineType, Integer> getItemOfferingAdjustments() {
+        return item_offering_adjustments;
+    }
+
+    @Override
+    public EnumMap<mbEnums.ResourceType, Integer> getItemResourceCosts() {
+        return item_resource_costs;
+    }
+
+    @Override
+    public int getItemBaneRank() {
+        return item_bane_rank;
+    }
+
+    @Override
+    public boolean getItemIgnoreSavedActions() {
+        return item_ignore_saved_actions;
+    }
+
     // One entry of rune_skill_grant; same layout as PowerGrant.
     // skill_monster_types is empty in every RUNE file, so it is kept as raw JSON.
 

src/engine/powers/poweractions/StealPowerAction.java

@@ -63,7 +63,7 @@ public class StealPowerAction extends AbstractPowerAction {
 
     //called to get amount of gold to steal between 0 and max gold
     protected static int getAmountToSteal(Item item) {
-        if (item.template.item_type.equals(ItemType.GOLD)) {
+        if (item.template.getItemType().equals(ItemType.GOLD)) {
 
             int amount = item.getNumOfItems();
 
@@ -159,7 +159,7 @@ public class StealPowerAction extends AbstractPowerAction {
         if (myCIM == null || ownerCIM == null)
             return;
 
-        if (tar.template.item_type.equals(ItemType.GOLD)) {
+        if (tar.template.getItemType().equals(ItemType.GOLD)) {
             //stealing gold
             if (!myCIM.transferGoldToMyInventory((AbstractCharacter) owner, amount))
                 return;

src/engine/server/login/LoginServer.java

@@ -318,6 +318,9 @@ public class LoginServer {
         Logger.info("Indexing Cache Templates");
         CObjectIndex.build();
 
+        Logger.info("Linking Item Templates to Cache Templates");
+        ItemTemplate.linkCacheTemplates();
+
         Logger.info("Initializing Network");
         Network.init();
 

src/engine/server/world/WorldServer.java

@@ -307,8 +307,8 @@ public class WorldServer {
         Logger.info("Loading Item Templates");
         DbManager.ItemQueries.LOAD_ITEM_TEMPLATES();
 
-        Logger.info("Back fill template modTables");
-        DbManager.ItemQueries.LOAD_TEMPLATE_MODTABLES();
+        Logger.info("Loading vendor modTables");
+        ForgeManager.vendorModTables = DbManager.ItemQueries.LOAD_TEMPLATE_MODTABLES();
 
         Logger.info("Loading Deed Templates");
         DeedTemplate._deeds = DeedParser.parseDeedFolder();
@@ -338,6 +338,9 @@ public class WorldServer {
         Logger.info("Indexing Cache Templates");
         CObjectIndex.build();
 
+        Logger.info("Linking Item Templates to Cache Templates");
+        ItemTemplate.linkCacheTemplates();
+
         Logger.info("Loading PromotionClasses");
         DbManager.PromotionQueries.GET_ALL_PROMOTIONS();