From f2ee3bc413144de3582ec92c238f132bd7002033 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Thu, 25 Nov 2021 19:26:02 -0300
Subject: [PATCH] 1.18-rc1

---
 build.gradle                     | 20 +++-----------------
 viafabric-mc117/build.gradle.kts |  4 ++--
 viafabric-mc118/build.gradle.kts |  6 +++---
 viafabric-mc18/build.gradle.kts  |  2 +-
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 424cbb9..fbeda89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 def ENV = System.getenv()
-def vvVer = "4.1.0-1.18-pre5-SNAPSHOT"
+def vvVer = "4.1.0-1.18-rc1-SNAPSHOT"
 def yamlVer = "1.29"
 
 description = "Client-side and server-side ViaVersion implementation for Fabric"
@@ -113,15 +113,7 @@ subprojects {
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                afterEvaluate {
-                    artifact(file("${project.buildDir}/libs/$archivesBaseName-${version}-maven.jar")) {
-                        builtBy remapMavenJar
-                    }
-
-                    artifact(sourcesJar) {
-                        builtBy remapSourcesJar
-                    }
-                }
+                from components.java
             }
         }
 
@@ -140,13 +132,7 @@ task remapMavenJar(type: RemapJarTask, dependsOn: jar) {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact(file("${project.buildDir}/libs/$archivesBaseName-${version}-maven.jar")) {
-                builtBy remapMavenJar
-            }
-
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
+            from components.java
 
             pom.withXml {
                 def depsNode = asNode {}.appendNode("dependencies")
diff --git a/viafabric-mc117/build.gradle.kts b/viafabric-mc117/build.gradle.kts
index 09c2993..d081e5b 100644
--- a/viafabric-mc117/build.gradle.kts
+++ b/viafabric-mc117/build.gradle.kts
@@ -1,7 +1,7 @@
 dependencies {
     minecraft("com.mojang:minecraft:1.17.1")
-    mappings("net.fabricmc:yarn:1.17.1+build.61:v2")
+    mappings("net.fabricmc:yarn:1.17.1+build.64:v2")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.40.1+1.17")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.43.1+1.17")
     modImplementation("com.terraformersmc:modmenu:2.0.2")
 }
diff --git a/viafabric-mc118/build.gradle.kts b/viafabric-mc118/build.gradle.kts
index b1f2cfb..8a96d8c 100644
--- a/viafabric-mc118/build.gradle.kts
+++ b/viafabric-mc118/build.gradle.kts
@@ -1,7 +1,7 @@
 dependencies {
-    minecraft("com.mojang:minecraft:1.18-pre5")
-    mappings("net.fabricmc:yarn:1.18-pre5+build.2:v2")
+    minecraft("com.mojang:minecraft:1.18-rc1")
+    mappings("net.fabricmc:yarn:1.18-rc1+build.1:v2")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.42.8+1.18")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.43.1+1.18")
     modImplementation("com.terraformersmc:modmenu:3.0.0")
 }
diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts
index f65cab1..d07dd42 100644
--- a/viafabric-mc18/build.gradle.kts
+++ b/viafabric-mc18/build.gradle.kts
@@ -1,6 +1,6 @@
 dependencies {
 	minecraft("com.mojang:minecraft:1.8.9")
-	mappings("net.fabricmc:yarn:1.8.9+build.202107080308:v2")
+	mappings("net.fabricmc:yarn:1.8.9+build.202110221052:v2")
 
 	modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.1.0+1.8.9")
 	modImplementation("io.github.boogiemonster1o1:modmenu:0.1.0+1.8.9")