From ad4e7b1fba93a9f4ca2de4cf2cae1078756b2a3f Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:07:27 +0100 Subject: [PATCH 1/9] Update lombok dependency to '1.18.6' --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7db78a7..b15aa93 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.projectlombok lombok - 1.16.12 + 1.18.6 provided From e085b439aa2588569266f3f3872274818f2bd91d Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:10:49 +0100 Subject: [PATCH 2/9] Make variable to constant attribute --- .../java/net/labymod/serverapi/bungee/LabyModPlugin.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java b/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java index 7d96b6f..9cf4140 100644 --- a/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java +++ b/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java @@ -27,8 +27,7 @@ public class LabyModPlugin extends Plugin { @Getter private static LabyModPlugin instance; - @Getter - private final static JsonParser jsonParser = new JsonParser(); + private static final JsonParser JSON_PARSER = new JsonParser(); @Getter private LabyModConfig labyModConfig; @@ -97,7 +96,7 @@ public void sendServerMessage( ProxiedPlayer player, String messageKey, JsonElem */ public JsonElement cloneJson( JsonElement cloneElement ) { try { - return jsonParser.parse( cloneElement.toString() ); + return JSON_PARSER.parse( cloneElement.toString() ); } catch ( JsonParseException ex ) { ex.printStackTrace(); return null; From 7f30673a4e353ff189143e1a9501cca1020055a8 Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:12:08 +0100 Subject: [PATCH 3/9] Use the parameterized constructor --- .../main/java/net/labymod/serverapi/bungee/LabyModPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java b/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java index 9cf4140..b0c6166 100644 --- a/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java +++ b/bungeecord/src/main/java/net/labymod/serverapi/bungee/LabyModPlugin.java @@ -57,8 +57,7 @@ public void onEnable() { * @param player the player the permissions should be sent to */ public void sendPermissions( ProxiedPlayer player ) { - Map modifiedPermissions = new HashMap<>(); - modifiedPermissions.putAll( labyModConfig.getPermissions() ); + Map modifiedPermissions = new HashMap<>( labyModConfig.getPermissions() ); // Calling the Bukkit event PermissionsSendEvent sendEvent = new PermissionsSendEvent( player, modifiedPermissions, false ); From 2ccfaa1f8b5b90e4f6a461c7d48d6411c0be16db Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:13:49 +0100 Subject: [PATCH 4/9] Make variable to constant attribute --- .../java/net/labymod/serverapi/bukkit/LabyModPlugin.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java b/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java index a217500..5814568 100644 --- a/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java +++ b/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java @@ -35,8 +35,7 @@ public class LabyModPlugin extends JavaPlugin { @Getter private static LabyModPlugin instance; - @Getter - private final static JsonParser jsonParser = new JsonParser(); + private static final JsonParser JSON_PARSER = new JsonParser(); @Getter private LabyModConfig labyModConfig; @@ -103,7 +102,7 @@ public void onPluginMessageReceived( String channel, final Player player, byte[] // Reading the message key final String messageKey = api.readString( buf, Short.MAX_VALUE ); final String messageContents = api.readString( buf, Short.MAX_VALUE ); - final JsonElement jsonMessage = jsonParser.parse( messageContents ); + final JsonElement jsonMessage = JSON_PARSER.parse( messageContents ); // Calling the event synchronously Bukkit.getScheduler().runTask( LabyModPlugin.this, new Runnable() { @@ -200,7 +199,7 @@ public void sendServerMessage( Player player, String messageKey, JsonElement mes */ public JsonElement cloneJson( JsonElement cloneElement ) { try { - return jsonParser.parse( cloneElement.toString() ); + return JSON_PARSER.parse( cloneElement.toString() ); } catch ( JsonParseException ex ) { ex.printStackTrace(); return null; From 6c2771733824afb022e41d36c001f48f10939010 Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:15:48 +0100 Subject: [PATCH 5/9] Use an ignored exception --- .../main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java b/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java index 5814568..8f0f611 100644 --- a/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java +++ b/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java @@ -141,7 +141,7 @@ public void run() { Bukkit.getPluginManager().callEvent( new MessageReceiveEvent( player, messageKey, jsonMessage ) ); } } ); - } catch ( RuntimeException ex ) { + } catch ( RuntimeException ignored ) { } } } ); From 4e714a1322638eaa8adf012f0e457bed0d89639f Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:16:32 +0100 Subject: [PATCH 6/9] Use an parameterized constructor --- .../main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java b/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java index 8f0f611..7692a9f 100644 --- a/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java +++ b/bukkit/src/main/java/net/labymod/serverapi/bukkit/LabyModPlugin.java @@ -160,8 +160,7 @@ public void onDisable() { * @param player the player the permissions should be sent to */ public void sendPermissions( Player player ) { - Map modifiedPermissions = new HashMap<>(); - modifiedPermissions.putAll( labyModConfig.getPermissions() ); + Map modifiedPermissions = new HashMap<>( labyModConfig.getPermissions() ); // Calling the Bukkit event PermissionsSendEvent sendEvent = new PermissionsSendEvent( player, modifiedPermissions, false ); From 9ab4d1359be93a3b7a02d0fe7259cc15a882cf37 Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 10:17:41 +0100 Subject: [PATCH 7/9] Remove unnecessary 'setField' method --- .../serverapi/bukkit/utils/PacketUtils.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/bukkit/src/main/java/net/labymod/serverapi/bukkit/utils/PacketUtils.java b/bukkit/src/main/java/net/labymod/serverapi/bukkit/utils/PacketUtils.java index 6a5a4bc..c63634e 100644 --- a/bukkit/src/main/java/net/labymod/serverapi/bukkit/utils/PacketUtils.java +++ b/bukkit/src/main/java/net/labymod/serverapi/bukkit/utils/PacketUtils.java @@ -156,24 +156,4 @@ public Object getPluginMessagePacket( String channel, byte[] bytes ) { public Class getNmsClass( String nmsClassName ) throws ClassNotFoundException { return Class.forName( "net.minecraft.server." + version + "." + nmsClassName ); } - - /** - * Sets a field's value - * - * @param targetObject the target object - * @param fieldName the field's name - * @param value the value - */ - public void setField( Object targetObject, String fieldName, Object value ) { - try { - Field field = targetObject.getClass().getDeclaredField( fieldName ); - field.setAccessible( true ); - - field.set( targetObject, value ); - } catch ( Exception ex ) { - ex.printStackTrace(); - } - } - - } From 5195217de44013ba2873c436a1eec43a7990e1ed Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 11:04:10 +0100 Subject: [PATCH 8/9] Use the 'EnumMap' instead of 'HashMap' --- .../labymod/serverapi/bukkit/event/PermissionsSendEvent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/net/labymod/serverapi/bukkit/event/PermissionsSendEvent.java b/bukkit/src/main/java/net/labymod/serverapi/bukkit/event/PermissionsSendEvent.java index 6949e6e..995fd62 100644 --- a/bukkit/src/main/java/net/labymod/serverapi/bukkit/event/PermissionsSendEvent.java +++ b/bukkit/src/main/java/net/labymod/serverapi/bukkit/event/PermissionsSendEvent.java @@ -9,7 +9,7 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Map; /** @@ -23,7 +23,7 @@ public class PermissionsSendEvent extends Event implements Cancellable { private final static HandlerList handlerList = new HandlerList(); private Player player; - private Map permissions = new HashMap(); + private Map permissions = new EnumMap<>( Permission.class ); @Setter private boolean cancelled; From 1291efbf0fb52e9131fc75b84500f7bb8bc18bb7 Mon Sep 17 00:00:00 2001 From: Manuel Kollus Date: Sat, 9 Mar 2019 11:04:41 +0100 Subject: [PATCH 9/9] Use the 'EnumMap' instead of 'HashMap' --- .../labymod/serverapi/bungee/event/PermissionsSendEvent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bungeecord/src/main/java/net/labymod/serverapi/bungee/event/PermissionsSendEvent.java b/bungeecord/src/main/java/net/labymod/serverapi/bungee/event/PermissionsSendEvent.java index c37aa00..1d11945 100644 --- a/bungeecord/src/main/java/net/labymod/serverapi/bungee/event/PermissionsSendEvent.java +++ b/bungeecord/src/main/java/net/labymod/serverapi/bungee/event/PermissionsSendEvent.java @@ -9,7 +9,7 @@ import net.md_5.bungee.api.plugin.Cancellable; import net.md_5.bungee.api.plugin.Event; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Map; /** @@ -21,7 +21,7 @@ public class PermissionsSendEvent extends Event implements Cancellable { private ProxiedPlayer player; - private Map permissions = new HashMap(); + private Map permissions = new EnumMap<>( Permission.class ); @Setter private boolean cancelled;