port to 1.20

jaredlll08 · Jun 11, 2023 · 950b8bb · 950b8bb
1 parent e26cf25
commit 950b8bb
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 128 deletions.
diff --git a/buildSrc/src/main/kotlin/com/blamejared/ambientenvironment/gradle/Versions.kt b/buildSrc/src/main/kotlin/com/blamejared/ambientenvironment/gradle/Versions.kt
@@ -1,9 +1,9 @@
 package com.blamejared.ambientenvironment.gradle
 
 object Versions {
-    const val MOD = "9.0.0"
+    const val MOD = "10.0.0"
     const val JAVA = "17"
-    const val MINECRAFT = "1.19.4"
-    const val FORGE = "45.0.4"
-    const val FABRIC_LOADER = "0.14.17"
+    const val MINECRAFT = "1.20"
+    const val FORGE = "46.0.14"
+    const val FABRIC_LOADER = "0.14.21"
 }
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -5,7 +5,7 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import net.darkhax.curseforgegradle.Constants as CFG_Constants
 
 plugins {
-    id("fabric-loom") version "1.1-SNAPSHOT"
+    id("fabric-loom") version "1.2-SNAPSHOT"
     id("com.blamejared.ambientenvironment.default")
     id("com.blamejared.ambientenvironment.loader")
     id("com.modrinth.minotaur")
@@ -55,7 +55,4 @@ modrinth {
     versionName.set("Forge-${Versions.MINECRAFT}-$version")
     versionType.set("release")
     uploadFile.set(tasks.remapJar.get())
-    dependencies {
-        required.project("fabric-api")
-    }
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -21,7 +21,7 @@
   },
   "depends": {
     "fabricloader": ">=0.14",
-    "minecraft": "1.19.x"
+    "minecraft": "1.20"
   },
   "mixins": [
     {

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -7,7 +7,7 @@ import net.darkhax.curseforgegradle.Constants as CFG_Constants
 plugins {
     id("com.blamejared.ambientenvironment.default")
     id("com.blamejared.ambientenvironment.loader")
-    id("net.minecraftforge.gradle") version ("5.1.+")
+    id("net.minecraftforge.gradle") version ("[6.0,6.2)")
     id("org.spongepowered.mixin") version ("0.7-SNAPSHOT")
     id("com.modrinth.minotaur")
 }
@@ -62,7 +62,4 @@ modrinth {
     versionName.set("Forge-${Versions.MINECRAFT}-$version")
     versionType.set("release")
     uploadFile.set(tasks.jar.get())
-    dependencies {
-        required.project("fabric-api")
-    }
 }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -8,7 +8,7 @@ version="${file.jarVersion}"
 displayName="Ambient Environment"
 credits="MC Bedrock edition lol"
 authors="Jaredlll08"
-updateJSONURL="https://updates.blamejared.com/get?n=AmbientEnvironment&gv=1.19.4"
+updateJSONURL="https://updates.blamejared.com/get?n=AmbientEnvironment&gv=1.20"
 description='''
 Adds more ambiance to the game
 '''

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,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists