1.18: Update buildscripts for release

KubeJS-Mods · Nov 30, 2021 · 91d767d · 91d767d
1 parent 33fc411
commit 91d767d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 26 deletions.
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -68,15 +68,7 @@ if (ENV.CURSEFORGE_KEY) {
 			id = project.curseforge_id_fabric
 			releaseType = project.curseforge_type
 			addGameVersion "Fabric"
-			addGameVersion "1.14.4"
-			addGameVersion "1.15.2"
-			addGameVersion "1.16.1"
-			addGameVersion "1.16.2"
-			addGameVersion "1.16.3"
-			addGameVersion "1.16.4"
-			addGameVersion "1.16.5"
-			//addGameVersion "1.17"
-			//addGameVersion "1.17.1"
+			addGameVersion "1.18"
 			mainArtifact(remapJar.archivePath)
 			relations {
 				requiredDependency 'fabric-api'

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -87,15 +87,7 @@ if (ENV.CURSEFORGE_KEY) {
 			id = project.curseforge_id_forge
 			releaseType = project.curseforge_type
 			addGameVersion "Forge"
-			addGameVersion "1.14.4"
-			addGameVersion "1.15.2"
-			addGameVersion "1.16.1"
-			addGameVersion "1.16.2"
-			addGameVersion "1.16.3"
-			addGameVersion "1.16.4"
-			addGameVersion "1.16.5"
-			//addGameVersion "1.17"
-			//addGameVersion "1.17.1"
+			addGameVersion "1.18"
 			mainArtifact(remapJar.archivePath)
 			changelog = getGitChangelog
 			changelogType = 'markdown'

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[32,)"
+loaderVersion = "[38,)"
 issueTrackerURL = "https://github.com/KubeJS-Mods/Rhino/issues"
 license = "MPL-2.0"
 
@@ -15,13 +15,13 @@ A fork of Mozilla's Rhino library, modified for use in mods
 [[dependencies.rhino]]
 modId = "forge"
 mandatory = true
-versionRange = "[32.0.75,)"
+versionRange = "[38.0.0,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.rhino]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.16.4,)"
+versionRange = "[1.18,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
 	"pack": {
-		"pack_format": 6,
+		"pack_format": 8,
 		"description": "Rhino Mod Resources"
 	}
 }
diff --git a/forge/src/main/resources/rhino.mixins.json b/forge/src/main/resources/rhino.mixins.json
@@ -1,7 +1,7 @@
 {
 	"required": true,
 	"package": "dev.latvian.mods.rhino.mod.core.mixin.forge",
-	"compatibilityLevel": "JAVA_8",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": [
 	],
 	"client": [

diff --git a/gradle.properties b/gradle.properties
@@ -9,13 +9,13 @@ mod_author=LatvianModder
 
 curseforge_id_forge=416294
 curseforge_id_fabric=416294
-curseforge_type=alpha
+curseforge_type=beta
 
-minecraft_version=1.18-rc3
+minecraft_version=1.18
 architectury_version=3.0.39
 
 fabric_loader_version=0.12.5
 fabric_api_version=0.43.1+1.18
 
-# forge_version=36.2.2
+# forge_version=38.0.0
 # kubejs_version=1605.3.16-build.112