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

Proper package location and name for MultisellData class.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-06-10 21:40:35 +00:00
parent d6be91d2d1
commit c1150f15c6
10 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@ -66,6 +66,7 @@ import org.l2jmobius.gameserver.datatables.xml.FishData;
import org.l2jmobius.gameserver.datatables.xml.HennaData;
import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.datatables.xml.MapRegionData;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.datatables.xml.PlayerTemplateData;
import org.l2jmobius.gameserver.datatables.xml.RecipeData;
import org.l2jmobius.gameserver.datatables.xml.StaticObjectData;
@ -118,7 +119,6 @@ import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
import org.l2jmobius.gameserver.model.entity.siege.clanhalls.BanditStrongholdSiege;
import org.l2jmobius.gameserver.model.entity.siege.clanhalls.DevastatedCastle;
import org.l2jmobius.gameserver.model.entity.siege.clanhalls.FortressOfResistance;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList;
import org.l2jmobius.gameserver.model.spawn.AutoSpawn;
@ -261,7 +261,7 @@ public class GameServer
Util.printSection("Economy");
TradeController.getInstance();
Multisell.getInstance();
MultisellData.getInstance();
Util.printSection("Clan Halls");
ClanHallManager.getInstance();

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/MultisellData.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.multisell;
package org.l2jmobius.gameserver.datatables.xml;
import java.io.File;
import java.util.ArrayList;
@ -33,15 +33,18 @@ import org.l2jmobius.gameserver.model.items.Armor;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.multisell.MultiSellEntry;
import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient;
import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer;
import org.l2jmobius.gameserver.network.serverpackets.MultiSellList;
/**
* Multisell list manager
* @author programmos
*/
public class Multisell
public class MultisellData
{
private static final Logger LOGGER = Logger.getLogger(Multisell.class.getName());
private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
private final List<MultiSellListContainer> _entries = new ArrayList<>();
public MultiSellListContainer getList(int id)
@ -61,7 +64,7 @@ public class Multisell
return null;
}
private Multisell()
private MultisellData()
{
parseData();
}
@ -444,13 +447,13 @@ public class Multisell
}
}
public static Multisell getInstance()
public static MultisellData getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Multisell INSTANCE = new Multisell();
protected static final MultisellData INSTANCE = new MultisellData();
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java
View File

