From 6c0628ddcbdd831092a2c048025ab7ce981f57c4 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Thu, 25 Nov 2021 09:38:41 -0700
Subject: [PATCH] reorganize Fabric buildscript

---
 platforms/fabric/build.gradle.kts | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts
index 5e9a0ab2c..37d854a70 100644
--- a/platforms/fabric/build.gradle.kts
+++ b/platforms/fabric/build.gradle.kts
@@ -3,18 +3,15 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.modrinth.minotaur.TaskModrinthUpload
 import net.fabricmc.loom.task.RemapJarTask
 
+val minecraft = "1.18-pre8"
+val yarn = "4"
+val fabricLoader = "0.12.5"
+
 plugins {
     id("fabric-loom").version("0.10.58")
     id("com.modrinth.minotaur").version("1.1.0")
 }
 
-addonDir(project.rootProject.file("./run/config/Terra/addons"), tasks.named("runClient").get())
-addonDir(project.rootProject.file("./run/config/Terra/addons"), tasks.named("runServer").get())
-
-val minecraft = "1.18-pre8"
-val yarn = "4"
-val fabricLoader = "0.12.5"
-
 // Do not shade because minecraft already includes it
 dependencies {
     shadedApi(project(":common:implementation:base"))
@@ -34,10 +31,6 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:$fabricLoader")
 }
 
-tasks.withType<JavaCompile>().configureEach {
-    options.release.set(17)
-}
-
 loom {
     accessWidenerPath.set(file("src/main/resources/terra.accesswidener"))
     mixin {
@@ -45,6 +38,14 @@ loom {
     }
 }
 
+
+addonDir(project.rootProject.file("./run/config/Terra/addons"), tasks.named("runClient").get())
+addonDir(project.rootProject.file("./run/config/Terra/addons"), tasks.named("runServer").get())
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set(17)
+}
+
 val remapped = tasks.register<RemapJarTask>("remapShadedJar") {
     group = "fabric"
     val shadowJar = tasks.getByName<ShadowJar>("shadowJar")