From f37d4063fb3e8fe4d5f1330f802cbfd9ab7e90f4 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 8 Apr 2021 07:33:52 +0200 Subject: [PATCH] cleanup: remove unnecessary interface modifiers --- .../client/AbstractCharacterListener.java | 8 ++++---- .../server/audit/locks/MonitoredReadLock.java | 8 ++++---- .../audit/locks/MonitoredReentrantLock.java | 8 ++++---- .../audit/locks/MonitoredWriteLock.java | 8 ++++---- .../AbstractMatchCheckerListener.java | 9 +++++---- .../MatchCheckerListenerRecipe.java | 2 +- .../server/services/SchedulerListener.java | 2 +- .../java/net/server/services/ServiceType.java | 6 +++--- src/main/java/provider/MapleData.java | 13 +++++++------ .../provider/MapleDataDirectoryEntry.java | 6 +++--- src/main/java/provider/MapleDataEntity.java | 4 ++-- src/main/java/provider/MapleDataEntry.java | 8 ++++---- .../java/provider/MapleDataFileEntry.java | 2 +- .../java/scripting/portal/PortalScript.java | 2 +- src/main/java/server/TimerManagerMBean.java | 12 ++++++------ .../java/server/life/MonsterListener.java | 6 +++--- src/main/java/server/maps/MapleMap.java | 4 ++-- src/main/java/server/maps/MapleMapObject.java | 19 ++++++++++--------- src/main/java/server/maps/MaplePortal.java | 13 +++++++------ .../tools/data/output/LittleEndianWriter.java | 14 +++++++------- 20 files changed, 79 insertions(+), 75 deletions(-) diff --git a/src/main/java/client/AbstractCharacterListener.java b/src/main/java/client/AbstractCharacterListener.java index 407a1d3461..eaa3da7227 100644 --- a/src/main/java/client/AbstractCharacterListener.java +++ b/src/main/java/client/AbstractCharacterListener.java @@ -24,8 +24,8 @@ package client; * @author Ronan */ public interface AbstractCharacterListener { - public void onHpChanged(int oldHp); - public void onHpmpPoolUpdate(); - public void onStatUpdate(); - public void onAnnounceStatPoolUpdate(); + void onHpChanged(int oldHp); + void onHpmpPoolUpdate(); + void onStatUpdate(); + void onAnnounceStatPoolUpdate(); } diff --git a/src/main/java/net/server/audit/locks/MonitoredReadLock.java b/src/main/java/net/server/audit/locks/MonitoredReadLock.java index c57c8da1fb..3cd5799ab6 100644 --- a/src/main/java/net/server/audit/locks/MonitoredReadLock.java +++ b/src/main/java/net/server/audit/locks/MonitoredReadLock.java @@ -25,12 +25,12 @@ package net.server.audit.locks; */ public interface MonitoredReadLock { - public void lock(); + void lock(); - public void unlock(); + void unlock(); - public boolean tryLock(); + boolean tryLock(); - public MonitoredReadLock dispose(); + MonitoredReadLock dispose(); } diff --git a/src/main/java/net/server/audit/locks/MonitoredReentrantLock.java b/src/main/java/net/server/audit/locks/MonitoredReentrantLock.java index 6a0e79fec2..9bd2323c62 100644 --- a/src/main/java/net/server/audit/locks/MonitoredReentrantLock.java +++ b/src/main/java/net/server/audit/locks/MonitoredReentrantLock.java @@ -25,12 +25,12 @@ package net.server.audit.locks; */ public interface MonitoredReentrantLock { - public void lock(); + void lock(); - public void unlock(); + void unlock(); - public boolean tryLock(); + boolean tryLock(); - public MonitoredReentrantLock dispose(); + MonitoredReentrantLock dispose(); } diff --git a/src/main/java/net/server/audit/locks/MonitoredWriteLock.java b/src/main/java/net/server/audit/locks/MonitoredWriteLock.java index 0a30d8187b..0c2bb39484 100644 --- a/src/main/java/net/server/audit/locks/MonitoredWriteLock.java +++ b/src/main/java/net/server/audit/locks/MonitoredWriteLock.java @@ -25,12 +25,12 @@ package net.server.audit.locks; */ public interface MonitoredWriteLock { - public void lock(); + void lock(); - public void unlock(); + void unlock(); - public boolean tryLock(); + boolean tryLock(); - public MonitoredWriteLock dispose(); + MonitoredWriteLock dispose(); } diff --git a/src/main/java/net/server/coordinator/matchchecker/AbstractMatchCheckerListener.java b/src/main/java/net/server/coordinator/matchchecker/AbstractMatchCheckerListener.java index f7b939fff3..21dce79c89 100644 --- a/src/main/java/net/server/coordinator/matchchecker/AbstractMatchCheckerListener.java +++ b/src/main/java/net/server/coordinator/matchchecker/AbstractMatchCheckerListener.java @@ -20,6 +20,7 @@ package net.server.coordinator.matchchecker; import client.MapleCharacter; + import java.util.Set; /** @@ -27,8 +28,8 @@ import java.util.Set; * @author Ronan */ public interface AbstractMatchCheckerListener { - public void onMatchCreated(MapleCharacter leader, Set nonLeaderMatchPlayers, String message); - public void onMatchAccepted(int leaderid, Set matchPlayers, String message); - public void onMatchDeclined(int leaderid, Set matchPlayers, String message); - public void onMatchDismissed(int leaderid, Set matchPlayers, String message); + void onMatchCreated(MapleCharacter leader, Set nonLeaderMatchPlayers, String message); + void onMatchAccepted(int leaderid, Set matchPlayers, String message); + void onMatchDeclined(int leaderid, Set matchPlayers, String message); + void onMatchDismissed(int leaderid, Set matchPlayers, String message); } diff --git a/src/main/java/net/server/coordinator/matchchecker/MatchCheckerListenerRecipe.java b/src/main/java/net/server/coordinator/matchchecker/MatchCheckerListenerRecipe.java index b9779009c1..8f8bf571d0 100644 --- a/src/main/java/net/server/coordinator/matchchecker/MatchCheckerListenerRecipe.java +++ b/src/main/java/net/server/coordinator/matchchecker/MatchCheckerListenerRecipe.java @@ -24,5 +24,5 @@ package net.server.coordinator.matchchecker; * @author Ronan */ public interface MatchCheckerListenerRecipe { - public AbstractMatchCheckerListener getListener(); + AbstractMatchCheckerListener getListener(); } diff --git a/src/main/java/net/server/services/SchedulerListener.java b/src/main/java/net/server/services/SchedulerListener.java index 975de08b19..6a3f9c8b52 100644 --- a/src/main/java/net/server/services/SchedulerListener.java +++ b/src/main/java/net/server/services/SchedulerListener.java @@ -26,5 +26,5 @@ import java.util.List; * @author Ronan */ public interface SchedulerListener { - public void removedScheduledEntries(List entries, boolean update); + void removedScheduledEntries(List entries, boolean update); } diff --git a/src/main/java/net/server/services/ServiceType.java b/src/main/java/net/server/services/ServiceType.java index 7d43fcdeb6..420c89e09e 100644 --- a/src/main/java/net/server/services/ServiceType.java +++ b/src/main/java/net/server/services/ServiceType.java @@ -24,7 +24,7 @@ package net.server.services; * @author Ronan */ public interface ServiceType > { - public abstract Service createService(); - public int ordinal(); - public T[] enumValues(); + Service createService(); + int ordinal(); + T[] enumValues(); } diff --git a/src/main/java/provider/MapleData.java b/src/main/java/provider/MapleData.java index 4d90a93804..0fd0a6883c 100644 --- a/src/main/java/provider/MapleData.java +++ b/src/main/java/provider/MapleData.java @@ -21,14 +21,15 @@ */ package provider; -import java.util.List; import provider.wz.MapleDataType; +import java.util.List; + public interface MapleData extends MapleDataEntity, Iterable { @Override - public String getName(); - public MapleDataType getType(); - public List getChildren(); - public MapleData getChildByPath(String path); - public Object getData(); + String getName(); + MapleDataType getType(); + List getChildren(); + MapleData getChildByPath(String path); + Object getData(); } diff --git a/src/main/java/provider/MapleDataDirectoryEntry.java b/src/main/java/provider/MapleDataDirectoryEntry.java index cb043e0c94..8760feb657 100644 --- a/src/main/java/provider/MapleDataDirectoryEntry.java +++ b/src/main/java/provider/MapleDataDirectoryEntry.java @@ -28,7 +28,7 @@ import java.util.List; * @author Matze */ public interface MapleDataDirectoryEntry extends MapleDataEntry { - public List getSubdirectories(); - public List getFiles(); - public MapleDataEntry getEntry(String name); + List getSubdirectories(); + List getFiles(); + MapleDataEntry getEntry(String name); } diff --git a/src/main/java/provider/MapleDataEntity.java b/src/main/java/provider/MapleDataEntity.java index 03ff77649c..3493587a74 100644 --- a/src/main/java/provider/MapleDataEntity.java +++ b/src/main/java/provider/MapleDataEntity.java @@ -26,6 +26,6 @@ package provider; * @author Matze */ public interface MapleDataEntity { - public String getName(); - public MapleDataEntity getParent(); + String getName(); + MapleDataEntity getParent(); } diff --git a/src/main/java/provider/MapleDataEntry.java b/src/main/java/provider/MapleDataEntry.java index 62db6d0abe..8ac8abadc9 100644 --- a/src/main/java/provider/MapleDataEntry.java +++ b/src/main/java/provider/MapleDataEntry.java @@ -26,8 +26,8 @@ package provider; * @author Matze */ public interface MapleDataEntry extends MapleDataEntity { - public String getName(); - public int getSize(); - public int getChecksum(); - public int getOffset(); + String getName(); + int getSize(); + int getChecksum(); + int getOffset(); } diff --git a/src/main/java/provider/MapleDataFileEntry.java b/src/main/java/provider/MapleDataFileEntry.java index 902130a612..41d76c322d 100644 --- a/src/main/java/provider/MapleDataFileEntry.java +++ b/src/main/java/provider/MapleDataFileEntry.java @@ -26,5 +26,5 @@ package provider; * @author Matze */ public interface MapleDataFileEntry extends MapleDataEntry { - public void setOffset(int offset); + void setOffset(int offset); } diff --git a/src/main/java/scripting/portal/PortalScript.java b/src/main/java/scripting/portal/PortalScript.java index b679ef5eb0..0b0f8e8a81 100644 --- a/src/main/java/scripting/portal/PortalScript.java +++ b/src/main/java/scripting/portal/PortalScript.java @@ -22,5 +22,5 @@ package scripting.portal; public interface PortalScript { - public boolean enter(PortalPlayerInteraction ppi); + boolean enter(PortalPlayerInteraction ppi); } \ No newline at end of file diff --git a/src/main/java/server/TimerManagerMBean.java b/src/main/java/server/TimerManagerMBean.java index 147b43b159..014d34dad5 100644 --- a/src/main/java/server/TimerManagerMBean.java +++ b/src/main/java/server/TimerManagerMBean.java @@ -22,10 +22,10 @@ package server; public interface TimerManagerMBean { - public boolean isTerminated(); - public boolean isShutdown(); - public long getCompletedTaskCount(); - public long getActiveCount(); - public long getTaskCount(); - public int getQueuedTasks(); + boolean isTerminated(); + boolean isShutdown(); + long getCompletedTaskCount(); + long getActiveCount(); + long getTaskCount(); + int getQueuedTasks(); } diff --git a/src/main/java/server/life/MonsterListener.java b/src/main/java/server/life/MonsterListener.java index f16f2103c3..9943ca42e6 100644 --- a/src/main/java/server/life/MonsterListener.java +++ b/src/main/java/server/life/MonsterListener.java @@ -3,7 +3,7 @@ import client.MapleCharacter; public interface MonsterListener { - public void monsterKilled(int aniTime); - public void monsterDamaged(MapleCharacter from, int trueDmg); - public void monsterHealed(int trueHeal); + void monsterKilled(int aniTime); + void monsterDamaged(MapleCharacter from, int trueDmg); + void monsterHealed(int trueHeal); } diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index a63bc74e78..2b121d4cdd 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -3665,12 +3665,12 @@ public class MapleMap { return retP + retI; } - private static interface DelayedPacketCreation { + private interface DelayedPacketCreation { void sendPackets(MapleClient c); } - private static interface SpawnCondition { + private interface SpawnCondition { boolean canSpawn(MapleCharacter chr); } diff --git a/src/main/java/server/maps/MapleMapObject.java b/src/main/java/server/maps/MapleMapObject.java index 70c12b3e2d..c12be33e11 100644 --- a/src/main/java/server/maps/MapleMapObject.java +++ b/src/main/java/server/maps/MapleMapObject.java @@ -21,16 +21,17 @@ */ package server.maps; -import java.awt.Point; import client.MapleClient; +import java.awt.*; + public interface MapleMapObject { - public int getObjectId(); - public void setObjectId(int id); - public MapleMapObjectType getType(); - public Point getPosition(); - public void setPosition(Point position); - public void sendSpawnData(MapleClient client); - public void sendDestroyData(MapleClient client); - public void nullifyPosition(); + int getObjectId(); + void setObjectId(int id); + MapleMapObjectType getType(); + Point getPosition(); + void setPosition(Point position); + void sendSpawnData(MapleClient client); + void sendDestroyData(MapleClient client); + void nullifyPosition(); } \ No newline at end of file diff --git a/src/main/java/server/maps/MaplePortal.java b/src/main/java/server/maps/MaplePortal.java index 1cc9af4e41..012cadeb82 100644 --- a/src/main/java/server/maps/MaplePortal.java +++ b/src/main/java/server/maps/MaplePortal.java @@ -21,15 +21,16 @@ */ package server.maps; -import java.awt.Point; import client.MapleClient; +import java.awt.*; + public interface MaplePortal { - public final int TELEPORT_PORTAL = 1; - public final int MAP_PORTAL = 2; - public final int DOOR_PORTAL = 6; - public static boolean OPEN = true; - public static boolean CLOSED = false; + int TELEPORT_PORTAL = 1; + int MAP_PORTAL = 2; + int DOOR_PORTAL = 6; + boolean OPEN = true; + boolean CLOSED = false; int getType(); int getId(); Point getPosition(); diff --git a/src/main/java/tools/data/output/LittleEndianWriter.java b/src/main/java/tools/data/output/LittleEndianWriter.java index a6216d5b7a..0ec260fbaf 100644 --- a/src/main/java/tools/data/output/LittleEndianWriter.java +++ b/src/main/java/tools/data/output/LittleEndianWriter.java @@ -38,44 +38,44 @@ public interface LittleEndianWriter { * * @param b The bytes to write. */ - public void write(byte[] b); + void write(byte[] b); /** * Write a byte to the sequence. * * @param b The byte to write. */ - public void write(byte b); + void write(byte b); /** * Write a byte in integer form to the sequence. * * @param b The byte as an Integer to write. */ - public void write(int b); + void write(int b); - public void skip(int b); + void skip(int b); /** * Writes an integer to the sequence. * * @param i The integer to write. */ - public void writeInt(int i); + void writeInt(int i); /** * Write a short integer to the sequence. * * @param s The short integer to write. */ - public void writeShort(int s); + void writeShort(int s); /** * Write a long integer to the sequence. * * @param l The long integer to write. */ - public void writeLong(long l); + void writeLong(long l); /** * Writes an ASCII string the the sequence.