Skip to content

Commit

Permalink
Attempt migrating to unimined 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
thecatcore committed Nov 1, 2024
1 parent 59660ee commit a77f077
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
25 changes: 16 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'xyz.wagyourtail.unimined' version '1.3.9'
id 'xyz.wagyourtail.unimined' version '1.4.0-SNAPSHOT'
}

group = rootProject.maven_group
Expand Down Expand Up @@ -58,21 +58,28 @@ unimined.minecraft([sourceSets.main, sourceSets.full]) {

mappings {
// babricIntermediary()
mapping("net.legacyfabric:beta-yarn:${rootProject.minecraft_version}+build.${rootProject.mappings}", "yarn") {
outputs("yarn", true) { ["intermediary"] }
mapNamespace("named", "yarn")
sourceNamespace("intermediary")
renest()
mapping("net.legacyfabric:beta-yarn:${rootProject.minecraft_version}+build.${rootProject.mappings}", "betaYarn") {
// outputs("yarn", true) { ["intermediary"] }
// mapNamespace("named", "yarn")
// sourceNamespace("intermediary")
// renest()
//
requires("babricIntermediary")
// provides("betaYarn", true)
// mapNamespace(["intermediary": "babricIntermediary", "named": "betaYarn"])
// it.provides("betaYarn")
mapNamespace("intermediary", "babricIntermediary")
mapNamespace("named", "betaYarn")
}
}

babric {
loader rootProject.loader_version
}

minecraftRemapper.config {
ignoreConflicts(true)
}
// minecraftRemapper.config {
// ignoreConflicts(true)
// }
}

unimined.minecraft(sourceSets.apron) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Done to increase the memory available to gradle.
# suppress inspection "UnusedProperty"
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx2G
# Fabric Properties
# check these on https://babric.github.io/develop/
minecraft_version=b1.7.3
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit a77f077

Please sign in to comment.