ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

project: Modernizer

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-13 05:35:29 +02:00
parent b4c9c99b09
commit bb77015c90
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -44,7 +44,7 @@ plugins {
id("com.github.ben-manes.versions") version "0.28.0" id("com.github.ben-manes.versions") version "0.28.0"
id("se.patrikerdes.use-latest-versions") version "0.2.14" id("se.patrikerdes.use-latest-versions") version "0.2.14"
id("org.ajoberstar.grgit") version "4.0.2" 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 application
} }

3
runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
View File

@@ -31,6 +31,7 @@ import java.io.FileInputStream;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.time.Instant; import java.time.Instant;
import java.util.UUID; import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
@@ -121,7 +122,7 @@ public class SessionManager
return; return;
} }
try (FileWriter fw = new FileWriter(SESSION_FILE)) try (FileWriter fw = new FileWriter(SESSION_FILE, StandardCharsets.UTF_8))
{ {
new Gson().toJson(accountSession, fw); new Gson().toJson(accountSession, fw);

5
runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
View File

@@ -24,7 +24,6 @@
*/ */
package net.runelite.client.chat; package net.runelite.client.chat;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
@@ -581,8 +580,8 @@ public class ChatMessageManager
// this updates chat cycle // this updates chat cycle
client.addChatMessage( client.addChatMessage(
message.getType(), message.getType(),
MoreObjects.firstNonNull(message.getName(), ""), Objects.requireNonNullElse(message.getName(), ""),
MoreObjects.firstNonNull(message.getValue(), message.getRuneLiteFormattedMessage()), Objects.requireNonNullElse(message.getValue(), message.getRuneLiteFormattedMessage()),
message.getSender()); message.getSender());
// Get last message from line buffer (the one we just added) // Get last message from line buffer (the one we just added)

4
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -24,7 +24,6 @@
*/ */
package net.runelite.client.ui.overlay; package net.runelite.client.ui.overlay;
import com.google.common.base.MoreObjects;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import java.awt.Color; import java.awt.Color;
import java.awt.Composite; import java.awt.Composite;
@@ -42,6 +41,7 @@ import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
@@ -679,7 +679,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
return; return;
} }
final Dimension dimension = MoreObjects.firstNonNull(overlayDimension, new Dimension()); final Dimension dimension = Objects.requireNonNullElse(overlayDimension, new Dimension());
overlay.getBounds().setSize(dimension); overlay.getBounds().setSize(dimension);
} }

6
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java
View File

@@ -24,7 +24,6 @@
*/ */
package net.runelite.client.ui.overlay.components; package net.runelite.client.ui.overlay.components;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@@ -32,6 +31,7 @@ import java.awt.FontMetrics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Point; import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Objects;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -64,8 +64,8 @@ public class LineComponent implements LayoutableRenderableEntity
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
// Prevent NPEs // Prevent NPEs
final String left = MoreObjects.firstNonNull(this.left, ""); final String left = Objects.requireNonNullElse(this.left, "");
final String right = MoreObjects.firstNonNull(this.right, ""); final String right = Objects.requireNonNullElse(this.right, "");
final FontMetrics metrics = graphics.getFontMetrics(); final FontMetrics metrics = graphics.getFontMetrics();
final int baseX = preferredLocation.x; final int baseX = preferredLocation.x;