Skip to content

Commit

Permalink
*Finally* add Forge 1.20.1 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaming32 committed Sep 23, 2023
1 parent 298b64c commit b80dfd1
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
25 changes: 13 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// `kotlin-dsl`
id("xyz.deftu.gradle.preprocess-root") version "0.4.1"
id("xyz.wagyourtail.unimined") version "1.1.0-SNAPSHOT" apply false
id("xyz.wagyourtail.unimined") version "1.0.6-SNAPSHOT" apply false
}

repositories {
Expand All @@ -10,7 +10,7 @@ repositories {

preprocess {
val fabric12001 = createNode("1.20.1-fabric", 1_20_01, "yarn")
// val forge12001 = createNode("1.20.1-forge", 1_20_01, "srg")
val forge12001 = createNode("1.20.1-forge", 1_20_01, "srg")
val fabric11904 = createNode("1.19.4-fabric", 1_19_04, "yarn")
val forge11904 = createNode("1.19.4-forge", 1_19_04, "srg")
val fabric11902 = createNode("1.19.2-fabric", 1_19_02, "yarn")
Expand All @@ -23,16 +23,17 @@ preprocess {
val forge11605 = createNode("1.16.5-forge", 1_16_05, "srg")
val fabric11601 = createNode("1.16.1-fabric", 1_16_01, "yarn")

fabric12001.link(fabric11904)
fabric11904.link(forge11904)
forge11904.link(forge11902)
forge11902.link(fabric11902)
fabric11902.link(fabric11802)
fabric11802.link(forge11802)
forge11802.link(forge11701)
forge11701.link(fabric11701)
fabric11701.link(fabric11605)
fabric11605.link(forge11605)
fabric12001.link(forge12001)
forge12001.link(forge11904)
forge11904.link(fabric11904)
fabric11904.link(fabric11902)
fabric11902.link(forge11902)
forge11902.link(forge11802)
forge11802.link(fabric11802)
fabric11802.link(fabric11701)
fabric11701.link(forge11701)
forge11701.link(forge11605)
forge11605.link(fabric11605)
fabric11605.link(fabric11601)

// subprojects {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ listOf(
"1.19.2-fabric",
"1.19.4-forge",
"1.19.4-fabric",
// "1.20.1-forge",
"1.20.1-forge",
"1.20.1-fabric",
).forEach { version ->
include(":$version")
Expand Down
7 changes: 6 additions & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ repositories {
lateinit var minecraft: MinecraftConfig
unimined.minecraft {
version(mcVersionString)
side("client")
if (mcVersion != 1_20_01 || loaderName != "forge") {
side("client")
}

mappings {
intermediary()
Expand Down Expand Up @@ -200,6 +202,9 @@ dependencies {
}

bundleImplementation("org.quiltmc.qup:json:0.2.0")
if (loaderName == "forge") {
"minecraftLibraries"("org.quiltmc.qup:json:0.2.0")
}

//TODO: bump to unimined 1.1.0+ to use these, also enable the processor in unimined's mixin config settings
// includeImplementation("com.github.LlamaLad7.MixinExtras:mixinextras-${mcData.loader.name}:0.2.0-beta.6")h
Expand Down

0 comments on commit b80dfd1

Please sign in to comment.