From 45d3db8cc0848d370526972e5db35115a637bac7 Mon Sep 17 00:00:00 2001
From: Sekwah <contact@sekwah.com>
Date: Sat, 13 Aug 2022 18:51:07 +0100
Subject: [PATCH] fix: update to 1.19.1 and 1.19.2, support for 1.19 dropped

---
 build.gradle                                          | 11 +++++++----
 gradle.properties                                     |  4 +++-
 .../java/com/sekwah/narutomod/item/NarutoItems.java   |  2 +-
 src/main/resources/META-INF/mods.toml                 |  7 ++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index bf3efe82..f9ced4be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,7 +75,7 @@ minecraft {
     // stable_#            Stables are built at the discretion of the MCP team.
     // 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.19'
+    mappings channel: 'official', version: '1.19.2'
     //mappings channel: 'parchment', version: '2021.12.19-1.18.1'
     //mappings channel: 'parchment', version: '2021.07.21-1.17'
 
@@ -155,12 +155,12 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's 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.19-41.1.0'
+    minecraft 'net.minecraftforge:forge:1.19.2-43.0.8'
 
     implementation 'org.spongepowered:mixin:0.8.5'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-    implementation fg.deobf("com.sekwah:SekCLib:0.4.1")
+    implementation fg.deobf("com.sekwah:SekCLib:0.4.2")
     // Trick intellij to allow for better editing in here for the discord task
     // compile "org.apache.httpcomponents:httpmime:4.5.13"
     //implementation fg.deobf("curse.maven:torohealth-damage-indicators-245733:3556931")
@@ -225,6 +225,7 @@ task srcJar(type: Jar) {
     build.dependsOn it
     from sourceSets.main.allSource
     classifier = 'sources'
+    baseName "${archivesBaseName}${project.mc_version}"
     from file("LICENSE")
 }
 
@@ -232,6 +233,7 @@ task deobfJar(type: Jar) {
     build.dependsOn it
     from sourceSets.main.output
     classifier = 'deobf'
+    baseName "${archivesBaseName}${project.mc_version}"
     from file("LICENSE")
 }
 
@@ -307,7 +309,8 @@ curseforge {
         changelog = "${project.github}/blob/${branch}/CHANGELOG.md"
         changelogType = 'markdown'
         releaseType = 'release'
-        addGameVersion '1.19'
+        addGameVersion '1.19.1'
+        addGameVersion '1.19.2'
 
         relations {
             requiredDependency 'sekclib'
diff --git a/gradle.properties b/gradle.properties
index 2a595391..51f6b072 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,9 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 title=Naruto Mod
-archive=NarutoMod-1.19
+archive=NarutoMod
+# This is just for the jar outputs
+mc_version=-1.19-1.19.2
 modid=narutomod
 package=com.sekwah
 vendor=Sekwah
diff --git a/src/main/java/com/sekwah/narutomod/item/NarutoItems.java b/src/main/java/com/sekwah/narutomod/item/NarutoItems.java
index 0998beab..8053ba24 100644
--- a/src/main/java/com/sekwah/narutomod/item/NarutoItems.java
+++ b/src/main/java/com/sekwah/narutomod/item/NarutoItems.java
@@ -97,7 +97,7 @@ public ItemStack makeIcon() {
             -> new NarutoArmorItem(NarutoArmorMaterial.CHARACTER_CLOTHES, EquipmentSlot.CHEST, new Item.Properties().tab(NINJA_ARMOR)));
 
     public static final RegistryObject<Item> LONELY_MARCH = ITEMS.register("lonely_march", ()
-            -> new RecordItem(41, NarutoSounds.LONELY_MARCH, new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.RARE)));
+            -> new RecordItem(41, NarutoSounds.LONELY_MARCH, new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.RARE), 46 * 20));
 
     public static final RegistryObject<Item> FABRIC = ITEMS.register("fabric", ()
             -> new Item(new Item.Properties().tab(NINJA_MATERIALS)));
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index c4894613..3c56f4ea 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,4 +1,5 @@
 modLoader="javafml"
+# Should be higher but the error for this beign wrong is really poor and tied to the forge version.
 loaderVersion="[41,)"
 issueTrackerURL="https://github.com/sekwah41/Naruto-Mod/issues"
 license="All rights reserved"
@@ -17,7 +18,7 @@ A mod that adds new items and other features to the game that are from/based on
 [[dependencies.narutomod]]
     modId="forge"
     mandatory=true
-    versionRange="[41.0.94,)"
+    versionRange="[42,44)"
     ordering="NONE"
     side="BOTH"
 
@@ -25,13 +26,13 @@ A mod that adds new items and other features to the game that are from/based on
 [[dependencies.narutomod]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19]"
+    versionRange="[1.19.1,1.19.2]"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.narutomod]]
     modId="sekclib"
     mandatory=true
-    versionRange="[0.4.1,)"
+    versionRange="[0.4.2,)"
     ordering="NONE"
     side="BOTH"