Cleanup of unnecessary void method and class modifiers.

This commit is contained in:
MobiusDevelopment
2022-12-13 22:13:36 +00:00
parent 7e3dd71d77
commit e6085edc4c
2172 changed files with 3581 additions and 3581 deletions

View File

@ -514,7 +514,7 @@ public class Shutdown extends Thread
* A simple class used to track down the estimated time of method executions.<br>
* Once this class is created, it saves the start time, and when you want to get the estimated time, use the getEstimatedTime() method.
*/
private static final class TimeCounter
private static class TimeCounter
{
private long _startTime;

View File

@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sahar
*/
public final class PaperdollCache
public class PaperdollCache
{
private final Set<Item> _paperdollItems = ConcurrentHashMap.newKeySet();

View File

@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.cache;
/**
* @author Sahar
*/
public final class RelationCache
public class RelationCache
{
private final int _relation;
private final boolean _isAutoAttackable;

View File

@ -474,7 +474,7 @@ public class BotReportTable
/**
* Represents the info about a reporter
*/
private final class ReporterCharData
private class ReporterCharData
{
private long _lastReport;
private byte _reportPoints;
@ -510,7 +510,7 @@ public class BotReportTable
/**
* Represents the info about a reported character
*/
private final class ReportedCharData
private class ReportedCharData
{
Map<Integer, Long> _reporters;
@ -556,7 +556,7 @@ public class BotReportTable
/**
* SAX loader to parse /config/BotReportPunishments.xml file
*/
private final class PunishmentsLoader extends DefaultHandler
private class PunishmentsLoader extends DefaultHandler
{
PunishmentsLoader()
{
@ -622,7 +622,7 @@ public class BotReportTable
}
}
private static final class SingletonHolder
private static class SingletonHolder
{
static final BotReportTable INSTANCE = new BotReportTable();
}

View File

@ -59,7 +59,7 @@ public class CharNameTable
}
}
private final void addName(int objectId, String name)
private void addName(int objectId, String name)
{
if ((name != null) && !name.equals(_chars.get(objectId)))
{

View File

@ -71,7 +71,7 @@ public class SayuneData implements IXmlReader
}
}
private final void parseEntries(SayuneEntry lastEntry, Node n)
private void parseEntries(SayuneEntry lastEntry, Node n)
{
NamedNodeMap attrs;
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())

View File

@ -386,7 +386,7 @@ public enum ClassId implements IIdentifiable
return _nextClassIds;
}
private final void addNextClassId(ClassId cId)
private void addNextClassId(ClassId cId)
{
_nextClassIds.add(cId);
}

View File

@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.geoengine.geodata;
/**
* @author HorridoJoho
*/
public final class Cell
public class Cell
{
/** East NSWE flag */
public static final byte NSWE_EAST = 1 << 0;

View File

@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.regions.Region;
/**
* @author HorridoJoho
*/
public final class GeoData
public class GeoData
{
// world dimensions: 1048576 * 1048576 = 1099511627776
private static final int WORLD_MIN_X = -655360;

View File

@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IBlock;
/**
* @author HorridoJoho
*/
public final class ComplexBlock implements IBlock
public class ComplexBlock implements IBlock
{
private final short[] _data;

View File

@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IRegion;
/**
* @author HorridoJoho
*/
public final class NullRegion implements IRegion
public class NullRegion implements IRegion
{
public static final NullRegion INSTANCE = new NullRegion();

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.blocks.MultilayerBlock;
/**
* @author HorridoJoho
*/
public final class Region implements IRegion
public class Region implements IRegion
{
private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];

View File

@ -85,7 +85,7 @@ public class CellNodeBuffer
return null;
}
public final void free()
public void free()
{
_current = null;
@ -136,7 +136,7 @@ public class CellNodeBuffer
return result;
}
private final void getNeighbors()
private void getNeighbors()
{
if (_current.getLoc().canGoNone())
{

View File

@ -58,7 +58,7 @@ public class ConditionHandler
}
}
private static final class SingletonHolder
private static class SingletonHolder
{
protected static final ConditionHandler INSTANCE = new ConditionHandler();
}

View File

@ -58,7 +58,7 @@ public class EffectHandler
}
}
private static final class SingletonHolder
private static class SingletonHolder
{
protected static final EffectHandler INSTANCE = new EffectHandler();
}

View File

@ -58,7 +58,7 @@ public class SkillConditionHandler
}
}
private static final class SingletonHolder
private static class SingletonHolder
{
protected static final SkillConditionHandler INSTANCE = new SkillConditionHandler();
}

View File

@ -243,7 +243,7 @@ public class PetData
return _skills;
}
public static final class PetSkillLearn extends SkillHolder
public static class PetSkillLearn extends SkillHolder
{
private final int _minLevel;

View File

@ -86,7 +86,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
* Sets the instance type.
* @param newInstanceType the instance type to set
*/
protected final void setInstanceType(InstanceType newInstanceType)
protected void setInstanceType(InstanceType newInstanceType)
{
_instanceType = newInstanceType;
}

View File

@ -306,7 +306,7 @@ public class Attackable extends Npc
return true;
}
static class PartyContainer
private static class PartyContainer
{
public Party party;
public long damage;

View File

@ -2205,7 +2205,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _isRunning;
}
private final void setRunning(boolean value)
private void setRunning(boolean value)
{
if (_isRunning == value)
{
@ -2396,7 +2396,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* When a new instance of Creature is spawned, server just create a link between the instance and the template This link is stored in <b>_template</b>.
* @param template
*/
protected final void setTemplate(CreatureTemplate template)
protected void setTemplate(CreatureTemplate template)
{
_template = template;
}
@ -5666,7 +5666,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return MoveType.STANDING;
}
protected final void computeStatusUpdate(StatusUpdate su, StatusUpdateType type)
protected void computeStatusUpdate(StatusUpdate su, StatusUpdateType type)
{
final int newValue = type.getValue(this);
_statusUpdates.compute(type, (key, oldValue) ->
@ -5680,7 +5680,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
});
}
protected final void addStatusUpdateValue(StatusUpdateType type)
protected void addStatusUpdateValue(StatusUpdateType type)
{
_statusUpdates.put(type, type.getValue(this));
}

View File

@ -297,7 +297,7 @@ public class ControllableAirShip extends AirShip
}
}
protected final class ConsumeFuelTask implements Runnable
protected class ConsumeFuelTask implements Runnable
{
@Override
public void run()
@ -317,7 +317,7 @@ public class ControllableAirShip extends AirShip
}
}
protected final class CheckTask implements Runnable
protected class CheckTask implements Runnable
{
@Override
public void run()
@ -330,7 +330,7 @@ public class ControllableAirShip extends AirShip
}
}
protected final class DecayTask implements Runnable
protected class DecayTask implements Runnable
{
@Override
public void run()

View File

@ -56,7 +56,7 @@ public class FortDoorman extends Doorman
}
@Override
protected final void openDoors(Player player, String command)
protected void openDoors(Player player, String command)
{
final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
st.nextToken();
@ -68,7 +68,7 @@ public class FortDoorman extends Doorman
}
@Override
protected final void closeDoors(Player player, String command)
protected void closeDoors(Player player, String command)
{
final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
st.nextToken();

View File

@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class BuilderContainer extends Builder
public class BuilderContainer extends Builder
{
private final Builder[] _builders;

View File

@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class BuilderObject extends Builder
public class BuilderObject extends Builder
{
private final int _index;

View File

@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class BuilderText extends Builder
public class BuilderText extends Builder
{
private final String _text;

View File

@ -221,7 +221,7 @@ public class ItemAuction
updatePlayerBidInternal(bid, delete);
}
final void updatePlayerBidInternal(ItemAuctionBid bid, boolean delete)
private void updatePlayerBidInternal(ItemAuctionBid bid, boolean delete)
{
final String query = delete ? DELETE_ITEM_AUCTION_BID : INSERT_ITEM_AUCTION_BID;
try (Connection con = DatabaseFactory.getConnection();

View File

@ -43,22 +43,22 @@ public class ItemAuctionBid
return _lastBid;
}
final void setLastBid(long lastBid)
public void setLastBid(long lastBid)
{
_lastBid = lastBid;
}
final void cancelBid()
public void cancelBid()
{
_lastBid = -1;
}
final boolean isCanceled()
public boolean isCanceled()
{
return _lastBid <= 0;
}
final Player getPlayer()
public Player getPlayer()
{
return World.getInstance().getPlayer(_playerObjId);
}

View File

@ -232,7 +232,7 @@ public class ItemAuctionInstance
return null;
}
final void checkAndSetCurrentAndNextAuction()
private void checkAndSetCurrentAndNextAuction()
{
final ItemAuction[] auctions = _auctions.values().toArray(new ItemAuction[_auctions.size()]);
@ -376,7 +376,7 @@ public class ItemAuctionInstance
return auctions;
}
private final class ScheduleAuctionTask implements Runnable
private class ScheduleAuctionTask implements Runnable
{
private final ItemAuction _auction;
@ -476,7 +476,7 @@ public class ItemAuctionInstance
}
}
final void onAuctionFinished(ItemAuction auction)
private void onAuctionFinished(ItemAuction auction)
{
auction.broadcastToAllBiddersInternal(new SystemMessage(SystemMessageId.S1_S_AUCTION_HAS_ENDED).addInt(auction.getAuctionId()));
@ -511,7 +511,7 @@ public class ItemAuctionInstance
}
}
final void setStateTask(ScheduledFuture<?> future)
private void setStateTask(ScheduledFuture<?> future)
{
final ScheduledFuture<?> stateTask = _stateTask;
if (stateTask != null)

View File

@ -176,7 +176,7 @@ public abstract class Inventory extends ItemContainer
private int _blockedItemSlotsMask;
// Recorder of alterations in inventory
private static final class ChangeRecorder implements PaperdollListener
private static class ChangeRecorder implements PaperdollListener
{
private final Inventory _inventory;
private final List<Item> _changed = new ArrayList<>(1);
@ -225,7 +225,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class BowCrossRodListener implements PaperdollListener
private static class BowCrossRodListener implements PaperdollListener
{
private static BowCrossRodListener instance = new BowCrossRodListener();
@ -295,7 +295,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class StatsListener implements PaperdollListener
private static class StatsListener implements PaperdollListener
{
private static StatsListener instance = new StatsListener();
@ -317,7 +317,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class ItemSkillsListener implements PaperdollListener
private static class ItemSkillsListener implements PaperdollListener
{
private static ItemSkillsListener instance = new ItemSkillsListener();
@ -753,7 +753,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class ArmorSetListener implements PaperdollListener
private static class ArmorSetListener implements PaperdollListener
{
private static ArmorSetListener instance = new ArmorSetListener();
@ -955,7 +955,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class BraceletListener implements PaperdollListener
private static class BraceletListener implements PaperdollListener
{
private static BraceletListener instance = new BraceletListener();
@ -991,7 +991,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class BroochListener implements PaperdollListener
private static class BroochListener implements PaperdollListener
{
private static BroochListener instance = new BroochListener();
@ -1027,7 +1027,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class AgathionBraceletListener implements PaperdollListener
private static class AgathionBraceletListener implements PaperdollListener
{
private static AgathionBraceletListener instance = new AgathionBraceletListener();
@ -1061,7 +1061,7 @@ public abstract class Inventory extends ItemContainer
}
}
private static final class ArtifactBookListener implements PaperdollListener
private static class ArtifactBookListener implements PaperdollListener
{
private static ArtifactBookListener instance = new ArtifactBookListener();

View File

@ -91,7 +91,7 @@ public abstract class AbstractOlympiadGame
return !_aborted;
}
protected final void addPointsToParticipant(Participant par, int points)
protected void addPointsToParticipant(Participant par, int points)
{
par.updateStat(POINTS, points);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
@ -100,7 +100,7 @@ public abstract class AbstractOlympiadGame
broadcastPacket(sm);
}
protected final void removePointsFromParticipant(Participant par, int points)
protected void removePointsFromParticipant(Participant par, int points)
{
par.updateStat(POINTS, -points);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_OLYMPIAD_GAMES);

View File

@ -68,7 +68,7 @@ public class OlympiadGameManager implements Runnable
return _battleStarted;
}
protected final void startBattle()
protected void startBattle()
{
_battleStarted = true;
}

View File

@ -144,7 +144,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void broadcastPacket(ServerPacket packet)
protected void broadcastPacket(ServerPacket packet)
{
if (_playerOne.updatePlayer())
{
@ -181,7 +181,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void removals()
protected void removals()
{
if (_aborted)
{
@ -213,7 +213,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void cleanEffects()
protected void cleanEffects()
{
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumId))
{
@ -227,7 +227,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void portPlayersBack()
protected void portPlayersBack()
{
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected())
{
@ -240,7 +240,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void playersStatusBack()
protected void playersStatusBack()
{
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumId))
{
@ -254,7 +254,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void clearPlayers()
protected void clearPlayers()
{
_playerOne.setPlayer(null);
_playerOne = null;
@ -263,7 +263,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void handleDisconnect(Player player)
protected void handleDisconnect(Player player)
{
if (player.getObjectId() == _playerOne.getObjectId())
{

View File

@ -83,7 +83,7 @@ public class OlympiadManager
return _nonClassBasedRegisters.size() >= Config.ALT_OLY_NONCLASSED;
}
protected final void clearRegistered()
protected void clearRegistered()
{
_nonClassBasedRegisters.clear();
_classBasedRegisters.clear();

View File

@ -53,7 +53,7 @@ public class ClanHallAuction
loadBidder();
}
private final void loadBidder()
private void loadBidder()
{
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(LOAD_CLANHALL_BIDDERS))

View File

@ -48,7 +48,7 @@ public abstract class ZoneForm
public abstract void visualizeZone(int z);
protected final void dropDebugItem(int itemId, int num, int x, int y, int z)
protected void dropDebugItem(int itemId, int num, int x, int y, int z)
{
final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
item.setCount(num);

View File

@ -107,7 +107,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
}
@Override
protected final void onEnter(Creature creature)
protected void onEnter(Creature creature)
{
if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
{
@ -143,7 +143,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
}
@Override
protected final void onExit(Creature creature)
protected void onExit(Creature creature)
{
if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
{
@ -156,7 +156,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
}
}
private static final class KickPlayer implements Runnable
private static class KickPlayer implements Runnable
{
private Player _player;

View File

@ -44157,7 +44157,7 @@ public class NpcStringId
return "NS[" + getId() + ":" + getName() + "]";
}
public static final class NSLocalisation
public static class NSLocalisation
{
private final String _lang;
private final Builder _builder;

View File

@ -17440,7 +17440,7 @@ public class SystemMessageId
return "SM[" + getId() + ": " + getName() + "]";
}
public static final class SMLocalisation
public static class SMLocalisation
{
private final String _lang;
private final Builder _builder;

View File

@ -200,7 +200,7 @@ public class RequestProcureCropList implements ClientPacket
}
}
private final class CropHolder extends UniqueItemHolder
private class CropHolder extends UniqueItemHolder
{
private final int _manorId;
private CropProcure _cp;

View File

@ -122,7 +122,7 @@ public class RequestRestartPoint implements ClientPacket
portPlayer(player);
}
protected final void portPlayer(Player player)
protected void portPlayer(Player player)
{
Location loc = null;
Instance instance = null;

View File

@ -251,7 +251,7 @@ public class RequestItemEnsoul implements ClientPacket
item.updateDatabase(true);
}
static class EnsoulItemOption
private static class EnsoulItemOption
{
private final int _type;
private final int _position;

View File

@ -69,7 +69,7 @@ public class ServerStatus extends WritablePacket
public static final int ON = 0x01;
public static final int OFF = 0x00;
static class Attribute
private static class Attribute
{
public int id;
public int value;

View File

@ -48,7 +48,7 @@ public class ExSubjobInfo extends ServerPacket
}
}
private final class SubInfo
private class SubInfo
{
private final int _index;
private final int _classId;

View File

@ -62,7 +62,7 @@ public class SkillList extends ServerPacket
_lastLearnedSkillId = lastLearnedSkillId;
}
static class Skill
private static class Skill
{
public int id;
public int reuseDelayGroup;

View File

@ -32,7 +32,7 @@ import javax.tools.StandardJavaFileManager;
/**
* @author HorridoJoho
*/
final class ScriptingFileManager implements StandardJavaFileManager
public class ScriptingFileManager implements StandardJavaFileManager
{
private final StandardJavaFileManager _wrapped;
private final LinkedList<ScriptingOutputFileObject> _classOutputs = new LinkedList<>();

View File

@ -31,7 +31,7 @@ import javax.tools.JavaFileObject;
/**
* @author HorridoJoho
*/
final class ScriptingOutputFileObject implements JavaFileObject
public class ScriptingOutputFileObject implements JavaFileObject
{
private final Path _sourcePath;
private final String _javaName;

View File

@ -250,7 +250,7 @@ public class Evolve
return true;
}
static final class EvolveFeedWait implements Runnable
private static class EvolveFeedWait implements Runnable
{
private final Player _player;
private final Pet _petSummon;
@ -282,7 +282,7 @@ public class Evolve
}
}
static final class EvolveFinalizer implements Runnable
private static class EvolveFinalizer implements Runnable
{
private final Player _player;
private final Pet _petSummon;

View File

@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive;
/**
* @author HorridoJoho
*/
public final class GeoUtils
public class GeoUtils
{
public static void debug2DLine(Player player, int x, int y, int tx, int ty, int z)
{

View File

@ -224,7 +224,7 @@ public class MinionList
}
}
private final void spawnMinion(int minionId)
private void spawnMinion(int minionId)
{
if (minionId == 0)
{
@ -233,7 +233,7 @@ public class MinionList
spawnMinion(_master, minionId);
}
private final class MinionRespawnTask implements Runnable
private class MinionRespawnTask implements Runnable
{
private final Monster _minion;