From 2b09194bd8ea0aeadf49f66cc9c24403d2870abe Mon Sep 17 00:00:00 2001 From: Davide Albiero Date: Wed, 3 Apr 2024 20:52:13 +0200 Subject: [PATCH 1/5] Update dependency_hashes.txt --- src/main/generated_resources/dependency_hashes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/generated_resources/dependency_hashes.txt b/src/main/generated_resources/dependency_hashes.txt index 9707ead..bf4f280 100644 --- a/src/main/generated_resources/dependency_hashes.txt +++ b/src/main/generated_resources/dependency_hashes.txt @@ -3,7 +3,7 @@ ch.qos.logback:logback-classic=d98bc162275134cdf1518774da4a2a17ef6fb94d # 1.4.14 org.eclipse.jgit:org.eclipse.jgit=7c20a9bda8a767b1bab3a2ecab384cd416e3093e # 6.4.0.202211300538-r net.sf.jopt-simple:jopt-simple=02ab1a73e1e22d2b73469362a0908a98644b681d # 6.0-alpha-3 com.google.code.gson:gson=b3add478d4382b78ea20b1671390a858002feb6c # 2.10.1 -net.neoforged:srgutils=b9fe6cdab494983217cbc14cc6f92c8e6c616526 # 1.0.0 +net.neoforged:srgutils=06b0bae582bfe3a7b2bd9a1163c878bfb80b5463 # 1.0.1 org.vineflower:vineflower=d6b7b39735d956810bd16c2492bdc68b4cd0d2dd # 1.9.3 net.neoforged.installertools:installertools=72524c0362f812d8aa4cdb4c03e9b45e2b71ae3b # 2.1.2 net.neoforged:AutoRenamingTool=4ce226e2eba71b421a4704cf567eb10aa40038cd # 1.0.9 From 4e822ca441e79600177ec173af5505a5521b2b9a Mon Sep 17 00:00:00 2001 From: Davide Albiero Date: Wed, 3 Apr 2024 21:04:48 +0200 Subject: [PATCH 2/5] Use neoforged srgutils --- src/main/java/net/neoforged/snowblower/Main.java | 2 +- src/main/java/net/neoforged/snowblower/data/Config.java | 2 +- src/main/java/net/neoforged/snowblower/data/Version.java | 2 +- .../java/net/neoforged/snowblower/data/VersionManifestV2.java | 2 +- src/main/java/net/neoforged/snowblower/tasks/MappingTask.java | 2 +- src/main/java/net/neoforged/snowblower/tasks/MergeTask.java | 2 +- src/main/java/net/neoforged/snowblower/tasks/init/InitTask.java | 2 +- src/main/java/net/neoforged/snowblower/util/Util.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/neoforged/snowblower/Main.java b/src/main/java/net/neoforged/snowblower/Main.java index c1d6afd..b888260 100644 --- a/src/main/java/net/neoforged/snowblower/Main.java +++ b/src/main/java/net/neoforged/snowblower/Main.java @@ -11,7 +11,7 @@ import net.neoforged.snowblower.data.Config.BranchSpec; import net.neoforged.snowblower.util.DependencyHashCache; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.MinecraftVersion; +import net.neoforged.srgutils.MinecraftVersion; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.transport.CredentialsProvider; diff --git a/src/main/java/net/neoforged/snowblower/data/Config.java b/src/main/java/net/neoforged/snowblower/data/Config.java index 1010ba7..6f61924 100644 --- a/src/main/java/net/neoforged/snowblower/data/Config.java +++ b/src/main/java/net/neoforged/snowblower/data/Config.java @@ -12,7 +12,7 @@ import java.util.Map; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.MinecraftVersion; +import net.neoforged.srgutils.MinecraftVersion; public record Config(Map branches) { public static Config load(Path file) throws IOException { diff --git a/src/main/java/net/neoforged/snowblower/data/Version.java b/src/main/java/net/neoforged/snowblower/data/Version.java index e9bdc37..790062a 100644 --- a/src/main/java/net/neoforged/snowblower/data/Version.java +++ b/src/main/java/net/neoforged/snowblower/data/Version.java @@ -5,7 +5,7 @@ package net.neoforged.snowblower.data; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.MinecraftVersion; +import net.neoforged.srgutils.MinecraftVersion; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/net/neoforged/snowblower/data/VersionManifestV2.java b/src/main/java/net/neoforged/snowblower/data/VersionManifestV2.java index 8ef9e38..35d5058 100644 --- a/src/main/java/net/neoforged/snowblower/data/VersionManifestV2.java +++ b/src/main/java/net/neoforged/snowblower/data/VersionManifestV2.java @@ -5,7 +5,7 @@ package net.neoforged.snowblower.data; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.MinecraftVersion; +import net.neoforged.srgutils.MinecraftVersion; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/net/neoforged/snowblower/tasks/MappingTask.java b/src/main/java/net/neoforged/snowblower/tasks/MappingTask.java index 96be8a5..70423a7 100644 --- a/src/main/java/net/neoforged/snowblower/tasks/MappingTask.java +++ b/src/main/java/net/neoforged/snowblower/tasks/MappingTask.java @@ -16,7 +16,7 @@ import net.neoforged.snowblower.data.Version; import net.neoforged.snowblower.util.Cache; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.IMappingFile; +import net.neoforged.srgutils.IMappingFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/neoforged/snowblower/tasks/MergeTask.java b/src/main/java/net/neoforged/snowblower/tasks/MergeTask.java index 96fc6ac..a421517 100644 --- a/src/main/java/net/neoforged/snowblower/tasks/MergeTask.java +++ b/src/main/java/net/neoforged/snowblower/tasks/MergeTask.java @@ -15,7 +15,7 @@ import net.neoforged.snowblower.util.DependencyHashCache; import net.neoforged.snowblower.util.Tools; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.IMappingFile; +import net.neoforged.srgutils.IMappingFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/neoforged/snowblower/tasks/init/InitTask.java b/src/main/java/net/neoforged/snowblower/tasks/init/InitTask.java index 17045dc..d8201b4 100644 --- a/src/main/java/net/neoforged/snowblower/tasks/init/InitTask.java +++ b/src/main/java/net/neoforged/snowblower/tasks/init/InitTask.java @@ -31,7 +31,7 @@ import net.neoforged.snowblower.Generator; import net.neoforged.snowblower.Main; import net.neoforged.snowblower.util.Util; -import net.minecraftforge.srgutils.MinecraftVersion; +import net.neoforged.srgutils.MinecraftVersion; public class InitTask { private static final String COMMIT_MESSAGE = "Initial commit"; diff --git a/src/main/java/net/neoforged/snowblower/util/Util.java b/src/main/java/net/neoforged/snowblower/util/Util.java index 79636f2..44fb2a3 100644 --- a/src/main/java/net/neoforged/snowblower/util/Util.java +++ b/src/main/java/net/neoforged/snowblower/util/Util.java @@ -41,7 +41,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializer; -import net.minecraftforge.srgutils.MinecraftVersion; +import net.neoforged.srgutils.MinecraftVersion; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 38930a817262bb3f75e636fbd9be366a8a43b38c Mon Sep 17 00:00:00 2001 From: Davide Albiero Date: Wed, 3 Apr 2024 21:11:07 +0200 Subject: [PATCH 3/5] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index bb721d7..17c15c6 100644 --- a/build.gradle +++ b/build.gradle @@ -139,6 +139,7 @@ license { header = file('LICENSE-header.txt') newLine = false exclude '**/*.properties' + exclude '**/*.xml' skipExistingHeaders true } From 37e6b618850bbac39487d3e237f6b61951ae9501 Mon Sep 17 00:00:00 2001 From: Davide Albiero Date: Wed, 3 Apr 2024 21:37:04 +0200 Subject: [PATCH 4/5] Use ART 2.0.0 --- build.gradle | 2 +- src/main/generated_resources/dependency_hashes.txt | 2 +- src/main/java/net/neoforged/snowblower/Generator.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 17c15c6..00124e6 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ dependencies { shade 'net.neoforged:srgutils:1.0.1' shade 'org.vineflower:vineflower:1.9.3' shade 'net.neoforged.installertools:installertools:2.1.2' - shade 'net.neoforged:AutoRenamingTool:1.0.9' + shade 'net.neoforged:AutoRenamingTool:2.0.0' shade 'net.neoforged:mergetool:2.0.1' shade 'org.bouncycastle:bcpkix-jdk15on:1.58' diff --git a/src/main/generated_resources/dependency_hashes.txt b/src/main/generated_resources/dependency_hashes.txt index bf4f280..98cc9dd 100644 --- a/src/main/generated_resources/dependency_hashes.txt +++ b/src/main/generated_resources/dependency_hashes.txt @@ -6,7 +6,7 @@ com.google.code.gson:gson=b3add478d4382b78ea20b1671390a858002feb6c # 2.10.1 net.neoforged:srgutils=06b0bae582bfe3a7b2bd9a1163c878bfb80b5463 # 1.0.1 org.vineflower:vineflower=d6b7b39735d956810bd16c2492bdc68b4cd0d2dd # 1.9.3 net.neoforged.installertools:installertools=72524c0362f812d8aa4cdb4c03e9b45e2b71ae3b # 2.1.2 -net.neoforged:AutoRenamingTool=4ce226e2eba71b421a4704cf567eb10aa40038cd # 1.0.9 +net.neoforged:AutoRenamingTool=2eb671208b76ebca796c0275c1c06775c8848053 # 2.0.0 net.neoforged:mergetool=f7a5b66d537e472878af90421cb4699bd1e4c580 # 2.0.1 org.bouncycastle:bcpkix-jdk15on=15a760a039b040e767a75c77ffcc4ff62558f903 # 1.58 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml=9363ded5441b1fee62d5be0604035690ca759a2a # 2.13.3 diff --git a/src/main/java/net/neoforged/snowblower/Generator.java b/src/main/java/net/neoforged/snowblower/Generator.java index 0b50357..2e3418e 100644 --- a/src/main/java/net/neoforged/snowblower/Generator.java +++ b/src/main/java/net/neoforged/snowblower/Generator.java @@ -4,11 +4,11 @@ */ package net.neoforged.snowblower; -import net.minecraftforge.fart.api.IdentifierFixerConfig; -import net.minecraftforge.fart.api.Renamer; -import net.minecraftforge.fart.api.SignatureStripperConfig; -import net.minecraftforge.fart.api.SourceFixerConfig; -import net.minecraftforge.fart.api.Transformer; +import net.neoforged.art.api.IdentifierFixerConfig; +import net.neoforged.art.api.Renamer; +import net.neoforged.art.api.SignatureStripperConfig; +import net.neoforged.art.api.SourceFixerConfig; +import net.neoforged.art.api.Transformer; import net.neoforged.snowblower.data.Config; import net.neoforged.snowblower.data.Config.BranchSpec; import net.neoforged.snowblower.data.Version; From 72ec72c2e16e3cb6ddb804b2f1140838a23a05f8 Mon Sep 17 00:00:00 2001 From: Davide Albiero Date: Wed, 3 Apr 2024 21:46:15 +0200 Subject: [PATCH 5/5] Update mergetool --- build.gradle | 2 +- src/main/generated_resources/dependency_hashes.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 00124e6..820d709 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { shade 'org.vineflower:vineflower:1.9.3' shade 'net.neoforged.installertools:installertools:2.1.2' shade 'net.neoforged:AutoRenamingTool:2.0.0' - shade 'net.neoforged:mergetool:2.0.1' + shade 'net.neoforged:mergetool:2.0.5' shade 'org.bouncycastle:bcpkix-jdk15on:1.58' shade 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3' diff --git a/src/main/generated_resources/dependency_hashes.txt b/src/main/generated_resources/dependency_hashes.txt index 98cc9dd..30293ea 100644 --- a/src/main/generated_resources/dependency_hashes.txt +++ b/src/main/generated_resources/dependency_hashes.txt @@ -7,7 +7,7 @@ net.neoforged:srgutils=06b0bae582bfe3a7b2bd9a1163c878bfb80b5463 # 1.0.1 org.vineflower:vineflower=d6b7b39735d956810bd16c2492bdc68b4cd0d2dd # 1.9.3 net.neoforged.installertools:installertools=72524c0362f812d8aa4cdb4c03e9b45e2b71ae3b # 2.1.2 net.neoforged:AutoRenamingTool=2eb671208b76ebca796c0275c1c06775c8848053 # 2.0.0 -net.neoforged:mergetool=f7a5b66d537e472878af90421cb4699bd1e4c580 # 2.0.1 +net.neoforged:mergetool=d892e1148009e2d63f59b92c77d1fc619f01189c # 2.0.5 org.bouncycastle:bcpkix-jdk15on=15a760a039b040e767a75c77ffcc4ff62558f903 # 1.58 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml=9363ded5441b1fee62d5be0604035690ca759a2a # 2.13.3 io.jsonwebtoken:jjwt-api=f742940045619d06383e7df37b21ac422b476cf1 # 0.11.5