@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.TeleportLocationTable;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.datatables.xml.WalkerRouteData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.util.BuilderUtil;
/**
@ -63,7 +63,7 @@ public class AdminReload implements IAdminCommandHandler
final String type = st.nextToken();
if (type.equals("multisell"))
{
Multisell.getInstance().reload();
MultisellData.getInstance().reload();
sendReloadPage(activeChar);
BuilderUtil.sendSysMessage(activeChar, "Multisell reloaded.");
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BlacksmithInstance.java
View File

@ -16,8 +16,8 @@
*/
package org.l2jmobius.gameserver.model.actor.instance;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.multisell.Multisell;
/**
* @author zabbix Lets drink to code!
@ -35,7 +35,7 @@ public class BlacksmithInstance extends FolkInstance
if (command.startsWith("multisell"))
{
final int listId = Integer.parseInt(command.substring(9).trim());
Multisell.getInstance().SeparateAndSend(listId, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(listId, player, false, getCastle().getTaxRate());
}
super.onBypassFeedback(player, command);
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
View File

@ -20,9 +20,9 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.model.StoreTradeList;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.BuyList;
@ -171,7 +171,7 @@ public class MerchantInstance extends FolkInstance
}
final int val = Integer.parseInt(st.nextToken());
Multisell.getInstance().SeparateAndSend(val, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(val, player, false, getCastle().getTaxRate());
}
else if (actualCommand.equalsIgnoreCase("Exc_Multisell"))
{
@ -181,7 +181,7 @@ public class MerchantInstance extends FolkInstance
}
final int val = Integer.parseInt(st.nextToken());
Multisell.getInstance().SeparateAndSend(val, player, true, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(val, player, true, getCastle().getTaxRate());
}
else
{

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.sql.HelperBuffTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.datatables.xml.ZoneData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.idfactory.IdFactory;
@ -71,7 +72,6 @@ import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.quest.QuestState;
@ -1307,11 +1307,11 @@ public class NpcInstance extends Creature
}
else if (command.startsWith("multisell"))
{
Multisell.getInstance().SeparateAndSend(Integer.parseInt(command.substring(9).trim()), player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(Integer.parseInt(command.substring(9).trim()), player, false, getCastle().getTaxRate());
}
else if (command.startsWith("exc_multisell"))
{
Multisell.getInstance().SeparateAndSend(Integer.parseInt(command.substring(13).trim()), player, true, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(Integer.parseInt(command.substring(13).trim()), player, true, getCastle().getTaxRate());
}
else if (command.startsWith("Augment"))
{
@ -1387,7 +1387,7 @@ public class NpcInstance extends Creature
}
else
{
Multisell.getInstance().SeparateAndSend(10010, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(10010, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)
@ -1407,7 +1407,7 @@ public class NpcInstance extends Creature
}
else
{
Multisell.getInstance().SeparateAndSend(10011, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(10011, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)
@ -1455,7 +1455,7 @@ public class NpcInstance extends Creature
}
else
{
Multisell.getInstance().SeparateAndSend(10012, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(10012, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)
@ -1475,7 +1475,7 @@ public class NpcInstance extends Creature
}
else
{
Multisell.getInstance().SeparateAndSend(10013, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(10013, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
View File

@ -21,10 +21,10 @@ import java.util.Map;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExHeroList;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@ -148,7 +148,7 @@ public class OlympiadManagerInstance extends FolkInstance
}
case 7:
{
Multisell.getInstance().SeparateAndSend(102, player, false, getCastle().getTaxRate());
MultisellData.getInstance().SeparateAndSend(102, player, false, getCastle().getTaxRate());
break;
}
default:

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -22,6 +22,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.model.Augmentation;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.multisell.MultiSellEntry;
import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient;
import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
@ -95,7 +95,7 @@ public class MultiSellChoose extends GameClientPacket
return;
}
final MultiSellListContainer list = Multisell.getInstance().getList(_listId);
final MultiSellListContainer list = MultisellData.getInstance().getList(_listId);
final int selectedList = player.getMultiSellId();
if ((list == null) || (list.getListId() != _listId) || (selectedList != _listId))
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/Gui.java
View File

@ -49,8 +49,8 @@ import org.l2jmobius.commons.util.LimitLinesDocumentListener;
import org.l2jmobius.commons.util.SplashScreen;
import org.l2jmobius.gameserver.Shutdown;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.util.Broadcast;
import org.l2jmobius.gameserver.util.Util;
@ -191,7 +191,7 @@ public class Gui
{
if (JOptionPane.showOptionDialog(null, "Reload multisells?", "Select an option", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, confirmOptions, confirmOptions[1]) == 0)
{
Multisell.getInstance().reload();
MultisellData.getInstance().reload();
}
});
mnReload.add(mntmMultisells);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java
View File

@ -57,6 +57,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.sql.TeleportLocationTable;
import org.l2jmobius.gameserver.datatables.xml.AdminData;
import org.l2jmobius.gameserver.datatables.xml.MultisellData;
import org.l2jmobius.gameserver.datatables.xml.ZoneData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager;
@ -74,7 +75,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.Announcements;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.multisell.Multisell;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.CharInfo;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@ -710,7 +710,7 @@ public class GameStatusThread extends Thread
if (type.equals("multisell"))
{
_print.print("Reloading multisell... ");
Multisell.getInstance().reload();
MultisellData.getInstance().reload();
_print.println("done");
}
else if (type.equals("skill"))