From f32f7187ccd81c2ab5b60727c8e84aa6100bf3c9 Mon Sep 17 00:00:00 2001
From: Flanks255 <32142731+Flanks255@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:56:04 -0500
Subject: [PATCH] Fixed project not loading for Flanks

---
 build.gradle                                   | 12 ------------
 gradle.properties                              |  5 -----
 src/main/resources/META-INF/neoforge.mods.toml |  8 ++++----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5e565bb46..bbc37615b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,18 +115,6 @@ jar {
     from sourceSets.main.output
 }
 
-processResources {
-    inputs.property('version', project.version)
-    inputs.property('neo_version_range', project.neo_version_range)
-    inputs.property('loader', project.loader)
-    inputs.property('minecraft_version_range', project.minecraft_version_range)
-
-    filesMatching(['META-INF/neoforge.mods.toml'])  {
-        expand 'version': project.version, 'neo_version_range': project.neo_version_range, 'loader': project.loader, 'minecraft_version_range': project.minecraft_version_range
-    }
-}
-
-
 task apiJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.main.java
diff --git a/gradle.properties b/gradle.properties
index 32f675cf2..bda4c8a0b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,11 +8,6 @@ mod_version=1.3.2
 game_version=1.21.1
 neo_version=21.1.71
 
-# mods.toml
-loader=4
-neo_version_range=[21.1.1,)
-minecraft_version_range=[1.21.1,1.22)
-
 # Parchment (Mappings)
 neogradle.subsystems.parchment.minecraftVersion=1.21
 neogradle.subsystems.parchment.mappingsVersion=2024.07.28
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
index 9d58e4868..961f45804 100644
--- a/src/main/resources/META-INF/neoforge.mods.toml
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,10 +1,10 @@
 
 modLoader="javafml"
-loaderVersion="[${loader},)"
+loaderVersion="[4,)"
 license="MIT"
 [[mods]]
 modId="actuallyadditions"
-version="${version}"
+version="${file.jarVersion}"
 displayName="Actually Additions"
 #logoFile="logo.png"
 credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp; Porters: Flanks, MrBysco, ErrorMikey; 1.20+ Textures: Ridanisaurus"
@@ -18,13 +18,13 @@ config = "actuallyadditions.mixins.json"
 [[dependencies.actuallyadditions]]
     modId="neoforge"
     type="required"
-    versionRange="${neo_version_range}"
+    versionRange="[21.1.1,)"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.actuallyadditions]]
     modId="minecraft"
     type="required"
-    versionRange="${minecraft_version_range}"
+    versionRange="[1.21.1,1.22)"
     ordering="NONE"
     side="BOTH"