lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper naming for Item ItemTemplate getter.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-02-03 23:09:47 +00:00
parent c81f7ee38c
commit 90e0adc645
2245 changed files with 8241 additions and 8241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java vendored
View File

@@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler
player.sendInventoryUpdate(iu);
// informations
BuilderUtil.sendSysMessage(activeChar, "Changed elemental power of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + old + " to " + current + ".");
BuilderUtil.sendSysMessage(activeChar, "Changed elemental power of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + old + " to " + current + ".");
if (player != activeChar)
{
player.sendMessage(activeChar.getName() + " has changed the elemental power of your " + itemInstance.getItem().getName() + " from " + old + " to " + current + ".");
player.sendMessage(activeChar.getName() + " has changed the elemental power of your " + itemInstance.getTemplate().getName() + " from " + old + " to " + current + ".");
}
}
}

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -203,8 +203,8 @@ public class AdminEnchant implements IAdminCommandHandler
player.broadcastUserInfo();
// informations
BuilderUtil.sendSysMessage(activeChar, "Changed enchantment of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
BuilderUtil.sendSysMessage(activeChar, "Changed enchantment of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
}
}

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java vendored
View File

@@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect
final int enchantLevel = wpn.getEnchantLevel();
final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute();
final List<Item> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
final List<Item> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart());
final InventoryUpdate iu = new InventoryUpdate();
for (Item unequippedItem : unequipped)
{
@@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect
byte count = 0;
for (Item unequippedItem : unequipped)
{
if (!(unequippedItem.getItem() instanceof Weapon))
if (!(unequippedItem.getTemplate() instanceof Weapon))
{
count++;
continue;

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -99,7 +99,7 @@ public class Heal extends AbstractEffect
final Item weaponInst = effector.getActiveWeaponInstance();
if (weaponInst != null)
{
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
}
// shot dynamic bonus
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect
final Item weaponInst = effector.getActiveWeaponInstance();
if (weaponInst != null)
{
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
}
// shot dynamic bonus
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect
final InventoryUpdate playerIU = new InventoryUpdate();
for (Entry<Item, Long> entry : extractedItems.entrySet())
{
if (entry.getKey().getItem().isStackable())
if (entry.getKey().getTemplate().isStackable())
{
playerIU.addModifiedItem(entry.getKey());
}

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java vendored
View File

@@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler
final int itemId = item.getId();
final long shotCount = item.getCount();
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
short shotConsumption = 0;
if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS))
{

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java vendored
View File

@@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler
final int itemId = item.getId();
final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these!
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS;
short shotConsumption = 0;
if ((pet != null) && !pet.isChargedShot(shotType))

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java vendored
View File

@@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler
final Player player = playable.getActingPlayer();
final Item weaponInst = player.getActiveWeaponInstance();
final Weapon weaponItem = player.getActiveWeaponItem();
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
@@ -68,7 +68,7 @@ public class BlessedSoulShots implements IItemHandler
return false;
}
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
if (!gradeCheck)
{
if (!player.getAutoSoulShot().contains(itemId))

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java vendored
View File

@@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler
final Player player = playable.getActingPlayer();
final Item weaponInst = player.getActiveWeaponInstance();
final Weapon weaponItem = player.getActiveWeaponItem();
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
@@ -71,7 +71,7 @@ public class BlessedSpiritShot implements IItemHandler
}
// Check for correct grade
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
if (!gradeCheck)
{
if (!player.getAutoSoulShot().contains(itemId))

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java vendored
View File

@@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler
final List<ItemInfo> itemList = new ArrayList<>();
for (Item i : player.getInventory().getItems())
{
if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId())))
if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId())))
{
itemList.add(new ItemInfo(i));
}

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java vendored
View File

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
final Player player = playable.getActingPlayer();
int level = player.getLevel();
final int itemLevel = item.getItem().getCrystalType().getLevel();
final int itemLevel = item.getTemplate().getCrystalType().getLevel();
if (level < 20)
{
level = 0;

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -51,7 +51,7 @@ public class ExtractableItems implements IItemHandler
}
final Player player = playable.getActingPlayer();
final EtcItem etcitem = (EtcItem) item.getItem();
final EtcItem etcitem = (EtcItem) item.getTemplate();
final List<ExtractableProduct> exitems = etcitem.getExtractableItems();
if (exitems == null)
{
@@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler
boolean alreadyExtracted = false;
for (Item i : extractedItems.keySet())
{
if (i.getItem().getId() == expi.getId())
if (i.getTemplate().getId() == expi.getId())
{
alreadyExtracted = true;
break;

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java vendored
View File

@@ -61,7 +61,7 @@ public class FishShots implements IItemHandler
}
final long count = item.getCount();
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
if (!gradeCheck)
{
player.sendPacket(SystemMessageId.THAT_IS_THE_WRONG_GRADE_OF_SOULSHOT_FOR_THAT_FISHING_POLE);
@@ -78,7 +78,7 @@ public class FishShots implements IItemHandler
final WorldObject oldTarget = player.getTarget();
player.setTarget(player);
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java vendored
View File

@@ -48,7 +48,7 @@ public class Harvester implements IItemHandler
return false;
}
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");

8
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler
return false;
}
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.info("Item " + item + " does not have registered any skill for handler.");
@@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler
playable.doCast(itemSkill);
successfulUse = true;
}
else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect())
else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
{
SkillCaster.triggerCast(playable, null, itemSkill, item, false);
successfulUse = true;
@@ -163,12 +163,12 @@ public class ItemSkillsTemplate implements IItemHandler
*/
private boolean checkConsume(Item item, boolean hasConsumeSkill)
{
switch (item.getItem().getDefaultAction())
switch (item.getTemplate().getDefaultAction())
{
case CAPSULE:
case SKILL_REDUCE:
{
if (!hasConsumeSkill && item.getItem().hasImmediateEffect())
if (!hasConsumeSkill && item.getTemplate().hasImmediateEffect())
{
return true;
}

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java vendored
View File

@@ -46,7 +46,7 @@ public class PetFood implements IItemHandler
return false;
}
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills != null)
{
skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item));

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java vendored
View File

@@ -91,7 +91,7 @@ public class Seed implements IItemHandler
final Player player = playable.getActingPlayer();
target.setSeeded(seed, player);
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills != null)
{
skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false));

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java vendored
View File

