From fc864fbccae6046c5c2e0579ec6749c636eb98c3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 27 Jan 2020 01:20:46 +0000 Subject: [PATCH] Renamed SeedData to ManorSeedData. --- .../game/data/{Seeds.xml => ManorSeeds.xml} | 2 +- .../data/xsd/{Seeds.xsd => ManorSeeds.xsd} | 0 .../org/l2jmobius/gameserver/GameServer.java | 4 ++-- .../xml/{SeedData.java => ManorSeedData.java} | 12 ++++++------ .../gameserver/handler/itemhandlers/Seed.java | 4 ++-- .../gameserver/handler/skillhandlers/Sow.java | 8 ++++---- .../instancemanager/CastleManorManager.java | 8 ++++---- .../gameserver/model/actor/Attackable.java | 6 +++--- .../gameserver/model/entity/siege/Castle.java | 4 ++-- .../clientpackets/RequestBuyProcure.java | 6 +++--- .../clientpackets/RequestProcureCropList.java | 8 ++++---- .../network/serverpackets/ExShowCropInfo.java | 8 ++++---- .../serverpackets/ExShowCropSetting.java | 16 ++++++++-------- .../serverpackets/ExShowManorDefaultInfo.java | 14 +++++++------- .../network/serverpackets/ExShowSeedInfo.java | 8 ++++---- .../serverpackets/ExShowSeedSetting.java | 18 +++++++++--------- .../serverpackets/ExShowSellCropList.java | 10 +++++----- 17 files changed, 68 insertions(+), 68 deletions(-) rename L2J_Mobius_C6_Interlude/dist/game/data/{Seeds.xml => ManorSeeds.xml} (99%) rename L2J_Mobius_C6_Interlude/dist/game/data/xsd/{Seeds.xsd => ManorSeeds.xsd} (100%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/{SeedData.java => ManorSeedData.java} (91%) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/Seeds.xml b/L2J_Mobius_C6_Interlude/dist/game/data/ManorSeeds.xml similarity index 99% rename from L2J_Mobius_C6_Interlude/dist/game/data/Seeds.xml rename to L2J_Mobius_C6_Interlude/dist/game/data/ManorSeeds.xml index e3857868b3..e7f51e34f1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/Seeds.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/ManorSeeds.xml @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/xsd/Seeds.xsd b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/ManorSeeds.xsd similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/data/xsd/Seeds.xsd rename to L2J_Mobius_C6_Interlude/dist/game/data/xsd/ManorSeeds.xsd diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 762b4dbb5d..1149b0c8a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -70,7 +70,7 @@ import org.l2jmobius.gameserver.datatables.xml.FenceData; import org.l2jmobius.gameserver.datatables.xml.FishData; import org.l2jmobius.gameserver.datatables.xml.HennaData; import org.l2jmobius.gameserver.datatables.xml.RecipeData; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.datatables.xml.StaticObjectData; import org.l2jmobius.gameserver.datatables.xml.SummonItemData; import org.l2jmobius.gameserver.datatables.xml.ZoneData; @@ -339,7 +339,7 @@ public class GameServer } Util.printSection("Manor"); - SeedData.getInstance(); + ManorSeedData.getInstance(); CastleManorManager.getInstance(); Util.printSection("Castles"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/SeedData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ManorSeedData.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/SeedData.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ManorSeedData.java index b0835b5753..f140e9565a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/SeedData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ManorSeedData.java @@ -37,13 +37,13 @@ import org.l2jmobius.gameserver.model.items.Item; * This class loads and stores manor seed information. * @author l3x, Mobius */ -public class SeedData implements IXmlReader +public class ManorSeedData implements IXmlReader { - private static final Logger LOGGER = Logger.getLogger(SeedData.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ManorSeedData.class.getName()); private static Map _seeds = new ConcurrentHashMap<>(); - protected SeedData() + protected ManorSeedData() { load(); } @@ -52,7 +52,7 @@ public class SeedData implements IXmlReader public void load() { _seeds.clear(); - parseDatapackFile("data/Seeds.xml"); + parseDatapackFile("data/ManorSeeds.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _seeds.size() + " seeds."); } @@ -309,13 +309,13 @@ public class SeedData implements IXmlReader return 0; } - public static SeedData getInstance() + public static ManorSeedData getInstance() { return SingletonHolder.INSTANCE; } private static class SingletonHolder { - protected static final SeedData INSTANCE = new SeedData(); + protected static final ManorSeedData INSTANCE = new ManorSeedData(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java index 9b8e712a52..ec396ede16 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.Skill; @@ -363,7 +363,7 @@ public class Seed implements IItemHandler private boolean areaValid(int castleId) { - return SeedData.getInstance().getCastleIdForSeed(_seedId) == castleId; + return ManorSeedData.getInstance().getCastleIdForSeed(_seedId) == castleId; } @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java index 700c2c1788..06862a2ebc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; @@ -140,11 +140,11 @@ public class Sow implements ISkillHandler } // TODO: check all the chances - int basicSuccess = (SeedData.getInstance().isAlternative(_seedId) ? 20 : 90); + int basicSuccess = (ManorSeedData.getInstance().isAlternative(_seedId) ? 20 : 90); int minlevelSeed = 0; int maxlevelSeed = 0; - minlevelSeed = SeedData.getInstance().getSeedMinLevel(_seedId); - maxlevelSeed = SeedData.getInstance().getSeedMaxLevel(_seedId); + minlevelSeed = ManorSeedData.getInstance().getSeedMinLevel(_seedId); + maxlevelSeed = ManorSeedData.getInstance().getSeedMaxLevel(_seedId); final int levelPlayer = _player.getLevel(); // Attacker Level final int levelTarget = _target.getLevel(); // taret Level diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 2432753c56..57bd27e41a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.sql.ClanTable; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.model.ClanWarehouse; import org.l2jmobius.gameserver.model.ItemContainer; import org.l2jmobius.gameserver.model.World; @@ -328,7 +328,7 @@ public class CastleManorManager if (count >= 1) { - cwh.addItem("Manor", SeedData.getInstance().getMatureCrop(crop.getId()), count, null, null); + cwh.addItem("Manor", ManorSeedData.getInstance().getMatureCrop(crop.getId()), count, null, null); } } @@ -435,7 +435,7 @@ public class CastleManorManager private List getNewSeedsList(int castleId) { final List seeds = new ArrayList<>(); - final List seedsIds = SeedData.getInstance().getSeedsForCastle(castleId); + final List seedsIds = ManorSeedData.getInstance().getSeedsForCastle(castleId); for (int sd : seedsIds) { seeds.add(new SeedProduction(sd)); @@ -446,7 +446,7 @@ public class CastleManorManager private List getNewCropsList(int castleId) { final List crops = new ArrayList<>(); - final List cropsIds = SeedData.getInstance().getCropsForCastle(castleId); + final List cropsIds = ManorSeedData.getInstance().getCropsForCastle(castleId); for (int cr : cropsIds) { crops.add(new CropProcure(cr)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 7c11e26472..61e8d54252 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.FortSiegeGuardAI; import org.l2jmobius.gameserver.ai.SiegeGuardAI; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.DropCategory; @@ -3157,7 +3157,7 @@ public class Attackable extends NpcInstance } - final int diff = getLevel() - (SeedData.getInstance().getSeedLevel(_seedType) - 5); + final int diff = getLevel() - (ManorSeedData.getInstance().getSeedLevel(_seedType) - 5); // hi-lvl mobs bonus if (diff > 0) @@ -3167,7 +3167,7 @@ public class Attackable extends NpcInstance final List harvested = new ArrayList<>(); - harvested.add(new RewardItem(SeedData.getInstance().getCropType(_seedType), count * Config.RATE_DROP_MANOR)); + harvested.add(new RewardItem(ManorSeedData.getInstance().getCropType(_seedType), count * Config.RATE_DROP_MANOR)); _harvestItems = harvested.toArray(new RewardItem[harvested.size()]); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java index 12e416f04f..4b6baa30e8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.xml.DoorData; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; @@ -870,7 +870,7 @@ public class Castle { for (SeedProduction seed : production) { - total += SeedData.getInstance().getSeedBuyPrice(seed.getId()) * seed.getStartProduce(); + total += ManorSeedData.getInstance().getSeedBuyPrice(seed.getId()) * seed.getStartProduce(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java index 4de963b3cc..990c918992 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.instance.ManorManagerInstance; @@ -132,7 +132,7 @@ public class RequestBuyProcure extends GameClientPacket return; } - final Item template = ItemTable.getInstance().getTemplate(SeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward())); + final Item template = ItemTable.getInstance().getTemplate(ManorSeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward())); weight += count * template.getWeight(); if (!template.isStackable()) @@ -171,7 +171,7 @@ public class RequestBuyProcure extends GameClientPacket count = 0; } - final int rewardItemId = SeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward()); + final int rewardItemId = ManorSeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward()); int rewardItemCount = 1; // Manor.getInstance().getRewardAmount(itemId, manor.getCastle().getCropReward(itemId)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index ad4ac6ac2f..e605a6afad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; @@ -136,7 +136,7 @@ public class RequestProcureCropList extends GameClientPacket try { final CropProcure crop = CastleManager.getInstance().getCastleById(manorId).getCrop(itemId, CastleManorManager.PERIOD_CURRENT); - final int rewardItemId = SeedData.getInstance().getRewardItem(itemId, crop.getReward()); + final int rewardItemId = ManorSeedData.getInstance().getRewardItem(itemId, crop.getReward()); final Item template = ItemTable.getInstance().getTemplate(rewardItemId); weight += count * template.getWeight(); @@ -203,14 +203,14 @@ public class RequestProcureCropList extends GameClientPacket int fee = 0; // fee for selling to other manors - final int rewardItem = SeedData.getInstance().getRewardItem(cropId, crop.getReward()); + final int rewardItem = ManorSeedData.getInstance().getRewardItem(cropId, crop.getReward()); if (count > crop.getAmount()) { continue; } - final int sellPrice = count * SeedData.getInstance().getCropBasicPrice(cropId); + final int sellPrice = count * ManorSeedData.getInstance().getCropBasicPrice(cropId); final int rewardPrice = ItemTable.getInstance().getTemplate(rewardItem).getReferencePrice(); if (rewardPrice == 0) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index ec65bef396..ad24ed2d7c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; /** @@ -58,11 +58,11 @@ public class ExShowCropInfo extends GameServerPacket writeD(crop.getStartAmount()); // Buy writeD(crop.getPrice()); // Buy price writeC(crop.getReward()); // Reward - writeD(SeedData.getInstance().getSeedLevelByCrop(crop.getId())); // Seed Level + writeD(ManorSeedData.getInstance().getSeedLevelByCrop(crop.getId())); // Seed Level writeC(1); // reward 1 Type - writeD(SeedData.getInstance().getRewardItem(crop.getId(), 1)); // Reward 1 Type Item Id + writeD(ManorSeedData.getInstance().getRewardItem(crop.getId(), 1)); // Reward 1 Type Item Id writeC(1); // reward 2 Type - writeD(SeedData.getInstance().getRewardItem(crop.getId(), 2)); // Reward 2 Type Item Id + writeD(ManorSeedData.getInstance().getRewardItem(crop.getId(), 2)); // Reward 2 Type Item Id } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ddcd6de9fe..d0a7537531 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; @@ -44,20 +44,20 @@ public class ExShowCropSetting extends GameServerPacket { _manorId = manorId; final Castle c = CastleManager.getInstance().getCastleById(_manorId); - final List crops = SeedData.getInstance().getCropsForCastle(_manorId); + final List crops = ManorSeedData.getInstance().getCropsForCastle(_manorId); _count = crops.size(); _cropData = new int[_count * 14]; int i = 0; for (int cr : crops) { _cropData[(i * 14) + 0] = cr; - _cropData[(i * 14) + 1] = SeedData.getInstance().getSeedLevelByCrop(cr); - _cropData[(i * 14) + 2] = SeedData.getInstance().getRewardItem(cr, 1); - _cropData[(i * 14) + 3] = SeedData.getInstance().getRewardItem(cr, 2); - _cropData[(i * 14) + 4] = SeedData.getInstance().getCropPuchaseLimit(cr); + _cropData[(i * 14) + 1] = ManorSeedData.getInstance().getSeedLevelByCrop(cr); + _cropData[(i * 14) + 2] = ManorSeedData.getInstance().getRewardItem(cr, 1); + _cropData[(i * 14) + 3] = ManorSeedData.getInstance().getRewardItem(cr, 2); + _cropData[(i * 14) + 4] = ManorSeedData.getInstance().getCropPuchaseLimit(cr); _cropData[(i * 14) + 5] = 0; // Looks like not used - _cropData[(i * 14) + 6] = (SeedData.getInstance().getCropBasicPrice(cr) * 60) / 100; - _cropData[(i * 14) + 7] = SeedData.getInstance().getCropBasicPrice(cr) * 10; + _cropData[(i * 14) + 6] = (ManorSeedData.getInstance().getCropBasicPrice(cr) * 60) / 100; + _cropData[(i * 14) + 7] = ManorSeedData.getInstance().getCropBasicPrice(cr) * 10; CropProcure cropPr = c.getCrop(cr, CastleManorManager.PERIOD_CURRENT); if (cropPr != null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 3cd72656d1..da1274f0a4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; /** * format(packet 0xFE) ch cd [ddddcdcd] c - id h - sub id c d - size [ d - level d - seed price d - seed level d - crop price c d - reward 1 id c d - reward 2 id ] @@ -30,7 +30,7 @@ public class ExShowManorDefaultInfo extends GameServerPacket public ExShowManorDefaultInfo() { - _crops = SeedData.getInstance().getAllCrops(); + _crops = ManorSeedData.getInstance().getAllCrops(); } @Override @@ -43,13 +43,13 @@ public class ExShowManorDefaultInfo extends GameServerPacket for (int cropId : _crops) { writeD(cropId); // crop Id - writeD(SeedData.getInstance().getSeedLevelByCrop(cropId)); // level - writeD(SeedData.getInstance().getSeedBasicPriceByCrop(cropId)); // seed price - writeD(SeedData.getInstance().getCropBasicPrice(cropId)); // crop price + writeD(ManorSeedData.getInstance().getSeedLevelByCrop(cropId)); // level + writeD(ManorSeedData.getInstance().getSeedBasicPriceByCrop(cropId)); // seed price + writeD(ManorSeedData.getInstance().getCropBasicPrice(cropId)); // crop price writeC(1); // reward 1 Type - writeD(SeedData.getInstance().getRewardItem(cropId, 1)); // Reward 1 Type Item Id + writeD(ManorSeedData.getInstance().getRewardItem(cropId, 1)); // Reward 1 Type Item Id writeC(1); // reward 2 Type - writeD(SeedData.getInstance().getRewardItem(cropId, 2)); // Reward 2 Type Item Id + writeD(ManorSeedData.getInstance().getRewardItem(cropId, 2)); // Reward 2 Type Item Id } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 7a15cf9dc4..b46ff49d8e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; /** @@ -56,11 +56,11 @@ public class ExShowSeedInfo extends GameServerPacket writeD(seed.getCanProduce()); // Left to buy writeD(seed.getStartProduce()); // Started amount writeD(seed.getPrice()); // Sell Price - writeD(SeedData.getInstance().getSeedLevel(seed.getId())); // Seed Level + writeD(ManorSeedData.getInstance().getSeedLevel(seed.getId())); // Seed Level writeC(1); // reward 1 Type - writeD(SeedData.getInstance().getRewardItemBySeed(seed.getId(), 1)); // Reward 1 Type Item Id + writeD(ManorSeedData.getInstance().getRewardItemBySeed(seed.getId(), 1)); // Reward 1 Type Item Id writeC(1); // reward 2 Type - writeD(SeedData.getInstance().getRewardItemBySeed(seed.getId(), 2)); // Reward 2 Type Item Id + writeD(ManorSeedData.getInstance().getRewardItemBySeed(seed.getId(), 2)); // Reward 2 Type Item Id } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index f4ef39802f..f85bde5c33 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; @@ -43,20 +43,20 @@ public class ExShowSeedSetting extends GameServerPacket { _manorId = manorId; final Castle c = CastleManager.getInstance().getCastleById(_manorId); - final List seeds = SeedData.getInstance().getSeedsForCastle(_manorId); + final List seeds = ManorSeedData.getInstance().getSeedsForCastle(_manorId); _count = seeds.size(); _seedData = new int[_count * 12]; int i = 0; for (int s : seeds) { _seedData[(i * 12) + 0] = s; - _seedData[(i * 12) + 1] = SeedData.getInstance().getSeedLevel(s); - _seedData[(i * 12) + 2] = SeedData.getInstance().getRewardItemBySeed(s, 1); - _seedData[(i * 12) + 3] = SeedData.getInstance().getRewardItemBySeed(s, 2); - _seedData[(i * 12) + 4] = SeedData.getInstance().getSeedSaleLimit(s); - _seedData[(i * 12) + 5] = SeedData.getInstance().getSeedBuyPrice(s); - _seedData[(i * 12) + 6] = (SeedData.getInstance().getSeedBasicPrice(s) * 60) / 100; - _seedData[(i * 12) + 7] = SeedData.getInstance().getSeedBasicPrice(s) * 10; + _seedData[(i * 12) + 1] = ManorSeedData.getInstance().getSeedLevel(s); + _seedData[(i * 12) + 2] = ManorSeedData.getInstance().getRewardItemBySeed(s, 1); + _seedData[(i * 12) + 3] = ManorSeedData.getInstance().getRewardItemBySeed(s, 2); + _seedData[(i * 12) + 4] = ManorSeedData.getInstance().getSeedSaleLimit(s); + _seedData[(i * 12) + 5] = ManorSeedData.getInstance().getSeedBuyPrice(s); + _seedData[(i * 12) + 6] = (ManorSeedData.getInstance().getSeedBasicPrice(s) * 60) / 100; + _seedData[(i * 12) + 7] = ManorSeedData.getInstance().getSeedBasicPrice(s) * 10; SeedProduction seedPr = c.getSeed(s, CastleManorManager.PERIOD_CURRENT); if (seedPr != null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 2b693d1dcb..e5dc549e80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.datatables.xml.SeedData; +import org.l2jmobius.gameserver.datatables.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -42,7 +42,7 @@ public class ExShowSellCropList extends GameServerPacket _castleCrops = new HashMap<>(); _cropsItems = new HashMap<>(); - final List allCrops = SeedData.getInstance().getAllCrops(); + final List allCrops = ManorSeedData.getInstance().getAllCrops(); for (int cropId : allCrops) { final ItemInstance item = player.getInventory().getItemByItemId(cropId); @@ -80,11 +80,11 @@ public class ExShowSellCropList extends GameServerPacket { writeD(item.getObjectId()); // Object id writeD(item.getItemId()); // crop id - writeD(SeedData.getInstance().getSeedLevelByCrop(item.getItemId())); // seed level + writeD(ManorSeedData.getInstance().getSeedLevelByCrop(item.getItemId())); // seed level writeC(1); - writeD(SeedData.getInstance().getRewardItem(item.getItemId(), 1)); // reward 1 id + writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 1)); // reward 1 id writeC(1); - writeD(SeedData.getInstance().getRewardItem(item.getItemId(), 2)); // reward 2 id + writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 2)); // reward 2 id if (_castleCrops.containsKey(item.getItemId())) {