From 9244c450e5cacd0a99d1837a5b84a24fb41ff4b9 Mon Sep 17 00:00:00 2001
From: Max <56853437+exejar@users.noreply.github.com>
Date: Sat, 15 Apr 2023 13:34:14 -0400
Subject: [PATCH 01/29] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 078fb12..0053c22 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@
---
+### Fork renamed 'minecraft' extension to 'weavecraft' to prevent conflict with other modding libraries
+
A Gradle build system plugin used to automate the setup of a Weave modding environment.
### Usage
From 3d1d410629917787bf8716a5d330183e657667ef Mon Sep 17 00:00:00 2001
From: Max <56853437+exejar@users.noreply.github.com>
Date: Sat, 15 Apr 2023 13:34:35 -0400
Subject: [PATCH 02/29] Update README.md
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 0053c22..cb5cc54 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+### Fork renamed 'minecraft' extension to 'weavecraft' to prevent conflict with other modding libraries
+
+---
+
Date: Sat, 15 Apr 2023 13:35:08 -0400
Subject: [PATCH 03/29] Update WeavePlugin.kt
---
src/main/kotlin/club/maxstats/weave/WeavePlugin.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/kotlin/club/maxstats/weave/WeavePlugin.kt b/src/main/kotlin/club/maxstats/weave/WeavePlugin.kt
index 640c3a2..a12fa91 100644
--- a/src/main/kotlin/club/maxstats/weave/WeavePlugin.kt
+++ b/src/main/kotlin/club/maxstats/weave/WeavePlugin.kt
@@ -29,7 +29,7 @@ class WeavePlugin : Plugin {
project.repositories.mavenCentral()
project.repositories.mavenLocal()
- val ext = project.extensions.create("minecraft", WeaveMinecraftExtension::class)
+ val ext = project.extensions.create("weavecraft", WeaveMinecraftExtension::class)
project.afterEvaluate { pullDeps(ext.version.get()) }
}
}
From e16c2ca9bf3205af91945f5ddcb2abd08860a632 Mon Sep 17 00:00:00 2001
From: Max <56853437+exejar@users.noreply.github.com>
Date: Sat, 15 Apr 2023 13:41:06 -0400
Subject: [PATCH 04/29] Updated extension to weavecraft
---
build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 0150745..591c113 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,7 +40,7 @@ gradlePlugin {
plugins {
create("weave") {
// Using jitpack.io for the time being
- id = "com.github.weave-mc.weave-gradle"
+ id = "com.github.exejar.weave-gradle"
displayName = "Weave Plugin"
description =
"Implements Remapped Minecraft libraries and Weave-Loader intended for developing Minecraft Mods"
From 0f7a0075707819997b584afe6edf86a7990fc9e2 Mon Sep 17 00:00:00 2001
From: exejar <56853437+exejar@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:44:04 -0400
Subject: [PATCH 05/29] Moved MinecraftVersion into WeaveMinecraftExtension
file Added MinecraftMappings property
---
.../weave/configuration/MinecraftVersion.kt | 42 ----------
.../configuration/WeaveMinecraftExtension.kt | 8 --
.../configuration/WeaveMinecraftExtension.kt | 79 +++++++++++++++++++
3 files changed, 79 insertions(+), 50 deletions(-)
delete mode 100644 src/main/kotlin/club/maxstats/weave/configuration/MinecraftVersion.kt
delete mode 100644 src/main/kotlin/club/maxstats/weave/configuration/WeaveMinecraftExtension.kt
create mode 100644 src/main/kotlin/net/weavemc/gradle/configuration/WeaveMinecraftExtension.kt
diff --git a/src/main/kotlin/club/maxstats/weave/configuration/MinecraftVersion.kt b/src/main/kotlin/club/maxstats/weave/configuration/MinecraftVersion.kt
deleted file mode 100644
index 6b59629..0000000
--- a/src/main/kotlin/club/maxstats/weave/configuration/MinecraftVersion.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package club.maxstats.weave.configuration
-
-import club.maxstats.weave.WeavePlugin
-import club.maxstats.weave.util.Constants
-import java.io.File
-import java.io.InputStream
-
-enum class MinecraftVersion(val id: String, private val mappings: String) {
- V1_7_10("1.7.10", "lunar_named_b2_1.7.10.xsrg"),
- V1_8_9("1.8.9", "lunar_named_b2_1.8.9.xsrg"),
- V1_12_2("1.12.2", "lunar_named_b2_1.12.2.xsrg");
-
- val mappingStream: InputStream
- get() =
- WeavePlugin::class.java.getResourceAsStream("/mappings/$mappings")
- ?: error("Mappings not present: $mappings")
-
- /**
- * The gradle cache directory corresponding to its version.
- * @see Constants.CACHE_DIR
- */
- val cacheDirectory = File(Constants.CACHE_DIR, id)
-
- /**
- * The Minecraft jar file in it's cached directory.
- * @see [cacheDirectory]
- */
- val minecraftJarCache = File(cacheDirectory, "client.jar")
-
- companion object {
- /**
- * Converts the version String into a [MinecraftVersion] enum.
- *
- * @param version The version String.
- * @return The [MinecraftVersion] corresponding `version`.
- * @throws IllegalArgumentException If there is no version which corresponds with the [id].
- */
- @JvmStatic
- fun fromString(version: String) =
- enumValues().find { it.id == version } ?: error("No such version: $version")
- }
-}
diff --git a/src/main/kotlin/club/maxstats/weave/configuration/WeaveMinecraftExtension.kt b/src/main/kotlin/club/maxstats/weave/configuration/WeaveMinecraftExtension.kt
deleted file mode 100644
index 72322a7..0000000
--- a/src/main/kotlin/club/maxstats/weave/configuration/WeaveMinecraftExtension.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package club.maxstats.weave.configuration
-
-import org.gradle.api.provider.Property
-
-interface WeaveMinecraftExtension {
- val version: Property
- fun version(versionString: String) = version.set(MinecraftVersion.fromString(versionString))
-}
diff --git a/src/main/kotlin/net/weavemc/gradle/configuration/WeaveMinecraftExtension.kt b/src/main/kotlin/net/weavemc/gradle/configuration/WeaveMinecraftExtension.kt
new file mode 100644
index 0000000..a25349d
--- /dev/null
+++ b/src/main/kotlin/net/weavemc/gradle/configuration/WeaveMinecraftExtension.kt
@@ -0,0 +1,79 @@
+package net.weavemc.gradle.configuration
+
+import net.weavemc.gradle.WeaveGradle
+import net.weavemc.gradle.util.Constants
+import org.gradle.api.provider.Property
+import java.io.File
+import java.io.InputStream
+
+interface WeaveMinecraftExtension {
+ val version: Property
+ val mappings: Property
+
+ fun version(versionString: String) = version.set(MinecraftVersion.fromString(versionString))
+ fun mappings(mappingString: String) = mappings.set(MinecraftMappings.fromString(mappingString))
+}
+
+enum class MinecraftMappings(val id: String) {
+ MOJMAP("mojmap"),
+ SRG("srg"),
+ YARN("yarn");
+
+ fun mappingsStream(version: MinecraftVersion): InputStream {
+ return if (this == MOJMAP) {
+ File(version.cacheDirectory, "mojang.mappings").inputStream()
+ } else {
+ WeaveGradle::class.java.getResourceAsStream("/mappings/$id/${version.id}")
+ ?: error("Mappings not present: $id/$version")
+ }
+ }
+
+
+ companion object {
+ /**
+ * Converts the mapping String into a [MinecraftMappings] enum.
+ *
+ * @param mappings The mappings String.
+ * @return The [MinecraftMappings] corresponding `version`.
+ * @throws IllegalArgumentException If there is no mappings which corresponds with the [id].
+ */
+ @JvmStatic
+ fun fromString(mappings: String) =
+ enumValues().find { it.id == mappings } ?: error("No such mappings: $mappings")
+ }
+}
+enum class MinecraftVersion(val id: String) {
+ V1_7("1.7"),
+ V1_8("1.8"),
+ V1_12("1.12"),
+ V1_16("1.16"),
+ V1_17("1.17"),
+ V1_18("1.18"),
+ V1_19("1.19"),
+ V1_20("1.20");
+
+ /**
+ * The gradle cache directory corresponding to its version.
+ * @see Constants.CACHE_DIR
+ */
+ val cacheDirectory = File(Constants.CACHE_DIR, id)
+
+ /**
+ * The Minecraft jar file in it's cached directory.
+ * @see [cacheDirectory]
+ */
+ val minecraftJarCache = File(cacheDirectory, "client.jar")
+
+ companion object {
+ /**
+ * Converts the version String into a [MinecraftVersion] enum.
+ *
+ * @param version The version String.
+ * @return The [MinecraftVersion] corresponding `version`.
+ * @throws IllegalArgumentException If there is no version which corresponds with the [id].
+ */
+ @JvmStatic
+ fun fromString(version: String) =
+ enumValues().find { it.id == version } ?: error("No such version: $version")
+ }
+}
From c4751f2f4f13c85823a68a9c8abfa700652e48e8 Mon Sep 17 00:00:00 2001
From: exejar <