From 6d756942008dc11bff69920e0daa9ac88a9a0a8f Mon Sep 17 00:00:00 2001 From: joe Date: Sun, 13 Jul 2025 16:57:51 +0100 Subject: [PATCH] Update to unpick V3 --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../compass/storage/input/SimpleInputFileReader.java | 2 +- .../parchmentmc/compass/tasks/GenerateUnpickData.java | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 8b9d0a0..d34192e 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation 'net.minecraftforge:srgutils:0.5.4' implementation 'org.parchmentmc.feather:io-moshi:1.0.0.3' implementation 'com.google.guava:guava:33.4.0-jre' - implementation 'net.fabricmc.unpick:unpick-format-utils:2.3.0' + implementation 'net.fabricmc.unpick:unpick-format-utils:3.0.0-beta.8' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4' @@ -41,7 +41,7 @@ test { } java { - toolchain.languageVersion = JavaLanguageVersion.of(8) + toolchain.languageVersion = JavaLanguageVersion.of(21) withSourcesJar() withJavadocJar() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf01c4d..7705927 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java b/src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java index ff2b4f5..8137734 100644 --- a/src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java +++ b/src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java @@ -10,7 +10,7 @@ /** * Reader for a simple and quickly editable input file format. * - * @see ParchmentMC/Compass + * @see {@code ParchmentMC/Compass} * repository wiki, "Simple Input File Format" */ public class SimpleInputFileReader { diff --git a/src/main/java/org/parchmentmc/compass/tasks/GenerateUnpickData.java b/src/main/java/org/parchmentmc/compass/tasks/GenerateUnpickData.java index a692ab2..3fefd47 100644 --- a/src/main/java/org/parchmentmc/compass/tasks/GenerateUnpickData.java +++ b/src/main/java/org/parchmentmc/compass/tasks/GenerateUnpickData.java @@ -1,8 +1,8 @@ package org.parchmentmc.compass.tasks; import com.google.common.io.Files; -import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Reader; -import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Writer; +import daomephsta.unpick.constantmappers.datadriven.parser.v3.UnpickV3Reader; +import daomephsta.unpick.constantmappers.datadriven.parser.v3.UnpickV3Writer; import org.gradle.api.DefaultTask; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.RegularFileProperty; @@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskAction; import java.io.File; -import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -24,13 +24,13 @@ public void run() throws IOException { List files = new ArrayList<>(getInputDirectory().getAsFileTree().getFiles()); files.sort(Comparator.comparing(File::getName)); - UnpickV2Writer writer = new UnpickV2Writer(); + UnpickV3Writer writer = new UnpickV3Writer(); for (File file : files) { if (!file.getName().endsWith(".unpick")) { continue; } - try (UnpickV2Reader reader = new UnpickV2Reader(new FileInputStream(file))) { + try (UnpickV3Reader reader = new UnpickV3Reader(new FileReader(file))) { reader.accept(writer); } }