From 2d5882a23826608330628efbbc0c586e12ea7796 Mon Sep 17 00:00:00 2001
From: SammySemicolon <malummoddevelopment@gmail.com>
Date: Sat, 23 Nov 2024 15:04:20 +0100
Subject: [PATCH] Cleanup

---
 build.gradle.kts                              |  1 -
 .../{mods.toml => neoforge.mods.toml}         | 12 +--
 .../templates/META-INF/neoforge.mods.toml     | 92 -------------------
 3 files changed, 6 insertions(+), 99 deletions(-)
 rename src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (87%)
 delete mode 100644 src/main/templates/META-INF/neoforge.mods.toml

diff --git a/build.gradle.kts b/build.gradle.kts
index c41736d71..1b803bd4e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
     id("net.neoforged.moddev") version "1.0.17"
 }
 
-
 version = "${property("minecraft_version")}-${property("mod_version")}"
 if (System.getenv("BUILD_NUMBER") != null) {
     version = "${property("minecraft_version")}-${property("mod_version")}.${System.getenv("BUILD_NUMBER")}"
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
similarity index 87%
rename from src/main/resources/META-INF/mods.toml
rename to src/main/resources/META-INF/neoforge.mods.toml
index b087e4bf6..024daef04 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -10,33 +10,33 @@ authors="${modAuthors}"
 description='''${modDescription}'''
 
 [[dependencies.malum]]
-modId="forge"
-mandatory=true
+modId="neoforge"
+type="required"
 versionRange="${forgeVersionRange}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.malum]]
 modId="minecraft"
-mandatory=true
+type="required"
 versionRange="${minecraftVersionRange}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.malum]]
 modId = "lodestone"
-mandatory = true
+type="required"
 versionRange = "[1.20.1-1.6.4,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.malum]]
 modId = "curios"
-mandatory = true
+type="required"
 versionRange = "[5.7.0,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.malum]]
 modId="fusion"
-mandatory=false
+type="optional"
 versionRange="[1.0.0,)"
 ordering="NONE"
 side="CLIENT"
\ No newline at end of file
diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml
deleted file mode 100644
index 4156a4e55..000000000
--- a/src/main/templates/META-INF/neoforge.mods.toml
+++ /dev/null
@@ -1,92 +0,0 @@
-# This is an example neoforge.mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-
-# A version range to match for said mod loader - for regular FML @Mod it will be the FML version. This is currently 2.
-loaderVersion="${loader_version_range}" #mandatory
-
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="${mod_license}"
-
-# A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
-
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-
-# The modid of the mod
-modId="${mod_id}" #mandatory
-
-# The version number of the mod
-version="${mod_version}" #mandatory
-
-# A display name for the mod
-displayName="${mod_name}" #mandatory
-
-# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/
-#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
-
-# A URL for the "homepage" for this mod, displayed in the mod UI
-#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
-
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-
-# A text field displayed in the mod UI
-#credits="" #optional
-
-# A text field displayed in the mod UI
-authors="${mod_authors}" #optional
-
-# The description text for the mod (multi line!) (#mandatory)
-description='''${mod_description}'''
-
-# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded.
-#[[mixins]]
-#config="${mod_id}.mixins.json"
-
-# The [[accessTransformers]] block allows you to declare where your AT file is.
-# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg
-#[[accessTransformers]]
-#file="META-INF/accesstransformer.cfg"
-
-# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json
-
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.${mod_id}]] #optional
-# the modid of the dependency
-modId="neoforge" #mandatory
-# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive).
-# 'required' requires the mod to exist, 'optional' does not
-# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning
-type="required" #mandatory
-# Optional field describing why the dependency is required or why it is incompatible
-# reason="..."
-# The version range of the dependency
-versionRange="${neo_version_range}" #mandatory
-# An ordering relationship for the dependency.
-# BEFORE - This mod is loaded BEFORE the dependency
-# AFTER - This mod is loaded AFTER the dependency
-ordering="NONE"
-# Side this dependency is applied on - BOTH, CLIENT, or SERVER
-side="BOTH"
-
-# Here's another dependency
-[[dependencies.${mod_id}]]
-modId="minecraft"
-type="required"
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="${minecraft_version_range}"
-ordering="NONE"
-side="BOTH"
-
-# Features are specific properties of the game environment, that you may want to declare you require. This example declares
-# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
-# stop your mod loading on the server for example.
-#[features.${mod_id}]
-#openGLVersion="[3.2,)"
\ No newline at end of file