Addition of item logger by item id configuration.

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2022-12-04 06:56:33 +00:00
parent e6456fdef4
commit eaa84b6a67
116 changed files with 754 additions and 290 deletions

View File

@ -442,6 +442,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@ -2044,6 +2046,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@ -2347,7 +2356,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@ -2359,7 +2368,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@ -2374,7 +2383,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@ -2386,7 +2395,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@ -3565,7 +3574,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);

View File

@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{

View File

@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{