From 8f317b0318152929d11a531d2d683f8c4fe58849 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Fri, 26 Nov 2021 19:02:09 -0300
Subject: [PATCH] 1.18-rc3

---
 build.gradle                     | 37 +++++++++++---------------------
 viafabric-mc118/build.gradle.kts |  4 ++--
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/build.gradle b/build.gradle
index fbeda89..79c863c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 def ENV = System.getenv()
-def vvVer = "4.1.0-1.18-rc1-SNAPSHOT"
+def vvVer = "4.1.0-1.18-rc3-SNAPSHOT"
 def yamlVer = "1.29"
 
 description = "Client-side and server-side ViaVersion implementation for Fabric"
@@ -46,10 +46,6 @@ allprojects {
     group = "com.viaversion.fabric"
     version = rootProject.version
 
-    configurations {
-        dev
-    }
-
     repositories {
         mavenCentral()
         maven { url = "https://repo.viaversion.com/" }
@@ -67,21 +63,6 @@ allprojects {
         modImplementation("net.fabricmc:fabric-loader:0.12.5")
     }
 
-    jar {
-        archiveClassifier.set("dev")
-    }
-
-    afterEvaluate {
-        remapJar {
-            input.set(file("${project.buildDir}/libs/$archivesBaseName-${archiveVersion.get()}-dev.jar"))
-            archiveFileName = "${archivesBaseName}-${archiveVersion.get()}.jar"
-        }
-
-        artifacts {
-            dev file: file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar"), type: "jar", builtBy: jar
-        }
-    }
-
     processResources {
         filesMatching("fabric.mod.json") {
             filter(ReplaceTokens, tokens: [
@@ -123,19 +104,27 @@ subprojects {
 
 task remapMavenJar(type: RemapJarTask, dependsOn: jar) {
     afterEvaluate {
-        input.set(file("${project.buildDir}/libs/${archivesBaseName}-${version}-dev.jar"))
+        input = jar.archiveFile
         archiveFileName = "${archivesBaseName}-${version}-maven.jar"
         addNestedDependencies.set(false)
     }
 }
 
+build.dependsOn remapMavenJar
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            from components.java
+            artifact(remapMavenJar) {
+                builtBy remapMavenJar
+            }
+
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
+            }
 
             pom.withXml {
-                def depsNode = asNode {}.appendNode("dependencies")
+                def depsNode = asNode().appendNode("dependencies")
                 subprojects.each {
                     def depNode = depsNode.appendNode("dependency")
                     depNode.appendNode("groupId", it.group)
@@ -194,7 +183,7 @@ curseforge {
                 "Java 8", "Java 9", "Java 10", "Java 11", "Java 12", "Java 13", "Java 14", "Java 15", "Java 16", "Java 17", "Fabric")
                 .forEach { ver -> addGameVersion(ver) }
 
-        mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) {
+        mainArtifact(remapJar) {
             displayName = "[${getBranch()}] ViaFabric " + rootProject.version
             relations {
                 optionalDependency("fabric-api")
diff --git a/viafabric-mc118/build.gradle.kts b/viafabric-mc118/build.gradle.kts
index 8a96d8c..389123e 100644
--- a/viafabric-mc118/build.gradle.kts
+++ b/viafabric-mc118/build.gradle.kts
@@ -1,6 +1,6 @@
 dependencies {
-    minecraft("com.mojang:minecraft:1.18-rc1")
-    mappings("net.fabricmc:yarn:1.18-rc1+build.1:v2")
+    minecraft("com.mojang:minecraft:1.18-rc3")
+    mappings("net.fabricmc:yarn:1.18-rc3+build.1:v2")
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:0.43.1+1.18")
     modImplementation("com.terraformersmc:modmenu:3.0.0")