@@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler
final Player player = playable.getActingPlayer();
final Item weaponInst = player.getActiveWeaponInstance();
final Weapon weaponItem = player.getActiveWeaponItem();
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
@@ -65,7 +65,7 @@ public class SoulShots implements IItemHandler
return false;
}
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
if (!gradeCheck)
{
if (!player.getAutoSoulShot().contains(itemId))

4
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java vendored
View File

@@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler
final Player player = playable.getActingPlayer();
final Item weaponInst = player.getActiveWeaponInstance();
final Weapon weaponItem = player.getActiveWeaponItem();
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
final List<ItemSkillHolder> skills = item.getTemplate().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
@@ -71,7 +71,7 @@ public class SpiritShot implements IItemHandler
}
// Check for correct grade
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
if (!gradeCheck)
{
if (!player.getAutoSoulShot().contains(itemId))

6
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java vendored
View File

@@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition
{
return false;
}
final int chestMask = chest.getItem().getItemMask();
final int chestMask = chest.getTemplate().getItemMask();
// If chest armor is different from the condition one return false
if ((_armorTypesMask & chestMask) == 0)
@@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition
// So from here, chest armor matches conditions
final int chestBodyPart = chest.getItem().getBodyPart();
final int chestBodyPart = chest.getTemplate().getBodyPart();
// return True if chest armor is a Full Armor
if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR)
{
@@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition
{
return false;
}
final int legMask = legs.getItem().getItemMask();
final int legMask = legs.getTemplate().getItemMask();
// return true if legs armor matches too
return (_armorTypesMask & legMask) != 0;
}

6
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java vendored
View File

@@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition
}
// Get the chest item type.
final ItemType chestType = chest.getItem().getItemType();
final ItemType chestType = chest.getTemplate().getItemType();
// Get the chest body part.
final long chestBodyPart = chest.getItem().getBodyPart();
final long chestBodyPart = chest.getTemplate().getBodyPart();
// Get the legs armor.
final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
@@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition
ItemType legsType = null;
if (legs != null)
{
legsType = legs.getItem().getItemType();
legsType = legs.getTemplate().getItemType();
}
for (ArmorType armorType : _armorTypes)

6
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java vendored
View File

@@ -186,11 +186,11 @@ public class Enchant implements ITelnetCommand
player.broadcastUserInfo();
// informations
player.sendMessage("Changed enchantment of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
player.sendMessage("Changed enchantment of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
// log
GMAudit.auditGMAction("TelnetAdmin", "enchant", player.getName(), itemInstance.getItem().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
GMAudit.auditGMAction("TelnetAdmin", "enchant", player.getName(), itemInstance.getTemplate().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
return true;
}
return false;