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

Proper naming for various data holding classes.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-28 11:48:32 +00:00
parent 8ebd210ac3
commit 8dbfd09e0c
934 changed files with 22626 additions and 22626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,9 +47,9 @@ import org.l2jmobius.gameserver.datatables.NobleSkillTable;
import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
import org.l2jmobius.gameserver.datatables.SchemeBufferTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.ExtractableItemsData;
import org.l2jmobius.gameserver.datatables.csv.ExtractableItemData;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRoutesTable;
import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRouteTable;
import org.l2jmobius.gameserver.datatables.sql.CharNameTable;
import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
@@ -243,7 +243,7 @@ public class GameServer
Util.printSection("Items");
ItemTable.getInstance();
ArmorSetData.getInstance();
ExtractableItemsData.getInstance();
ExtractableItemData.getInstance();
SummonItemData.getInstance();
if (Config.ALLOWFISHING)
{
@@ -252,7 +252,7 @@ public class GameServer
Util.printSection("Npc");
SchemeBufferTable.getInstance();
NpcWalkerRoutesTable.getInstance().load();
NpcWalkerRouteTable.getInstance().load();
if (!NpcTable.getInstance().isInitialized())
{
LOGGER.info("Could not find the extracted files. Please Check Your Data.");

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRoutesTable;
import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRouteTable;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.NpcWalkerNode;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -52,7 +52,7 @@ public class NpcWalkerAI extends CreatureAI implements Runnable
/**
* route of the current npc
*/
private final List<NpcWalkerNode> _route = NpcWalkerRoutesTable.getInstance().getRouteForNpc(getActor().getNpcId());
private final List<NpcWalkerNode> _route = NpcWalkerRouteTable.getInstance().getRouteForNpc(getActor().getNpcId());
/**
* current node

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/ExtractableItemsData.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/ExtractableItemData.java
View File

@@ -31,14 +31,14 @@ import org.l2jmobius.gameserver.model.ExtractableProductItem;
/**
* @author FBIagent
*/
public class ExtractableItemsData
public class ExtractableItemData
{
private static final Logger LOGGER = Logger.getLogger(ExtractableItemsData.class.getName());
private static final Logger LOGGER = Logger.getLogger(ExtractableItemData.class.getName());
// Map<itemid, ExtractableItem>
private Map<Integer, ExtractableItem> _items;
public ExtractableItemsData()
public ExtractableItemData()
{
_items = new HashMap<>();
@@ -163,13 +163,13 @@ public class ExtractableItemsData
return result;
}
public static ExtractableItemsData getInstance()
public static ExtractableItemData getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final ExtractableItemsData INSTANCE = new ExtractableItemsData();
protected static final ExtractableItemData INSTANCE = new ExtractableItemData();
}
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/NpcWalkerRoutesTable.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/NpcWalkerRouteTable.java
View File

@@ -35,13 +35,13 @@ import org.l2jmobius.gameserver.model.NpcWalkerNode;
* @author Rayan RPG for L2Emu Project
* @since 927
*/
public class NpcWalkerRoutesTable
public class NpcWalkerRouteTable
{
protected static final Logger LOGGER = Logger.getLogger(NpcWalkerRoutesTable.class.getName());
protected static final Logger LOGGER = Logger.getLogger(NpcWalkerRouteTable.class.getName());
private List<NpcWalkerNode> _routes;
private NpcWalkerRoutesTable()
private NpcWalkerRouteTable()
{
}
@@ -162,13 +162,13 @@ public class NpcWalkerRoutesTable
return result;
}
public static NpcWalkerRoutesTable getInstance()
public static NpcWalkerRouteTable getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final NpcWalkerRoutesTable INSTANCE = new NpcWalkerRoutesTable();
protected static final NpcWalkerRouteTable INSTANCE = new NpcWalkerRouteTable();
}
}

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

@@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.TradeController;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRoutesTable;
import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRouteTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.TeleportLocationTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -108,7 +108,7 @@ public class AdminReload implements IAdminCommandHandler
}
else if (type.startsWith("npcwalkers"))
{
NpcWalkerRoutesTable.getInstance().load();
NpcWalkerRouteTable.getInstance().load();
sendReloadPage(activeChar);
BuilderUtil.sendSysMessage(activeChar, "All NPC walker routes have been reloaded");
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java
View File

@@ -21,7 +21,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.csv.ExtractableItemsData;
import org.l2jmobius.gameserver.datatables.csv.ExtractableItemData;
import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.ExtractableItem;
import org.l2jmobius.gameserver.model.ExtractableProductItem;
@@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler
}
while (count-- > 0)
{
final ExtractableItem exitem = ExtractableItemsData.getInstance().getExtractableItem(itemID);
final ExtractableItem exitem = ExtractableItemData.getInstance().getExtractableItem(itemID);
if (exitem == null)
{
return;
@@ -158,6 +158,6 @@ public class ExtractableItems implements IItemHandler
@Override
public int[] getItemIds()
{
return ExtractableItemsData.getInstance().itemIDs();
return ExtractableItemData.getInstance().itemIDs();
}
}