From ca15e9310275d4426870ff3673b0d6d3ffe1b486 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Sun, 26 Sep 2021 00:48:50 +0200
Subject: [PATCH] refactor: Remove lz4-stream

LZ4-Java contains a modern version & delegate for lz4-java-stream.
---
 worldedit-bukkit/build.gradle.kts                     |  6 +-----
 worldedit-cli/build.gradle.kts                        |  1 -
 worldedit-core/build.gradle.kts                       |  1 -
 .../com/fastasyncworldedit/core/util/MainUtil.java    | 11 +----------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
index d8687de59..bda214f3a 100644
--- a/worldedit-bukkit/build.gradle.kts
+++ b/worldedit-bukkit/build.gradle.kts
@@ -100,13 +100,12 @@ dependencies {
         because("This dependency is needed by GriefDefender but not exposed transitively.")
         isTransitive = false
     }
-    implementation(libs.paperlib) { isTransitive = false }
+    implementation(libs.paperlib)
     implementation(libs.bstatsBukkit) { isTransitive = false }
     implementation(libs.bstatsBase) { isTransitive = false }
     implementation(libs.serverlib)
     api(libs.paster) { isTransitive = false }
     api(libs.lz4Java) { isTransitive = false }
-    runtimeOnly(libs.lz4JavaStream) { isTransitive = false }
     api(libs.sparsebitset) { isTransitive = false }
     api(libs.parallelgzip) { isTransitive = false }
     compileOnly(libs.adventure)
@@ -171,9 +170,6 @@ tasks.named<ShadowJar>("shadowJar") {
         relocate("com.intellectualsites.paster", "com.fastasyncworldedit.paster") {
             include(dependency("com.intellectualsites.paster:Paster:1.1.1"))
         }
-        relocate("net.jpountz", "com.fastasyncworldedit.core.jpountz") {
-            include(dependency("net.jpountz:lz4-java-stream:1.0.0"))
-        }
         relocate("org.lz4", "com.fastasyncworldedit.core.lz4") {
             include(dependency("org.lz4:lz4-java:1.8.0"))
         }
diff --git a/worldedit-cli/build.gradle.kts b/worldedit-cli/build.gradle.kts
index b7ff08dff..e1336b144 100644
--- a/worldedit-cli/build.gradle.kts
+++ b/worldedit-cli/build.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
     implementation("commons-cli:commons-cli:1.4")
     api(libs.parallelgzip) { isTransitive = false }
     api(libs.lz4Java)
-    api(libs.lz4JavaStream) { isTransitive = false }
 }
 
 tasks.named<ShadowJar>("shadowJar") {
diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts
index 5fa79ffbe..3d73c711b 100644
--- a/worldedit-core/build.gradle.kts
+++ b/worldedit-core/build.gradle.kts
@@ -55,7 +55,6 @@ dependencies {
     implementation(libs.zstd) { isTransitive = false }
     api(libs.paster)
     compileOnly(libs.lz4Java) { isTransitive = false }
-    compileOnly(libs.lz4JavaStream) { isTransitive = false }
     compileOnly(libs.sparsebitset)
     compileOnly(libs.parallelgzip) { isTransitive = false }
     antlr(libs.antlr4)
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
index 457f24a75..1c22d8699 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
@@ -31,7 +31,6 @@ import net.jpountz.lz4.LZ4BlockOutputStream;
 import net.jpountz.lz4.LZ4Compressor;
 import net.jpountz.lz4.LZ4Factory;
 import net.jpountz.lz4.LZ4FastDecompressor;
-import net.jpountz.lz4.LZ4InputStream;
 import org.apache.logging.log4j.Logger;
 
 import javax.annotation.Nonnull;
@@ -360,12 +359,8 @@ public class MainUtil {
         if (mode == 0) {
             return new FaweInputStream(is);
         }
-        boolean legacy;
         if (mode >= 10) {
-            legacy = false;
             mode = -mode + 10;
-        } else {
-            legacy = true;
         }
         if (mode == 0) {
             return new FaweInputStream(is);
@@ -380,11 +375,7 @@ public class MainUtil {
         }
         amountAbs = (1 + ((amountAbs - 1) % 3)) + (amountAbs > 3 ? 1 : 0);
         for (int i = 0; i < amountAbs; i++) {
-            if (legacy) {
-                is = new LZ4InputStream(is);
-            } else {
-                is = new LZ4BlockInputStream(is);
-            }
+            is = new LZ4BlockInputStream(is);
         }
         return new FaweInputStream(new FastBufferedInputStream(is));
     }