From 22a73f564ffe27319a3858cc71f6d5ce13007ecc Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 3 Jan 2023 16:17:07 -0500
Subject: [PATCH] Avoid hardcoding Minecraft version

---
 build.gradle      | 15 ++++-----------
 gradle.properties |  4 +++-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 951edc37..577b435a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ group = 'org.embeddedt'
 version = '1.0.0'
 
 java {
-    archivesBaseName = 'modernfix'
+    archivesBaseName = 'modernfix-mc' + minecraft_version
     toolchain.languageVersion = JavaLanguageVersion.of(8)
 }
 
@@ -37,7 +37,7 @@ minecraft {
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.16.5'
+    mappings channel: 'official', version: minecraft_version
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -133,18 +133,11 @@ dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.5-36.2.39'
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-    // If you want to test/use Mekanism & its modules during `runClient` invocation, use the following
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}")// core
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:additions")// Mekanism: Additions
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:generators")// Mekanism: Generators
-    runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:tools")// Mekanism: Tools
-
-    runtimeOnly fg.deobf("curse.maven:lazydfu-460819:3249059")
-    runtimeOnly fg.deobf("curse.maven:roadrunner-529754:3683120")
+    runtimeOnly fg.deobf("curse.maven:lazydfu-460819:${lazydfu_version}")
 }
 
 // Example for how to get properties into the manifest for reading at runtime.
diff --git a/gradle.properties b/gradle.properties
index b5bd01e2..be39848c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-mekanism_version=1.16.5-10.1.2.457
\ No newline at end of file
+minecraft_version=1.16.5
+forge_version=36.2.39
+lazydfu_version=3249059
\ No newline at end of file