More final and static cleanups.

This commit is contained in:
MobiusDevelopment
2019-08-01 09:43:44 +00:00
parent 406caf063a
commit 565933653d
454 changed files with 757 additions and 757 deletions

View File

@@ -27,7 +27,7 @@ public class OlympiadLogger
{
private static final Logger LOGGER = Logger.getLogger(OlympiadLogger.class.getName());
public static final void add(String text, String cat)
public static void add(String text, String cat)
{
String date = new SimpleDateFormat("yy.MM.dd H:mm:ss").format(new Date());

View File

@@ -165,7 +165,7 @@ public class ClanBBSManager extends BaseBBSManager
return "clan/";
}
private static void sendClanMail(PlayerInstance activeChar, int clanId)
private void sendClanMail(PlayerInstance activeChar, int clanId)
{
final Clan clan = ClanTable.getInstance().getClan(clanId);
if (clan == null)
@@ -186,7 +186,7 @@ public class ClanBBSManager extends BaseBBSManager
separateAndSend(content, activeChar);
}
private static void sendClanManagement(PlayerInstance activeChar, int clanId)
private void sendClanManagement(PlayerInstance activeChar, int clanId)
{
final Clan clan = ClanTable.getInstance().getClan(clanId);
if (clan == null)
@@ -207,7 +207,7 @@ public class ClanBBSManager extends BaseBBSManager
send1002(activeChar, clan.getIntroduction(), "", "");
}
private static void sendClanNotice(PlayerInstance activeChar, int clanId)
private void sendClanNotice(PlayerInstance activeChar, int clanId)
{
final Clan clan = ClanTable.getInstance().getClan(clanId);
if ((clan == null) || (activeChar.getClanId() != clanId))
@@ -230,7 +230,7 @@ public class ClanBBSManager extends BaseBBSManager
send1002(activeChar, clan.getNotice(), "", "");
}
private static void sendClanList(PlayerInstance activeChar, int index)
private void sendClanList(PlayerInstance activeChar, int index)
{
String content = HtmCache.getInstance().getHtm(CB_PATH + "clan/clanlist.htm");
@@ -312,7 +312,7 @@ public class ClanBBSManager extends BaseBBSManager
separateAndSend(content, activeChar);
}
private static void sendClanDetails(PlayerInstance activeChar, int clanId)
private void sendClanDetails(PlayerInstance activeChar, int clanId)
{
final Clan clan = ClanTable.getInstance().getClan(clanId);
if (clan == null)

View File

@@ -226,7 +226,7 @@ public class FriendsBBSManager extends BaseBBSManager
}
}
private static void showFriendsList(PlayerInstance activeChar, boolean delMsg)
private void showFriendsList(PlayerInstance activeChar, boolean delMsg)
{
String content = HtmCache.getInstance().getHtm(CB_PATH + "friend/friend-list.htm");
if (content == null)
@@ -282,7 +282,7 @@ public class FriendsBBSManager extends BaseBBSManager
separateAndSend(content, activeChar);
}
private static void showBlockList(PlayerInstance activeChar, boolean delMsg)
private void showBlockList(PlayerInstance activeChar, boolean delMsg)
{
String content = HtmCache.getInstance().getHtm(CB_PATH + "friend/friend-blocklist.htm");
if (content == null)
@@ -338,7 +338,7 @@ public class FriendsBBSManager extends BaseBBSManager
separateAndSend(content, activeChar);
}
public static final void showMailWrite(PlayerInstance activeChar)
public static void showMailWrite(PlayerInstance activeChar)
{
String content = HtmCache.getInstance().getHtm(CB_PATH + "friend/friend-mail.htm");
if (content == null)

View File

@@ -521,13 +521,13 @@ public class MailBBSManager extends BaseBBSManager
separateAndSend(content, activeChar);
}
private static void showWriteView(PlayerInstance activeChar)
private void showWriteView(PlayerInstance activeChar)
{
String content = HtmCache.getInstance().getHtm(CB_PATH + "mail/mail-write.htm");
separateAndSend(content, activeChar);
}
private static void showWriteView(PlayerInstance activeChar, String parcipientName, Mail letter)
private void showWriteView(PlayerInstance activeChar, String parcipientName, Mail letter)
{
String content = HtmCache.getInstance().getHtm(CB_PATH + "mail/mail-reply.htm");

View File

@@ -190,7 +190,7 @@ public class PostBBSManager extends BaseBBSManager
}
}
private static void showHtmlEditPost(Topic topic, PlayerInstance player, Forum forum, Post p)
private void showHtmlEditPost(Topic topic, PlayerInstance player, Forum forum, Post p)
{
final String html = "<html><body><br><br><table border=0 width=610><tr><td width=10></td><td width=600 align=left><a action=\"bypass _bbshome\">HOME</a>&nbsp;>&nbsp;<a action=\"bypass _bbsmemo\">" + forum.getName() + " Form</a></td></tr></table><img src=\"L2UI.squareblank\" width=\"1\" height=\"10\"><center><table border=0 cellspacing=0 cellpadding=0><tr><td width=610><img src=\"sek.cbui355\" width=\"610\" height=\"1\"><br1><img src=\"sek.cbui355\" width=\"610\" height=\"1\"></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=20></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&$413;</td><td FIXWIDTH=540>" + topic.getName() + "</td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29 valign=top>&$427;</td><td align=center FIXWIDTH=540><MultiEdit var =\"Content\" width=535 height=313></td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&nbsp;</td><td align=center FIXWIDTH=70><button value=\"&$140;\" action=\"Write Post " + forum.getID() + ";" + topic.getID() + ";0 _ Content Content Content\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td><td align=center FIXWIDTH=70><button value = \"&$141;\" action=\"bypass _bbsmemo\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"> </td><td align=center FIXWIDTH=400>&nbsp;</td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table></center></body></html>";
send1001(html, player);

View File

@@ -71,7 +71,7 @@ public class RegionBBSManager extends BaseBBSManager
return "region/";
}
private static void showRegionsList(PlayerInstance player)
private void showRegionsList(PlayerInstance player)
{
final String content = HtmCache.getInstance().getHtm(CB_PATH + "region/castlelist.htm");
@@ -85,7 +85,7 @@ public class RegionBBSManager extends BaseBBSManager
separateAndSend(content.replace("%castleList%", sb.toString()), player);
}
private static void showRegion(PlayerInstance player, int castleId)
private void showRegion(PlayerInstance player, int castleId)
{
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
final Clan owner = ClanTable.getInstance().getClan(castle.getOwnerId());

View File

@@ -225,7 +225,7 @@ public class TopicBBSManager extends BaseBBSManager
return null;
}
private static void showNewTopic(Forum forum, PlayerInstance player, int idf)
private void showNewTopic(Forum forum, PlayerInstance player, int idf)
{
if (forum == null)
{
@@ -243,7 +243,7 @@ public class TopicBBSManager extends BaseBBSManager
}
}
private static void showMemoNewTopics(Forum forum, PlayerInstance player)
private void showMemoNewTopics(Forum forum, PlayerInstance player)
{
final String html = "<html><body><br><br><table border=0 width=610><tr><td width=10></td><td width=600 align=left><a action=\"bypass _bbshome\">HOME</a>&nbsp;>&nbsp;<a action=\"bypass _bbsmemo\">Memo Form</a></td></tr></table><img src=\"L2UI.squareblank\" width=\"1\" height=\"10\"><center><table border=0 cellspacing=0 cellpadding=0><tr><td width=610><img src=\"sek.cbui355\" width=\"610\" height=\"1\"><br1><img src=\"sek.cbui355\" width=\"610\" height=\"1\"></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=20></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&$413;</td><td FIXWIDTH=540><edit var = \"Title\" width=540 height=13></td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29 valign=top>&$427;</td><td align=center FIXWIDTH=540><MultiEdit var =\"Content\" width=535 height=313></td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&nbsp;</td><td align=center FIXWIDTH=70><button value=\"&$140;\" action=\"Write Topic crea " + forum.getID() + " Title Content Title\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td><td align=center FIXWIDTH=70><button value = \"&$141;\" action=\"bypass _bbsmemo\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"> </td><td align=center FIXWIDTH=400>&nbsp;</td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table></center></body></html>";
send1001(html, player);

View File

@@ -173,7 +173,7 @@ public class AdminFence implements IAdminCommandHandler
return ADMIN_COMMANDS;
}
private static void sendHtml(PlayerInstance activeChar, int page)
private void sendHtml(PlayerInstance activeChar, int page)
{
final PageResult result = HtmlUtil.createPage(FenceData.getInstance().getFences().values(), page, 10, currentPage ->
{

View File

@@ -42,7 +42,7 @@ public class RaidBossPointsManager
private static final Comparator<Entry<Integer, Integer>> _comparator = (entry, entry1) -> entry.getValue().equals(entry1.getValue()) ? 0 : entry.getValue() < entry1.getValue() ? 1 : -1;
public static final void init()
public static void init()
{
_list = new HashMap<>();
final List<Integer> _chars = new ArrayList<>();
@@ -81,7 +81,7 @@ public class RaidBossPointsManager
}
}
public static final void updatePointsInDB(PlayerInstance player, int raidId, int points)
public static void updatePointsInDB(PlayerInstance player, int raidId, int points)
{
try (Connection con = DatabaseFactory.getConnection())
{
@@ -99,7 +99,7 @@ public class RaidBossPointsManager
}
}
public static final void addPoints(PlayerInstance player, int bossId, int points)
public static void addPoints(PlayerInstance player, int bossId, int points)
{
final int ownerId = player.getObjectId();
Map<Integer, Integer> tmpPoint = new HashMap<>();
@@ -152,7 +152,7 @@ public class RaidBossPointsManager
return _list.get(player.getObjectId());
}
public static final void cleanUp()
public static void cleanUp()
{
try (Connection con = DatabaseFactory.getConnection())
{

View File

@@ -200,7 +200,7 @@ public class FishermanInstance extends FolkInstance
player.sendPacket(ActionFailed.STATIC_PACKET);
}
private static void sendHtml(PlayerInstance player, FishermanInstance npc, String htmlName)
private void sendHtml(PlayerInstance player, FishermanInstance npc, String htmlName)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile("data/html/fisherman/championship/" + htmlName);

View File

@@ -843,7 +843,7 @@ public class VillageMasterInstance extends FolkInstance
* @param pledgeType the pledge type
* @param pledgeName the pledge name
*/
private static final void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName)
private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName)
{
if (!player.isClanLeader())
{

View File

@@ -140,7 +140,7 @@ public class EventManager
}
}
private static void registerTvT()
private void registerTvT()
{
TvT.loadData();
if (!TvT.checkStartJoinOk())
@@ -158,7 +158,7 @@ public class EventManager
}
}
private static void registerCTF()
private void registerCTF()
{
CTF.loadData();
if (!CTF.checkStartJoinOk())
@@ -176,7 +176,7 @@ public class EventManager
}
}
private static void registerDM()
private void registerDM()
{
DM.loadData();
if (!DM.checkStartJoinOk())

View File

@@ -1087,7 +1087,7 @@ public class Quest extends ManagedScript
* Add state of quests, drops and variables for quests in the HashMap _quest of PlayerInstance
* @param player : Player who is entering the world
*/
public static final void playerEnter(PlayerInstance player)
public static void playerEnter(PlayerInstance player)
{
if (Config.ALT_DEV_NO_QUESTS)
{