From c9f9be73ff3672b90e31810547829f627398e246 Mon Sep 17 00:00:00 2001
From: PepperBell <44146161+PepperCode1@users.noreply.github.com>
Date: Wed, 23 Jun 2021 12:30:10 -0700
Subject: [PATCH] Buildscript tweaks

- Move Flywheel version to gradle.properties
- Use implementation instead of compile
---
 build.gradle      | 31 +++++++++++++++----------------
 gradle.properties |  1 +
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index f19c4af70..71e6be057 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,28 +90,27 @@ mixin {
 
 repositories {
     maven {
-        // location of the maven that hosts JEI files (And TiC)
+        // Location of the maven that hosts JEI files (and TiC)
         name = "Progwml6 maven"
         url = "https://dvs1.progwml6.com/files/maven/"
     }
-    /*
-    maven {
-        // location of a maven mirror for JEI files, as a fallback
+    /*maven {
+        // Location of a maven mirror for JEI files, as a fallback
         name = "ModMaven"
         url = "https://modmaven.k-4u.nl"
     }*/
     maven {
-        //location of the maven for vazkii's mods
+        // Location of the maven for vazkii's mods
         name = "blamejared"
         url = "http://maven.blamejared.com/"
     }
     maven {
-        //location of the maven for mixed mappings and registrate
-        name "tterrag maven"
-        url "https://maven.tterrag.com/"
+        // Location of the maven for mixed mappings, Registrate, and Flywheel
+        name = "tterrag maven"
+        url = "https://maven.tterrag.com/"
     }
     maven {
-        url "https://www.cursemaven.com"
+        url = "https://www.cursemaven.com"
         content {
             includeGroup "curse.maven"
         }
@@ -129,17 +128,17 @@ dependencies {
     implementation fg.deobf(registrate)
     shade registrate
 
-    // compile against the JEI API but do not include it at runtime
-    compileOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}:api")
-    // at runtime, use the full JEI jar
-    runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
-
     if (findProject(':Flywheel') != null) {
-        compile project(':Flywheel') // jozu: I use a gradle workspace with both projects
+        implementation project(':Flywheel') // jozu: I use a gradle workspace with both projects
     } else {
-        compile fg.deobf("com.jozufozu.flywheel:Flywheel:1.16-0.0.2.8")
+        implementation fg.deobf("com.jozufozu.flywheel:Flywheel:${flywheel_version}")
     }
 
+    // Compile against the JEI API but do not include it at runtime
+    compileOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}:api")
+    // At runtime, use the full JEI jar
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
+
     // implementation fg.deobf("curse.maven:druidcraft-340991:3101903")
 
     // i'll leave this here commented for easier testing
diff --git a/gradle.properties b/gradle.properties
index 4798b9ca7..e8ce41c1c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,7 @@ cursegradle_version = 1.4.0
 
 # dependency versions
 registrate_version = 1.0.4
+flywheel_version = 1.16-0.0.2.8
 jei_version = 7.7.0.106
 
 # curseforge information