From 6d9c3d6d384e0170d90e8824f161c774b13a4e8e Mon Sep 17 00:00:00 2001
From: Matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com>
Date: Thu, 21 Dec 2023 09:47:14 +0200
Subject: [PATCH] Update MDK to 1.20.4 (#29)

---
 build.gradle                          |  4 ++--
 gradle.properties                     | 18 ++++++++----------
 src/main/resources/META-INF/mods.toml | 12 ++++++++----
 src/main/resources/pack.mcmeta        |  8 --------
 4 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 src/main/resources/pack.mcmeta

diff --git a/build.gradle b/build.gradle
index ffc7a0f..6f1f2ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -114,11 +114,11 @@ tasks.withType(ProcessResources).configureEach {
             neo_version         : neo_version, neo_version_range: neo_version_range,
             loader_version_range: loader_version_range,
             mod_id              : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-            mod_authors         : mod_authors, mod_description: mod_description, pack_format_number: pack_format_number,
+            mod_authors         : mod_authors, mod_description: mod_description,
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+    filesMatching(['META-INF/mods.toml']) {
         expand replaceProperties + [project: project]
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 01edc03..de8f0e2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,17 +6,17 @@ org.gradle.debug=false
 ## Environment Properties
 
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.2,1.21)
+minecraft_version_range=[1.20.4,1.21)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=20.2.86
-# The Neo version range can use any version of Neo as bounds or match the loader version range
-neo_version_range=[20.2,)
-# The loader version range can only use the major version of Neo/FML as bounds
-loader_version_range=[1,)
+neo_version=20.4.47-beta
+# The Neo version range can use any version of Neo as bounds
+neo_version_range=[20.4,)
+# The loader version range can only use the major version of FML as bounds
+loader_version_range=[2,)
 
 ## Mod Properties
 
@@ -36,6 +36,4 @@ mod_group_id=com.example.examplemod
 # The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
 mod_authors=YourNameHere, OtherNameHere
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
-mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.
-# Pack version - this changes each minecraft release, in general.
-pack_format_number=18
+mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.
\ No newline at end of file
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index b0ad9f8..89cadbc 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -44,11 +44,15 @@ description='''${mod_description}'''
 [[dependencies.${mod_id}]] #optional
     # the modid of the dependency
     modId="neoforge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #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 or AFTER required if the dependency is not 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"
@@ -57,7 +61,7 @@ description='''${mod_description}'''
 # Here's another dependency
 [[dependencies.${mod_id}]]
     modId="minecraft"
-    mandatory=true
+    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"
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
deleted file mode 100644
index 59c5240..0000000
--- a/src/main/resources/pack.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "pack": {
-    "description": {
-      "text": "${mod_id} resources"
-    },
-    "pack_format": ${pack_format_number}
-  }
-}