Merge branch 'mc/1.20.4'

CHANGELOG.md

@@ -1,15 +1,7 @@
 # Just Hammers Changelog
 
-## [82.0.1]
-
-### Fixed
-
-- Removed mixin debugs
-- Fixed render issues with neoforge
-
-## [82.0.0]
+## [84.0.0]
 
 ### Changed
 
-- Ported to 1.20.2
-- Moved to new versioning system. 
+- Ported to 1.20.4

fabric/src/main/resources/fabric.mod.json

@@ -26,8 +26,8 @@
     "justhammers.mixins.json"
   ],
   "depends": {
-    "fabric-api": ">=0.73.2",
-    "minecraft": ">=1.19.2",
-    "architectury": ">=6.5.69"
+    "fabric-api": ">=0.91.0",
+    "minecraft": ">=1.20.4",
+    "architectury": ">=11.0.9"
   }
 }

forge/src/main/resources/META-INF/mods.toml

@@ -16,20 +16,20 @@ Add hammers to the game that are able to mine in a 3x3, 3x3x3, 5x5x3 and finally
 [[dependencies.justhammers]]
 modId = "forge"
 mandatory = true
-versionRange = "[48,)"
+versionRange = "[49,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.justhammers]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.2,)"
+versionRange = "[1.20.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.justhammers]]
 modId = "architectury"
 mandatory = true
-versionRange = "[10.0.17,)"
+versionRange = "[11.0.9,)"
 ordering = "AFTER"
 side = "BOTH"

gradle.properties

@@ -1,23 +1,22 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 enabled_platforms=fabric,forge,neoforge
 
 archives_base_name=just-hammers
-mod_version=82.0.1
+mod_version=84.0.0
 maven_group=pro.mikey.mods
 
-architectury_version=10.0.17
+architectury_version=11.0.9
 
 fabric_loader_version=0.15.3
-fabric_api_version=0.91.2+1.20.2
-forge_version=48.1.0
-neo_forge=20.2.86
+fabric_api_version=0.92.0+1.20.4
+forge_version=49.0.12
+neo_forge=20.4.62-beta
 
-rei_version=13.0.685
+rei_version=14.0.688
 
 # Publishing
 modrinth_id=edU0NbZZ
 curseforge_id=681606
 github_repo=errormikey/justhammers
-

neoforge/build.gradle

@@ -88,3 +88,9 @@ publishing {
         }
     }
 }
+
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}

neoforge/src/main/resources/META-INF/mods.toml

@@ -16,22 +16,22 @@ Add hammers to the game that are able to mine in a 3x3, 3x3x3, 5x5x3 and finally
 
 [[dependencies.justhammers]]
 modId = "neoforge"
-mandatory = true
-versionRange = "[20.2,)"
+required = true
+versionRange = "[20.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.justhammers]]
 modId = "minecraft"
-mandatory = true
-versionRange = "[1.20.2,)"
+required = true
+versionRange = "[1.20.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.justhammers]]
 modId = "architectury"
-mandatory = true
-versionRange = "[10.0.17,)"
+required = true
+versionRange = "[11.0.9,)"
 ordering = "AFTER"
 side = "BOTH"