Use cool new java 16 stuff

duncte123 · duncte123 · commit 7a0c2bd34a6a · 2021-05-21T09:57:20.000+02:00
diff --git a/src/main/java/ml/duncte123/skybot/ShardWatcher.java b/src/main/java/ml/duncte123/skybot/ShardWatcher.java
@@ -58,8 +58,8 @@ public class ShardWatcher implements EventListener {
 
     @Override
     public void onEvent(@Nonnull GenericEvent event) {
-        if (event instanceof GatewayPingEvent) {
-            this.onGatewayPing((GatewayPingEvent) event);
+        if (event instanceof GatewayPingEvent pingEvent) {
+            this.onGatewayPing(pingEvent);
         }
     }
 
diff --git a/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java b/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -120,8 +120,8 @@ public void playlistLoaded(AudioPlaylist playlist) {
             if (this.announce) {
                 final String sizeMsg;
 
-                if (playlist instanceof BigChungusPlaylist && ((BigChungusPlaylist) playlist).isBig()) {
-                    sizeMsg = playlist.getTracks().size() + "/" + ((BigChungusPlaylist) playlist).getOriginalSize();
+                if (playlist instanceof BigChungusPlaylist bigBoi && bigBoi.isBig()) {
+                    sizeMsg = playlist.getTracks().size() + "/" + bigBoi.getOriginalSize();
                 } else {
                     sizeMsg = String.valueOf(playlist.getTracks().size());
                 }
@@ -153,8 +153,7 @@ public void noMatches() {
     @Override
     public void loadFailed(FriendlyException exception) {
 
-        if (exception.getCause() != null && exception.getCause() instanceof LimitReachedException) {
-            final LimitReachedException cause = (LimitReachedException) exception.getCause();
+        if (exception.getCause() != null && exception.getCause() instanceof final LimitReachedException cause) {
             sendMsg(this.ctx, String.format("%s, maximum of %d tracks exceeded", cause.getMessage(), cause.getSize()));
 
             return;
diff --git a/src/main/java/ml/duncte123/skybot/audio/UserContextAudioPlayerManager.java b/src/main/java/ml/duncte123/skybot/audio/UserContextAudioPlayerManager.java
diff --git a/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java b/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java
@@ -98,7 +98,7 @@ public String getSourceName() {
 
     @Override
     public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
-        final boolean isPatron = reference instanceof DBAudioRef && ((DBAudioRef) reference).isPatron();
+        final boolean isPatron = reference instanceof DBAudioRef dbRef && dbRef.isPatron();
 
         return loadItem(reference, isPatron);
     }
@@ -176,12 +176,10 @@ private AudioItem getSpotifyPlaylist(AudioReference reference, boolean isPatron)
                 final IPlaylistItem item = playlistTrack.getTrack();
 
                 // playlist item can either be a track or podcast episode
-                if (!(item instanceof Track)) {
+                if (!(item instanceof final Track track)) {
                     continue;
                 }
 
-                final Track track = (Track) item;
-
                 finalPlaylist.add(buildTrack(track));
             }
 
diff --git a/src/main/java/ml/duncte123/skybot/commands/essentials/WolframAlphaCommand.java b/src/main/java/ml/duncte123/skybot/commands/essentials/WolframAlphaCommand.java
@@ -82,29 +82,24 @@ private MessageEmbed generateEmbed(CommandContext ctx, WAQueryResult result, Str
                 builder.append(parseString(sp.getTitle()));
                 //loop over the contents
                 for (final Visitable variable : sp.getContents()) {
-                    if (variable instanceof WAImage) {
-                        final WAImage image = (WAImage) variable;
+                    if (variable instanceof final WAImage image) {
                         builder.append("[Image by text](")
                             .append(shortenUrl(image.getURL(), googleKey, mapper).execute())
                             .append(')');
-                    } else if (variable instanceof WAInfo) {
-                        final WAInfo info = (WAInfo) variable;
+                    } else if (variable instanceof final WAInfo info) {
                         builder.append(parseString(info.getText()));
                         //System.out.println(i.getText());
                         //Ramid when?
                         // TODO: Display more...
-                    } else if (variable instanceof WALink) {
-                        final WALink link = (WALink) variable;
+                    } else if (variable instanceof final WALink link) {
                         builder.append('[')
                             .append(parseString(link.getText()))
                             .append("](")
                             .append(shortenUrl(link.getURL(), googleKey, mapper).execute())
                             .append(')');
-                    } else if (variable instanceof WAPlainText) {
-                        final WAPlainText plainText = (WAPlainText) variable;
+                    } else if (variable instanceof final WAPlainText plainText) {
                         builder.append(parseString(plainText.getText()));
-                    } else if (variable instanceof WASound) {
-                        final WASound sound = (WASound) variable;
+                    } else if (variable instanceof final WASound sound) {
                         builder.append(shortenUrl(sound.getURL(), googleKey, mapper).execute());
                     }
 
diff --git a/src/main/java/ml/duncte123/skybot/commands/guild/mod/CleanupCommand.java b/src/main/java/ml/duncte123/skybot/commands/guild/mod/CleanupCommand.java
@@ -220,14 +220,10 @@ private int handleMessages(List<Message> msgs, boolean keepPinned, boolean clear
     }
 
     private <T> T checkException(T value, Throwable thr) {
-        if (thr instanceof ErrorResponseException) {
-            final ErrorResponseException exception = (ErrorResponseException) thr;
-
+        if (thr instanceof final ErrorResponseException exception && exception.getErrorResponse() == ErrorResponse.UNKNOWN_MESSAGE) {
             // Ignore unknown messages
-            if (exception.getErrorResponse() == ErrorResponse.UNKNOWN_MESSAGE) {
-                LOGGER.debug("Recovering from unknown message");
-                return null;
-            }
+            LOGGER.debug("Recovering from unknown message");
+            return null;
         }
 
         return value;
diff --git a/src/main/java/ml/duncte123/skybot/commands/guild/mod/HackbanCommand.java b/src/main/java/ml/duncte123/skybot/commands/guild/mod/HackbanCommand.java
@@ -103,8 +103,8 @@ public void execute(@Nonnull CommandContext ctx) {
                 ctx.getGuild().ban(finalId, 0, reason)
                     .reason(reason)
                     .queue(null, (thr) -> {
-                        if (thr instanceof ErrorResponseException) {
-                            sendMsg(ctx, "Could not ban `" + finalId + "`, reason: " + ((ErrorResponseException) thr).getMeaning());
+                        if (thr instanceof ErrorResponseException err) {
+                            sendMsg(ctx, "Could not ban `" + finalId + "`, reason: " + err.getMeaning());
                         } else {
                             RestActionImpl.getDefaultFailure().accept(thr);
                         }
diff --git a/src/main/java/ml/duncte123/skybot/listeners/GuildMemberListener.java b/src/main/java/ml/duncte123/skybot/listeners/GuildMemberListener.java
@@ -74,18 +74,18 @@ public GuildMemberListener(Variables variables) {
 
     @Override
     public void onEvent(@Nonnull GenericEvent event) {
-        if (event instanceof GuildMemberJoinEvent) {
-            this.onGuildMemberJoin((GuildMemberJoinEvent) event);
-        } else if (event instanceof GuildMemberUpdatePendingEvent) {
-            this.onGuildMemberUpdatePending((GuildMemberUpdatePendingEvent) event);
-        } else if (event instanceof GuildMemberRemoveEvent) {
-            this.onGuildMemberRemove((GuildMemberRemoveEvent) event);
-        } else if (event instanceof GuildMemberRoleRemoveEvent) {
-            this.onGuildMemberRoleRemove((GuildMemberRoleRemoveEvent) event);
-        } else if (event instanceof GuildMemberRoleAddEvent) {
-            this.onGuildMemberRoleAdd((GuildMemberRoleAddEvent) event);
-        } else if (event instanceof GuildLeaveEvent) {
-            final Guild guild = ((GuildLeaveEvent) event).getGuild();
+        if (event instanceof GuildMemberJoinEvent memberJoin) {
+            this.onGuildMemberJoin(memberJoin);
+        } else if (event instanceof GuildMemberUpdatePendingEvent pendingUpdate) {
+            this.onGuildMemberUpdatePending(pendingUpdate);
+        } else if (event instanceof GuildMemberRemoveEvent memberRemove) {
+            this.onGuildMemberRemove(memberRemove);
+        } else if (event instanceof GuildMemberRoleRemoveEvent roleRemove) {
+            this.onGuildMemberRoleRemove(roleRemove);
+        } else if (event instanceof GuildMemberRoleAddEvent roleAdd) {
+            this.onGuildMemberRoleAdd(roleAdd);
+        } else if (event instanceof GuildLeaveEvent guildLeave) {
+            final Guild guild = guildLeave.getGuild();
             final long guildId = guild.getIdLong();
 
             // invites are cleared by the invite listener
diff --git a/src/main/java/ml/duncte123/skybot/listeners/InviteTrackingListener.java b/src/main/java/ml/duncte123/skybot/listeners/InviteTrackingListener.java
@@ -59,11 +59,11 @@ public void onEvent(@NotNull GenericEvent event) {
 
         // events that we always want to handle no mater what (has to do with cleanup)
         // return in both cases so the code stops here
-        if (event instanceof GuildInviteDeleteEvent) {
-            this.onGuildInviteDelete((GuildInviteDeleteEvent) event);
+        if (event instanceof GuildInviteDeleteEvent inviteDelete) {
+            this.onGuildInviteDelete(inviteDelete);
             return;
-        } else if (event instanceof GuildLeaveEvent) {
-            this.onGuildLeave((GuildLeaveEvent) event);
+        } else if (event instanceof GuildLeaveEvent leaveEvent) {
+            this.onGuildLeave(leaveEvent);
             return;
         }
 
@@ -73,15 +73,15 @@ public void onEvent(@NotNull GenericEvent event) {
             return;
         }
 
-        if (event instanceof GuildInviteCreateEvent) {
-            this.onGuildInviteCreate((GuildInviteCreateEvent) event);
-        } else if (event instanceof GuildMemberJoinEvent) {
-            this.onGuildMemberJoin((GuildMemberJoinEvent) event);
-        } else if (event instanceof GuildReadyEvent) {
-            this.onGuildReady((GuildReadyEvent) event);
-        } else if (event instanceof GuildJoinEvent) {
+        if (event instanceof GuildInviteCreateEvent inviteCreate) {
+            this.onGuildInviteCreate(inviteCreate);
+        } else if (event instanceof GuildMemberJoinEvent memberJoin) {
+            this.onGuildMemberJoin(memberJoin);
+        } else if (event instanceof GuildReadyEvent guildReady) {
+            this.onGuildReady(guildReady);
+        } else if (event instanceof GuildJoinEvent guildJoin) {
             // probably not needed, doubt that any guilds will be patreon guilds on join
-            this.onGuildJoin((GuildJoinEvent) event);
+            this.onGuildJoin(guildJoin);
         }
     }
 
diff --git a/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java b/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
@@ -55,12 +55,12 @@ public ReadyShutdownListener(Variables variables) {
 
     @Override
     public void onEvent(@Nonnull GenericEvent event) {
-        if (event instanceof GuildMessageUpdateEvent) {
-            this.onGuildMessageUpdate((GuildMessageUpdateEvent) event);
-        } else if (event instanceof GuildMessageReceivedEvent) {
-            this.onGuildMessageReceived((GuildMessageReceivedEvent) event);
-        } else if (event instanceof ReadyEvent) {
-            this.onReady((ReadyEvent) event);
+        if (event instanceof GuildMessageUpdateEvent messageUpdate) {
+            this.onGuildMessageUpdate(messageUpdate);
+        } else if (event instanceof GuildMessageReceivedEvent messageReceived) {
+            this.onGuildMessageReceived(messageReceived);
+        } else if (event instanceof ReadyEvent ready) {
+            this.onReady(ready);
         } else if (event instanceof ShutdownEvent) {
             this.onShutdown();
         }

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ public class ShardWatcher implements EventListener {`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public void onEvent(@Nonnull GenericEvent event) {`
`61`		`- if (event instanceof GatewayPingEvent) {`
`62`		`- this.onGatewayPing((GatewayPingEvent) event);`
	`61`	`+ if (event instanceof GatewayPingEvent pingEvent) {`
	`62`	`+ this.onGatewayPing(pingEvent);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public String getSourceName() {`
`98`	`98`
`99`	`99`	`@Override`
`100`	`100`	`public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {`
`101`		`- final boolean isPatron = reference instanceof DBAudioRef && ((DBAudioRef) reference).isPatron();`
	`101`	`+ final boolean isPatron = reference instanceof DBAudioRef dbRef && dbRef.isPatron();`
`102`	`102`
`103`	`103`	`return loadItem(reference, isPatron);`
`104`	`104`	`}`
`@@ -176,12 +176,10 @@ private AudioItem getSpotifyPlaylist(AudioReference reference, boolean isPatron)`
`176`	`176`	`final IPlaylistItem item = playlistTrack.getTrack();`
`177`	`177`
`178`	`178`	`// playlist item can either be a track or podcast episode`
`179`		`- if (!(item instanceof Track)) {`
	`179`	`+ if (!(item instanceof final Track track)) {`
`180`	`180`	`continue;`
`181`	`181`	`}`
`182`	`182`
`183`		`- final Track track = (Track) item;`
`184`		`-`
`185`	`183`	`finalPlaylist.add(buildTrack(track));`
`186`	`184`	`}`
`187`	`185`