Skip to content

Commit 6d75694

Browse files
committed
Update to unpick V3
1 parent 6679a4b commit 6d75694

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation 'net.minecraftforge:srgutils:0.5.4'
3131
implementation 'org.parchmentmc.feather:io-moshi:1.0.0.3'
3232
implementation 'com.google.guava:guava:33.4.0-jre'
33-
implementation 'net.fabricmc.unpick:unpick-format-utils:2.3.0'
33+
implementation 'net.fabricmc.unpick:unpick-format-utils:3.0.0-beta.8'
3434

3535
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
3636
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
@@ -41,7 +41,7 @@ test {
4141
}
4242

4343
java {
44-
toolchain.languageVersion = JavaLanguageVersion.of(8)
44+
toolchain.languageVersion = JavaLanguageVersion.of(21)
4545
withSourcesJar()
4646
withJavadocJar()
4747
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Reader for a simple and quickly editable input file format.
1212
*
13-
* @see <a href="https://github.com/ParchmentMC/Compass/wiki/Simple-Input-File-Format"><tt>ParchmentMC/Compass</tt>
13+
* @see <a href="https://github.com/ParchmentMC/Compass/wiki/Simple-Input-File-Format">{@code ParchmentMC/Compass}
1414
* repository wiki, "Simple Input File Format"</a>
1515
*/
1616
public class SimpleInputFileReader {

src/main/java/org/parchmentmc/compass/tasks/GenerateUnpickData.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.parchmentmc.compass.tasks;
22

33
import com.google.common.io.Files;
4-
import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Reader;
5-
import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Writer;
4+
import daomephsta.unpick.constantmappers.datadriven.parser.v3.UnpickV3Reader;
5+
import daomephsta.unpick.constantmappers.datadriven.parser.v3.UnpickV3Writer;
66
import org.gradle.api.DefaultTask;
77
import org.gradle.api.file.DirectoryProperty;
88
import org.gradle.api.file.RegularFileProperty;
@@ -11,7 +11,7 @@
1111
import org.gradle.api.tasks.TaskAction;
1212

1313
import java.io.File;
14-
import java.io.FileInputStream;
14+
import java.io.FileReader;
1515
import java.io.IOException;
1616
import java.nio.charset.StandardCharsets;
1717
import java.util.ArrayList;
@@ -24,13 +24,13 @@ public void run() throws IOException {
2424
List<File> files = new ArrayList<>(getInputDirectory().getAsFileTree().getFiles());
2525
files.sort(Comparator.comparing(File::getName));
2626

27-
UnpickV2Writer writer = new UnpickV2Writer();
27+
UnpickV3Writer writer = new UnpickV3Writer();
2828
for (File file : files) {
2929
if (!file.getName().endsWith(".unpick")) {
3030
continue;
3131
}
3232

33-
try (UnpickV2Reader reader = new UnpickV2Reader(new FileInputStream(file))) {
33+
try (UnpickV3Reader reader = new UnpickV3Reader(new FileReader(file))) {
3434
reader.accept(writer);
3535
}
3636
}

0 commit comments

Comments
 (0)