From 8d3d705fed2f111b5de217bcd4c2ae74ca557e4c Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 28 Jun 2021 14:35:57 +0200 Subject: [PATCH] Switch to commons-lang Pair instead of the ViaVersion one Cause that one will be removed in a future version, and the lang one is just fine. --- src/main/java/com/replaymod/editor/gui/MarkerProcessor.java | 6 +++--- .../java/com/replaymod/recording/gui/GuiSavingReplay.java | 2 +- .../java/com/replaymod/recording/packet/PacketListener.java | 4 ++-- src/main/java/com/replaymod/render/gui/GuiRenderQueue.java | 2 +- .../com/replaymod/replay/gui/screen/GuiReplayViewer.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/replaymod/editor/gui/MarkerProcessor.java b/src/main/java/com/replaymod/editor/gui/MarkerProcessor.java index 80e6494d..e3c40d5a 100644 --- a/src/main/java/com/replaymod/editor/gui/MarkerProcessor.java +++ b/src/main/java/com/replaymod/editor/gui/MarkerProcessor.java @@ -12,9 +12,9 @@ import com.replaymod.replaystudio.protocol.PacketTypeRegistry; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ReplayMetaData; import com.replaymod.replaystudio.stream.IteratorStream; -import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; import com.replaymod.replaystudio.util.Utils; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.tuple.Pair; import java.io.IOException; import java.io.InputStream; @@ -115,7 +115,7 @@ public class MarkerProcessor { try (ReplayFile inputReplayFile = mod.openReplay(path)) { metaData = inputReplayFile.getMetaData(); } - return Collections.singletonList(new Pair<>(path, metaData)); + return Collections.singletonList(Pair.of(path, metaData)); } String replayName = FilenameUtils.getBaseName(path.getFileName().toString()); @@ -249,7 +249,7 @@ public class MarkerProcessor { outputReplayFile.save(); - outputPaths.add(new Pair(outputPath, metaData)); + outputPaths.add(Pair.of(outputPath, metaData)); } } diff --git a/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java b/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java index 7f1a1238..5ca75e7e 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java +++ b/src/main/java/com/replaymod/recording/gui/GuiSavingReplay.java @@ -5,7 +5,6 @@ import com.replaymod.core.utils.Utils; import com.replaymod.recording.Setting; import com.replaymod.replay.gui.screen.GuiReplayViewer; import com.replaymod.replaystudio.replay.ReplayMetaData; -import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; import de.johni0702.minecraft.gui.container.AbstractGuiScreen; import de.johni0702.minecraft.gui.container.GuiContainer; import de.johni0702.minecraft.gui.container.GuiPanel; @@ -25,6 +24,7 @@ import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import net.minecraft.client.MinecraftClient; import net.minecraft.util.crash.CrashReport; +import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/replaymod/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java index 78dd21ec..2fafe7dc 100644 --- a/src/main/java/com/replaymod/recording/packet/PacketListener.java +++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java @@ -20,7 +20,6 @@ import com.replaymod.replaystudio.data.Marker; import com.replaymod.replaystudio.io.ReplayOutputStream; import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ReplayMetaData; -import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; import de.johni0702.minecraft.gui.container.VanillaGuiScreen; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -40,6 +39,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.text.LiteralText; import net.minecraft.util.crash.CrashReport; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -295,7 +295,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter { if (core.getSettingsRegistry().get(Setting.AUTO_POST_PROCESS) && !ReplayMod.isMinimalMode()) { outputPaths = MarkerProcessor.apply(outputPath, guiSavingReplay.getProgressBar()::setProgress); } else { - outputPaths = Collections.singletonList(new Pair<>(outputPath, metaData)); + outputPaths = Collections.singletonList(Pair.of(outputPath, metaData)); } } catch (Exception e) { logger.error("Saving replay file:", e); diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java index 7cd0a6cd..0ab59405 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java @@ -14,7 +14,6 @@ import com.replaymod.replay.ReplayModReplay; import com.replaymod.replay.ReplaySender; import com.replaymod.replaystudio.pathing.path.Timeline; import com.replaymod.replaystudio.replay.ReplayFile; -import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; import de.johni0702.minecraft.gui.GuiRenderer; import de.johni0702.minecraft.gui.RenderInfo; import de.johni0702.minecraft.gui.container.AbstractGuiClickableContainer; @@ -39,6 +38,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.util.crash.CrashReport; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.tuple.Pair; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java index 7e4ea045..7fe0e49f 100644 --- a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java +++ b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java @@ -4,7 +4,6 @@ import com.google.common.util.concurrent.SettableFuture; import com.replaymod.render.gui.GuiRenderQueue; import com.replaymod.render.rendering.VideoRenderer; import com.replaymod.render.utils.RenderJob; -import com.replaymod.replaystudio.us.myles.ViaVersion.api.Pair; import de.johni0702.minecraft.gui.GuiRenderer; import de.johni0702.minecraft.gui.RenderInfo; import de.johni0702.minecraft.gui.versions.Image; @@ -44,6 +43,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOCase; import org.apache.commons.io.filefilter.SuffixFileFilter; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import java.io.File; import java.io.FileFilter; @@ -103,7 +103,7 @@ public class GuiReplayViewer extends GuiScreen { } else { Iterator>> replays = selected.stream() .filter(it -> !it.renderQueue.isEmpty()) - .map(it -> new Pair<>(it.file, it.renderQueue)) + .map(it -> Pair.of(it.file, it.renderQueue)) .iterator(); GuiRenderQueue.processMultipleReplays(GuiReplayViewer.this, mod, replays, () -> { loading = false;