diff --git a/build.gradle.kts b/build.gradle.kts index 32cd1a3..eaf2397 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -112,7 +112,7 @@ val shade: Configuration by configurations.creating { dependencies { val elementaPlatform: String? by project val universalPlatform: String? by project - val universalVersion = if (platform.isNeoForge || (platform.isForge && platform.mcVersion == 12101)) + val universalVersion = if (platform.isNeoForge || (platform.isForge && platform.mcVersion >= 12101)) "363+diamond.neoforge" else libs.versions.universal.get() if (platform.isFabric) { val fabricApiVersion: String by project diff --git a/changelog.md b/changelog.md index ebd661e..55aab9a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,7 @@ ## Resourcify 1.5.1 + +- Added support for 1.21.3 neoforge and forge! (Note: at the time of writing kotlin for forge does not have a version + marked as compatible for 1.21.3, but **kotlin for forge 5.6.0 seems to work for 1.21.3**) - Fixed a crash when opening the changelog of a project in the update screen - Fixed a crash caused by a project having an invalid image URL diff --git a/root.gradle.kts b/root.gradle.kts index b71aff5..39f6467 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -32,6 +32,7 @@ preprocess { val forge12001 = createNode("1.20.1-forge", 12001, "srg") val forge12004 = createNode("1.20.4-forge", 12004, "srg") val forge12101 = createNode("1.21.1-forge", 12101, "srg") + val forge12103 = createNode("1.21.3-forge", 12103, "srg") val neoforge12004 = createNode("1.20.4-neoforge", 12004, "srg") val neoforge12006 = createNode("1.20.6-neoforge", 12006, "srg") @@ -56,6 +57,7 @@ preprocess { forge12001.link(fabric12001) forge12004.link(forge12001) forge12101.link(fabric12101) + forge12103.link(fabric12103) neoforge12004.link(forge12004) neoforge12006.link(fabric12006) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8f51d23..8cde75b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -69,6 +69,7 @@ listOf( "1.21.1-forge", "1.21.1-neoforge", "1.21.1-fabric", + "1.21.3-forge", "1.21.3-neoforge", "1.21.3-fabric", ).forEach { version -> diff --git a/versions/1.21.3-forge/gradle.properties b/versions/1.21.3-forge/gradle.properties new file mode 100644 index 0000000..e910e04 --- /dev/null +++ b/versions/1.21.3-forge/gradle.properties @@ -0,0 +1,6 @@ +kotlinForForgeVersion=5.3.0 +# Use neoforge versions for normal forge since forge 1.21+ uses normal mojmap like neo +elementaPlatform=1.20.4-neoforge +universalPlatform=1.21.3-neoforge + +essential.defaults.loom.forge=net.minecraftforge:forge:1.21.3-53.0.9 \ No newline at end of file diff --git a/versions/1.21.3-forge/src/main/resources/META-INF/accesstransformer.cfg b/versions/1.21.3-forge/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..fcdd67c --- /dev/null +++ b/versions/1.21.3-forge/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,2 @@ +public net.minecraft.server.packs.FilePackResources$SharedZipFileAccess +public net.minecraft.server.packs.FilePackResources$SharedZipFileAccess file \ No newline at end of file diff --git a/versions/1.21.3-forge/src/main/resources/resourcify.accesswidener b/versions/1.21.3-forge/src/main/resources/resourcify.accesswidener new file mode 100644 index 0000000..30871b1 --- /dev/null +++ b/versions/1.21.3-forge/src/main/resources/resourcify.accesswidener @@ -0,0 +1,4 @@ +accessWidener v2 named + +accessible class net/minecraft/server/packs/FilePackResources$SharedZipFileAccess +accessible field net/minecraft/server/packs/FilePackResources$SharedZipFileAccess file Ljava/io/File; \ No newline at end of file