Started porting to 1.18.1.

fnuecke · Dec 30, 2021 · 3f09a5f · 3f09a5f
1 parent 3bf735a
commit 3f09a5f
Show file tree

Hide file tree

Showing 318 changed files with 3,503 additions and 3,765 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,7 @@ plugins {
 }
 
 apply plugin: 'net.minecraftforge.gradle'
+apply from: 'minecraft.gradle'
 
 def getGitRef() {
     try {
@@ -29,49 +30,44 @@ def getGitRef() {
     }
 }
 
-final def semver = "${version_major}.${version_minor}.${version_patch}"
-
-String build_number = System.getenv('PROMOTED_NUMBER')
-if (build_number == null)
-    build_number = System.getenv('BUILD_NUMBER')
-if (build_number == null)
-    build_number = getGitRef()
-
-version = "${semver}+${build_number}"
+version = "${semver}+${getGitRef()}"
 group = 'li.cil.oc2'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+java.toolchain {
+    languageVersion = JavaLanguageVersion.of(17)
+    vendor = JvmVendorSpec.ADOPTOPENJDK
+}
 
 repositories {
     mavenCentral()
-    maven { url 'https://dvs1.progwml6.com/files/maven' } // JEI
-    maven { url 'https://maven.cil.li/' } // Sedna
+    maven {
+        url 'https://cursemaven.com'
+        content { includeGroup "curse.maven" }
+    }
+    ["fnuecke/SednaMinecraft"].forEach(repo -> {
+        maven {
+            url = uri("https://maven.pkg.github.com/${repo}")
+            credentials {
+                username = project.findProperty("gpr.user") ?: System.getenv("GPR_USER")
+                password = project.findProperty("gpr.key") ?: System.getenv("GPR_KEY")
+            }
+        }
+    })
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
-
-    implementation "li.cil.sedna:sedna-${minecraft_version}-forge:1.0.0+"
-
-    // These three will be provided by sedna-mc in standalone.
-    implementation 'li.cil.ceres:ceres:0.0.3+'
-    implementation 'li.cil.sedna:sedna:1.0.1+'
-    implementation 'li.cil.sedna:sedna-buildroot:0.0.1+15'
+    implementation "li.cil.sedna:sedna-${minecraft_version}-forge:1.0.2"
 
-    compileOnly fg.deobf("li.cil.markdown_manual:markdown_manual-${minecraft_version}-forge:${manual_version}:api")
-    runtimeOnly fg.deobf("li.cil.markdown_manual:markdown_manual-${minecraft_version}-forge:${manual_version}")
+    implementation fg.deobf("curse.maven:markdownmanual-502485:3565800")
 
-    compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
+    // Just for in-dev convenience. Mod doesn't use any JEI APIs.
+    implementation fg.deobf("curse.maven:jei-238222:3564650")
 
-    testImplementation 'li.cil.ceres:ceres:0.0.3+'
-    testImplementation 'li.cil.sedna:sedna:1.0.1+'
-
-    testImplementation 'org.mockito:mockito-core:2.+'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+    testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 task packageScripts(type: Zip) {
@@ -83,7 +79,7 @@ task packageScripts(type: Zip) {
 processResources.dependsOn(packageScripts)
 
 minecraft {
-    mappings channel: mappings_channel, version: mappings_version
+    mappings channel: 'official', version: minecraft_version
 
     runs {
         client {
@@ -165,29 +161,38 @@ artifacts {
 publishing {
     publications {
         mavenJava(MavenPublication) {
+            groupId = project.group
+            artifactId = project.name
+            version = semver
             artifact jar
             artifact apiJar
         }
     }
     repositories {
         maven {
-            url System.getenv('MAVEN_PATH')
+            name = "GitHubPackages"
+            url = System.getenv("GITHUB_MAVEN_URL") ?: ""
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
         }
     }
 }
 
 curseforge {
-    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
+    apiKey = System.getenv('CURSEFORGE_API_KEY') ?: ""
     project {
         id = curse_project_id
         releaseType = curse_project_releaseType
         changelogType = 'markdown'
-        changelog = file('changelog.md')
+        changelog = System.getenv("CHANGELOG") ?: "Changelog not available."
         addGameVersion 'Forge'
         addGameVersion minecraft_version
-        addGameVersion 'Java 8'
+        addGameVersion 'Java 17'
         relations {
             requiredDependency 'markdownmanual'
+            requiredDependency 'sedna'
         }
     }
 }
@@ -202,4 +207,4 @@ idea {
 
 test {
     useJUnitPlatform()
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -3,19 +3,9 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.16.5
-mappings_channel=official
-mappings_version=1.16.5
-forge_version=36.1.32
+forge_version=39.0.4
 
-version_major=0
-version_minor=0
-version_patch=1
+semver=0.0.0
 
-manual_version=1.1.0+
-
-jei_minecraft_version=1.16.4
-jei_version=7.6.1.71
-
-curse_project_id=0
-curse_project_releaseType=release
+curse_project_id=437654
+curse_project_releaseType=alpha
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip