Skip to content

Commit f298a56

Browse files
committed
Set compression level
Minor cleanups Bump ASM
1 parent b6fa390 commit f298a56

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

settings.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ dependencyResolutionManagement {
2020
library('nulls', 'org.jetbrains:annotations:24.0.1')
2121
library('powermock', 'org.powermock:powermock-core:2.0.9')
2222

23-
version('asm', '9.7')
23+
version('asm', '9.7.1')
2424
library('asm', 'org.ow2.asm', 'asm' ).versionRef('asm')
2525
library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm')
2626
library('asm-tree', 'org.ow2.asm', 'asm-tree' ).versionRef('asm')
2727
bundle('asm', ['asm', 'asm-commons', 'asm-tree'])
28-
29-
version('junit', '5.10.1')
30-
library('junit-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
31-
library('junit-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
32-
library('junit-platform-launcher', 'org.junit.platform:junit-platform-launcher:1.10.1')
33-
bundle('junit-runtime', ['junit-engine', 'junit-platform-launcher'])
28+
29+
version('junit', '5.10.1')
30+
library('junit-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
31+
library('junit-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
32+
library('junit-platform-launcher', 'org.junit.platform:junit-platform-launcher:1.10.1')
33+
bundle('junit-runtime', ['junit-engine', 'junit-platform-launcher'])
3434
}
3535
}
3636
}

src/main/java/net/minecraftforge/fart/Main.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public static void main(String[] args) throws IOException {
6161
};
6262
if (options.has(logO)) {
6363
PrintStream out = System.out;
64+
@SuppressWarnings("resource")
6465
PrintStream file = new PrintStream(new FileOutputStream(options.valueOf(logO)));
6566
log = ln -> {
6667
if (!ln.isEmpty()) {

src/main/java/net/minecraftforge/fart/internal/EnhancedClassRemapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9+
910
import org.objectweb.asm.ClassVisitor;
1011
import org.objectweb.asm.Handle;
1112
import org.objectweb.asm.Label;

src/main/java/net/minecraftforge/fart/internal/RenamerImpl.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.Collections;
1212
import java.util.HashSet;
1313
import java.util.List;
14-
import java.util.Objects;
1514
import java.util.Set;
1615
import java.util.function.Consumer;
1716
import java.util.stream.Collectors;
@@ -37,6 +36,7 @@ class RenamerImpl implements Renamer {
3736
private final List<ClassProvider> classProviders;
3837
private final int threads;
3938
private final Consumer<String> logger;
39+
@SuppressWarnings("unused")
4040
private final Consumer<String> debug;
4141
private boolean setup = false;
4242
private ClassProvider libraryClasses;
@@ -70,12 +70,16 @@ public void run(File input, File output) {
7070
if (!this.setup)
7171
this.setup();
7272

73-
input = Objects.requireNonNull(input).getAbsoluteFile();
74-
output = Objects.requireNonNull(output).getAbsoluteFile();
75-
73+
if (input == null)
74+
throw new IllegalArgumentException("input argument can't be null");
75+
if (output == null)
76+
throw new IllegalArgumentException("output argument can't be null");
7677
if (!input.exists())
7778
throw new IllegalArgumentException("Input file not found: " + input.getAbsolutePath());
7879

80+
input = input.getAbsoluteFile();
81+
output = output.getAbsoluteFile();
82+
7983
logger.accept("Reading Input: " + input.getAbsolutePath());
8084
// Read everything from the input jar!
8185
List<Entry> oldEntries = new ArrayList<>();
@@ -159,6 +163,9 @@ else if (name.equals(MANIFEST_NAME))
159163
logger.accept("Writing Output: " + output.getAbsolutePath());
160164
try (FileOutputStream fos = new FileOutputStream(output);
161165
ZipOutputStream zos = new ZipOutputStream(fos)) {
166+
// Explicitly set compression level because of potential differences based on environment.
167+
// See https://github.com/MinecraftForge/JarSplitter/pull/2
168+
zos.setLevel(6);
162169

163170
for (Entry e : newEntries) {
164171
String name = e.getName();

src/main/java/net/minecraftforge/fart/internal/RenamingTransformer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package net.minecraftforge.fart.internal;
66

77
import java.nio.charset.StandardCharsets;
8-
import java.util.Arrays;
98
import java.util.Collection;
109
import java.util.Collections;
1110
import java.util.Set;

0 commit comments

Comments
 (0)