Merge pull request #2 from manuelkollus/master

Clean code & update lombok dependency
LabyMod · Mar 9, 2019 · 394cfcd · 394cfcd
2 parents 95cfde7 + 1291efb
commit 394cfcd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 37 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
@@ -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() {
@@ -142,7 +141,7 @@ public void run() {
                             Bukkit.getPluginManager().callEvent( new MessageReceiveEvent( player, messageKey, jsonMessage ) );
                         }
                     } );
-                } catch ( RuntimeException ex ) {
+                } catch ( RuntimeException ignored ) {
                 }
             }
         } );
@@ -161,8 +160,7 @@ public void onDisable() {
      * @param player the player the permissions should be sent to
      */
     public void sendPermissions( Player player ) {
-        Map<Permission, Boolean> modifiedPermissions = new HashMap<>();
-        modifiedPermissions.putAll( labyModConfig.getPermissions() );
+        Map<Permission, Boolean> modifiedPermissions = new HashMap<>( labyModConfig.getPermissions() );
 
         // Calling the Bukkit event
         PermissionsSendEvent sendEvent = new PermissionsSendEvent( player, modifiedPermissions, false );
@@ -200,7 +198,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;

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
@@ -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<Permission, Boolean> permissions = new HashMap<Permission, Boolean>();
+    private Map<Permission, Boolean> permissions = new EnumMap<>( Permission.class );
     @Setter
     private boolean cancelled;
 

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
@@ -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();
-        }
-    }
-
-
 }
diff --git 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;
@@ -58,8 +57,7 @@ public void onEnable() {
      * @param player the player the permissions should be sent to
      */
     public void sendPermissions( ProxiedPlayer player ) {
-        Map<Permission, Boolean> modifiedPermissions = new HashMap<>();
-        modifiedPermissions.putAll( labyModConfig.getPermissions() );
+        Map<Permission, Boolean> modifiedPermissions = new HashMap<>( labyModConfig.getPermissions() );
 
         // Calling the Bukkit event
         PermissionsSendEvent sendEvent = new PermissionsSendEvent( player, modifiedPermissions, false );
@@ -97,7 +95,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;

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
@@ -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<Permission, Boolean> permissions = new HashMap<Permission, Boolean>();
+    private Map<Permission, Boolean> permissions = new EnumMap<>( Permission.class );
     @Setter
     private boolean cancelled;
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.12</version>
+            <version>1.18.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>