diff --git a/build.gradle.kts b/build.gradle.kts
index d3f412bc8b..66d5e23e03 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,7 +44,7 @@ plugins {
     id("com.github.ben-manes.versions") version "0.28.0"
     id("se.patrikerdes.use-latest-versions") version "0.2.14"
     id("org.ajoberstar.grgit") version "4.0.2"
-    id("com.simonharrer.modernizer") version "1.8.0-1" apply false
+    id("com.simonharrer.modernizer") version "2.1.0-1" apply false
 
     application
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
index 4fd8760d59..aab916d608 100644
--- a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
@@ -31,6 +31,7 @@ import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.UUID;
 import javax.inject.Inject;
@@ -121,7 +122,7 @@ public class SessionManager
 			return;
 		}
 
-		try (FileWriter fw = new FileWriter(SESSION_FILE))
+		try (FileWriter fw = new FileWriter(SESSION_FILE, StandardCharsets.UTF_8))
 		{
 			new Gson().toJson(accountSession, fw);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
index d9920e6497..44b2004770 100644
--- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
@@ -24,7 +24,6 @@
  */
 package net.runelite.client.chat;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -581,8 +580,8 @@ public class ChatMessageManager
 		// this updates chat cycle
 		client.addChatMessage(
 			message.getType(),
-			MoreObjects.firstNonNull(message.getName(), ""),
-			MoreObjects.firstNonNull(message.getValue(), message.getRuneLiteFormattedMessage()),
+			Objects.requireNonNullElse(message.getName(), ""),
+			Objects.requireNonNullElse(message.getValue(), message.getRuneLiteFormattedMessage()),
 			message.getSender());
 
 		// Get last message from line buffer (the one we just added)
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
index 4568f902bb..dbd5f607c3 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
@@ -24,7 +24,6 @@
  */
 package net.runelite.client.ui.overlay;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.primitives.Ints;
 import java.awt.Color;
 import java.awt.Composite;
@@ -42,6 +41,7 @@ import java.awt.event.MouseEvent;
 import java.awt.geom.AffineTransform;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
@@ -679,7 +679,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 			return;
 		}
 
-		final Dimension dimension = MoreObjects.firstNonNull(overlayDimension, new Dimension());
+		final Dimension dimension = Objects.requireNonNullElse(overlayDimension, new Dimension());
 		overlay.getBounds().setSize(dimension);
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java
index 754b0f441c..2f11f3b4b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java
@@ -24,7 +24,6 @@
  */
 package net.runelite.client.ui.overlay.components;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -32,6 +31,7 @@ import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.util.Objects;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -64,8 +64,8 @@ public class LineComponent implements LayoutableRenderableEntity
 	public Dimension render(Graphics2D graphics)
 	{
 		// Prevent NPEs
-		final String left = MoreObjects.firstNonNull(this.left, "");
-		final String right = MoreObjects.firstNonNull(this.right, "");
+		final String left = Objects.requireNonNullElse(this.left, "");
+		final String right = Objects.requireNonNullElse(this.right, "");
 
 		final FontMetrics metrics = graphics.getFontMetrics();
 		final int baseX = preferredLocation.x;