From 462dbce6658848466aa539da9957b424699d14e6 Mon Sep 17 00:00:00 2001
From: wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Wed, 22 Sep 2021 12:14:43 -0600
Subject: [PATCH] prep forge support

---
 build.gradle      | 24 ++++++++++++++----------
 gradle.properties | 13 +++++++++++++
 settings.gradle   |  5 +----
 3 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index ced2407f4..10f30250e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -17,13 +17,14 @@
 
 plugins {
     id 'java'
-    id 'dev.architectury.loom' version '0.8.0-SNAPSHOT'
+    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
     id 'maven-publish'
 }
 
 
-group 'baritone'
-version '1.7.0'
+archivesBaseName  = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
 
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
@@ -60,12 +61,15 @@ sourceSets {
 }
 
 loom {
-    mixinConfig 'mixins.baritone.json'
+    if (compileType.equals("FORGE")) {
+        forge {
+            mixinConfig 'mixins.baritone.json'
+        }
+    }
+    mixin.defaultRefmapName = "mixins.baritone.refmap.json"
 }
 
-minecraft {}
 
-minecraft.refmapName = "mixins.baritone.refmap.json"
 
 repositories {
     maven {
@@ -80,12 +84,12 @@ repositories {
 
 dependencies {
     if (compileType.equals("FORGE")) {
-        //forge "net.minecraftforge:forge:1.16.5-36.1.0"
+        forge "net.minecraftforge:forge:${project.forge_version}"
     }
-    minecraft "com.mojang:minecraft:1.17.1"
-    mappings minecraft.officialMojangMappings()
+    mappings loom.officialMojangMappings()
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
     if (!compileType.equals("FORGE")) {
-        modImplementation "net.fabricmc:fabric-loader:0.11.6"
+        modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}"
     }
     // this makes it compile with the forge tweak stuff
     implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..e3fdcf846
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,13 @@
+org.gradle.jvmargs=-Xmx2048M
+
+mod_version=1.7.1
+maven_group=baritone
+archives_base_name=baritone
+
+minecraft_version=1.17.1
+forge_version=1.17.1-37.0.69
+fabric_version=0.11.6
+
+# # un comment for forge debugging default (as opposed to fabric)
+# baritone.forge_build=true
+# loom.platform=forge
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 7ff17f0a3..0e6cdeb43 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -37,7 +37,4 @@ pluginManagement {
         }
         mavenCentral()
     }
-}
-
-
-rootProject.name = 'baritone'
+}
\ No newline at end of file