[FFN]: Port to 1.20.4

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Forge Semantic Versioning](https://docs.minecraftfo
 ## [Unreleased]
 - Nothing new.
 
+## [1.20.4-3.2.1.0] - 2024/01/13
+- Ported to 1.20.4.
+- Fix `FireManager.getCampfireBlock()` returning the source block rather than the campfire block.
+
 ## [1.20.2-3.2.1.0] - 2023/11/17
 - Add [#32](https://github.com/Nyphet/soul-fire-d/issues/32).
 - Add new tweaking option for enchantments, refer to the [wiki](https://github.com/Nyphet/soul-fire-d/wiki/Registering-your-Fire#tweaking-enchantments) for more info.

README.md

@@ -1,7 +1,7 @@
 ![Soul Fire'd banner](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/soul-fire-d/banner.gif)
 
 ---
-![Minecraft](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/minecraft.svg)[![1.20.2](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-20-2.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.20.2)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.20.1](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-20-1.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.20.1)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.19.4](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-19-4.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.19.4)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.19.3](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-19-3.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.19.3)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.19.2](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-19-2.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.19.2)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.18.2](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-18-2.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.18.2)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.16.5](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-16-5.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.16.5)
+![Minecraft](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/minecraft.svg)[![1.20.4](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-20-4.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.20.4)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.20.2](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-20-2.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.20.2)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.20.1](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-20-1.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.20.1)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.19.4](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-19-4.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.19.4)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.19.3](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-19-3.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.19.3)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.19.2](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-19-2.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.19.2)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.18.2](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-18-2.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.18.2)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![1.16.5](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/minecraft/1-16-5.svg)](https://modrinth.com/mod/soul-fire-d/versions?g=1.16.5)
 
 ![Loader](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/loader/loader.svg)[![NeoForge](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/loader/neoforge.svg)](https://modrinth.com/mod/soul-fire-d/versions?l=neoforge)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![Forge](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/loader/forge.svg)](https://modrinth.com/mod/soul-fire-d/versions?l=forge)![Separator](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/separator.svg)[![Fabric](https://raw.githubusercontent.com/Nyphet/mod-fancy-assets/main/loader/fabric.svg)](https://modrinth.com/mod/soul-fire-d/versions?l=fabric)
 

fabric/build.gradle

@@ -8,7 +8,7 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
-archivesBaseName = modid
+archivesBaseName = mod_id
 version = "${minecraft_version}-${mod_version}-${loader.toLowerCase()}"
 group = project.group
 
@@ -35,15 +35,15 @@ dependencies {
 def resourceTarget = "fabric.mod.json"
 def intoTargets = ["$rootDir/bin/main/"]
 def replaceProperties = [
-  modid: modid,
-  modid_kebab: modid_kebab,
-  mod_title: mod_title,
-  minecraft_version: minecraft_version,
-  mod_version: mod_version,
-  loader_version: loader_version,
-  group: group,
-  author: author,
-  github_user: github_user,
+  mod_id                    : mod_id,
+  mod_id_kebab              : mod_id_kebab,
+  mod_title                 : mod_title,
+  minecraft_version         : minecraft_version,
+  mod_version               : mod_version,
+  loader_version            : loader_version,
+  group                     : group,
+  author                    : author,
+  github_user               : github_user,
   forgeconfigapiport_version: forgeconfigapiport_version
 ]
 
@@ -78,7 +78,7 @@ jar {
       "Implementation-Version"  : project.mod_version,
       "Implementation-Vendor"   : project.author,
       "Implementation-Vendor-Id": project.group,
-      "Implementation-URL"      : "https://github.com/${github_user}/${modid_kebab}/tree/${minecraft_version}",
+      "Implementation-URL"      : "https://github.com/${github_user}/${mod_id_kebab}/tree/${minecraft_version}",
       "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
     ])
   }
@@ -89,7 +89,7 @@ tasks.withType(JavaCompile).configureEach {
   it.options.release = 17
 }
 
-def changelog_body = "See [Changelog](https://github.com/${github_user}/${modid_kebab}/blob/master/CHANGELOG.md#${minecraft_version.replaceAll('\\.', '')}-${mod_version.replaceAll('\\.', '')}---${new Date().format("yyyyMMdd")})."
+def changelog_body = "See [Changelog](https://github.com/${github_user}/${mod_id_kebab}/blob/master/CHANGELOG.md#${minecraft_version.replaceAll('\\.', '')}-${mod_version.replaceAll('\\.', '')}---${new Date().format("yyyyMMdd")})."
 
 file("../api-keys.properties").withReader { 
   Properties props = new Properties()
@@ -122,7 +122,7 @@ curseforge {
 
 modrinth {
   token = api_keys.modrinth
-  projectId = modid_kebab
+  projectId = mod_id_kebab
   versionNumber = mod_version
   versionName = "[${loader} - ${minecraft_version}] ${mod_title} v${mod_version}"
   changelog = changelog_body
@@ -139,7 +139,7 @@ modrinth {
 githubRelease {
   token api_keys.github
   owner github_user
-  repo modid_kebab
+  repo mod_id_kebab
   tagName "v${minecraft_version}-${mod_version}"
   targetCommitish minecraft_version
   releaseName "v${minecraft_version}-${mod_version}"

fabric/gradle.properties

@@ -5,22 +5,22 @@ org.gradle.daemon = false
 
 # Fabric Properties
   # check these on https://fabricmc.net/develop
-  minecraft_version = 1.20.2
-  yarn_mappings = 1.20.2+build.1
-  loader_version = 0.14.22
+  minecraft_version = 1.20.4
+  yarn_mappings = 1.20.4+build.1
+  loader_version = 0.15.1
   loader = Fabric
 
 # Mod Properties
   mod_title = Soul fire'd
   mod_version = 3.2.1.0
   author = Crystal Spider
   group = crystalspider
-  modid = soulfired
-  modid_kebab = soul-fire-d
+  mod_id = soulfired
+  mod_id_kebab = soul-fire-d
 
 # Dependencies
-  fabric_version = 0.89.1+1.20.2
-  forgeconfigapiport_version = 9.0.0
+  fabric_version = 0.91.2+1.20.4
+  forgeconfigapiport_version = 20.4.0
 
 # Miscellaneous
   github_user = Nyphet

fabric/src/main/java/crystalspider/soulfired/ModLoader.java

@@ -4,12 +4,12 @@
 import crystalspider.soulfired.config.ModConfig;
 import crystalspider.soulfired.handler.FireResourceReloadListener;
 import crystalspider.soulfired.handler.LootTableEventsHandler;
-import fuzs.forgeconfigapiport.api.config.v2.ForgeConfigRegistry;
+import fuzs.forgeconfigapiport.api.config.v3.ForgeConfigRegistry;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.resource.ResourceType;
-import net.minecraftforge.fml.config.ModConfig.Type;
+import net.neoforged.fml.config.ModConfig.Type;
 
 /**
  * Soul fire'd mod loader.