From 007af7613f3aeb03fb0b9640d886f86a6c018689 Mon Sep 17 00:00:00 2001 From: Basique Date: Fri, 26 Jul 2024 16:24:16 +0300 Subject: [PATCH] update to newest mapping-io this should fix issues with other mods bundling newer versions of it --- gradle.properties | 2 +- .../gadget/mappings/IntermediaryLoader.java | 4 ++-- .../wispforest/gadget/mappings/MojangMappings.java | 12 ++++++------ .../io/wispforest/gadget/mappings/QuiltMappings.java | 10 +++++----- .../io/wispforest/gadget/mappings/YarnMappings.java | 4 ++-- src/main/resources/fabric.mod.json | 3 ++- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5a577d7..3ff0826 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xmx1G modmenu_version=11.0.1 rei_version=16.0.729 fabric_perms_api=0.3.1 - mapping_io=0.4.2 + mapping_io=0.6.1 auoeke_result=0.4.1 auoeke_unsafe=1.7.3 auoeke_reflect=6.3.0 diff --git a/src/main/java/io/wispforest/gadget/mappings/IntermediaryLoader.java b/src/main/java/io/wispforest/gadget/mappings/IntermediaryLoader.java index ee2d69c..d054711 100644 --- a/src/main/java/io/wispforest/gadget/mappings/IntermediaryLoader.java +++ b/src/main/java/io/wispforest/gadget/mappings/IntermediaryLoader.java @@ -3,7 +3,7 @@ import io.wispforest.gadget.util.ProgressToast; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.MappingVisitor; -import net.fabricmc.mappingio.format.Tiny2Reader; +import net.fabricmc.mappingio.format.tiny.Tiny2FileReader; import net.minecraft.SharedConstants; import net.minecraft.text.Text; import org.apache.commons.io.FileUtils; @@ -45,7 +45,7 @@ public static void loadIntermediary(ProgressToast toast, MappingVisitor visitor) try (FileSystem fs = FileSystems.newFileSystem(intermediaryPath, (ClassLoader) null); BufferedReader br = Files.newBufferedReader(fs.getPath("mappings/mappings.tiny"))) { - Tiny2Reader.read(br, visitor); + Tiny2FileReader.read(br, visitor); } } } diff --git a/src/main/java/io/wispforest/gadget/mappings/MojangMappings.java b/src/main/java/io/wispforest/gadget/mappings/MojangMappings.java index eb591e3..22a1b06 100644 --- a/src/main/java/io/wispforest/gadget/mappings/MojangMappings.java +++ b/src/main/java/io/wispforest/gadget/mappings/MojangMappings.java @@ -7,9 +7,9 @@ import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch; -import net.fabricmc.mappingio.format.ProGuardReader; -import net.fabricmc.mappingio.format.Tiny2Reader; -import net.fabricmc.mappingio.format.Tiny2Writer; +import net.fabricmc.mappingio.format.proguard.ProGuardFileReader; +import net.fabricmc.mappingio.format.tiny.Tiny2FileReader; +import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.minecraft.SharedConstants; import net.minecraft.text.Text; @@ -34,7 +34,7 @@ protected void load(ProgressToast toast, MappingVisitor visitor) { if (Files.exists(mojPath)) { try (BufferedReader br = Files.newBufferedReader(mojPath)) { - Tiny2Reader.read(br, visitor); + Tiny2FileReader.read(br, visitor); return; } } @@ -70,7 +70,7 @@ protected void load(ProgressToast toast, MappingVisitor visitor) { readProGuardInto(toast, JsonHelper.getString(serverMappings, "url"), sw); try (BufferedWriter bw = Files.newBufferedWriter(mojPath)) { - tree.accept(new Tiny2Writer(bw, false)); + tree.accept(new Tiny2FileWriter(bw, false)); } tree.accept(visitor); @@ -81,7 +81,7 @@ protected void load(ProgressToast toast, MappingVisitor visitor) { private void readProGuardInto(ProgressToast toast, String url, MappingVisitor visitor) throws IOException { try (var is = toast.loadWithProgress(new URL(url))) { - ProGuardReader.read(new InputStreamReader(new BufferedInputStream(is)), "named", "official", visitor); + ProGuardFileReader.read(new InputStreamReader(new BufferedInputStream(is)), "named", "official", visitor); } } } diff --git a/src/main/java/io/wispforest/gadget/mappings/QuiltMappings.java b/src/main/java/io/wispforest/gadget/mappings/QuiltMappings.java index af1772c..2071fa6 100644 --- a/src/main/java/io/wispforest/gadget/mappings/QuiltMappings.java +++ b/src/main/java/io/wispforest/gadget/mappings/QuiltMappings.java @@ -26,8 +26,8 @@ import io.wispforest.gadget.util.ProgressToast; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.MappingVisitor; -import net.fabricmc.mappingio.format.Tiny2Reader; -import net.fabricmc.mappingio.format.Tiny2Writer; +import net.fabricmc.mappingio.format.tiny.Tiny2FileReader; +import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.minecraft.SharedConstants; import net.minecraft.text.Text; @@ -54,7 +54,7 @@ protected void load(ProgressToast toast, MappingVisitor visitor) { if (Files.exists(qmPath)) { try (BufferedReader br = Files.newBufferedReader(qmPath)) { - Tiny2Reader.read(br, visitor); + Tiny2FileReader.read(br, visitor); return; } } @@ -91,11 +91,11 @@ protected void load(ProgressToast toast, MappingVisitor visitor) { toast.step(Text.translatable("message.gadget.progress.downloading_qm")); try (var is = toast.loadWithProgress(url); var gz = new GZIPInputStream(is)) { - Tiny2Reader.read(new InputStreamReader(gz), tree); + Tiny2FileReader.read(new InputStreamReader(gz), tree); } try (var bw = Files.newBufferedWriter(qmPath)) { - tree.accept(new Tiny2Writer(bw, false)); + tree.accept(new Tiny2FileWriter(bw, false)); } tree.accept(visitor); diff --git a/src/main/java/io/wispforest/gadget/mappings/YarnMappings.java b/src/main/java/io/wispforest/gadget/mappings/YarnMappings.java index 55c5b3d..f07c5a9 100644 --- a/src/main/java/io/wispforest/gadget/mappings/YarnMappings.java +++ b/src/main/java/io/wispforest/gadget/mappings/YarnMappings.java @@ -26,7 +26,7 @@ import io.wispforest.gadget.util.ProgressToast; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.MappingVisitor; -import net.fabricmc.mappingio.format.Tiny2Reader; +import net.fabricmc.mappingio.format.tiny.Tiny2FileReader; import net.minecraft.SharedConstants; import net.minecraft.text.Text; import org.apache.commons.io.FileUtils; @@ -76,7 +76,7 @@ protected void load(ProgressToast toast, MappingVisitor visitor) { try (FileSystem fs = FileSystems.newFileSystem(yarnPath, (ClassLoader) null)) { try (var br = Files.newBufferedReader(fs.getPath("mappings/mappings.tiny"))) { - Tiny2Reader.read(br, visitor); + Tiny2FileReader.read(br, visitor); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d7919a2..823f65e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -53,6 +53,7 @@ "minecraft": ">=1.21", "java": ">=17", "owo": ">=0.11.1", - "fabric-permissions-api-v0": ">=0.3.1" + "fabric-permissions-api-v0": ">=0.3.1", + "mapping-io": ">=0.6.1" } }