Merge branch '1.20.4' into 1.20

# Conflicts:
#	.github/workflows/release.yaml
#	gradle.properties
#	src/main/resources/fabric.mod.json

.github/workflows/release.yaml

@@ -52,8 +52,8 @@ jobs:
 
           files: build/libs/!(*-@(dev|sources)).jar
 
-          name: Release 5.2.0 for Minecraft 1.20.2
-          version: 5.2.0+1.20.2
+          name: Release 5.3.0 for Minecraft 1.20.3 and later
+          version: 5.3.0+1.20.3-and-later
           version-type: release
 
           loaders: |
@@ -63,7 +63,7 @@ jobs:
             fabric-api@*(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github)
 
           game-versions: |
-            1.20.2
+            [1.20.3,1.20.4]
 
           game-version-filter: none
 

build.gradle

@@ -71,7 +71,8 @@ dependencies {
 		modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
 		modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}"
 		modRuntimeOnly "maven.modrinth:lithium:${project.lithium_version}"
-		modRuntimeOnly "maven.modrinth:ferrite-core:${project.ferritecore_version}"
+		// not available for MC 1.20.3
+		// modRuntimeOnly "maven.modrinth:ferrite-core:${project.ferritecore_version}"
 	}
 }
 

gradle.properties

@@ -8,19 +8,20 @@ fabric_loom_version = 1.4-SNAPSHOT
 checkstyle_version = 10.12.1
 
 # Mod Properties
-mod_version = 5.2.0+1.20.2
+mod_version = 5.3.0+1.20.3-and-later
 maven_group = com.github.reviversmc
 archives_base_name = modern-glass-doors
 
 # Mod Dependencies
-minecraft_version = 1.20.2
+minecraft_version = 1.20.3
 fabric_loader_version = 0.15.3
-fabric_api_version = 0.91.2+1.20.2
-yarn_mappings = 1.20.2+build.4
+fabric_api_version = 0.91.1+1.20.3
+yarn_mappings = 1.20.3+build.1
 
 # Dev-Env Mods
 use_third_party_mods = true
-modmenu_version = 8.0.1
-sodium_version = mc1.20.2-0.5.5
-lithium_version = mc1.20.2-0.12.0
-ferritecore_version = 6.0.1-fabric
+modmenu_version = 9.0.0
+sodium_version = mc1.20.3-0.5.5
+lithium_version = mc1.20.3-0.12.1
+# not available for MC 1.20.3; disabled in build.gradle
+ferritecore_version = 6.0.3-fabric

src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java

@@ -26,7 +26,7 @@ public static BlockState copyState(BlockState state) {
 	public final DoorBlock parentDoorType;
 
 	GlassDoorBlock(MaterialCategory materialCategory, DoorBlock parentDoorType) {
-		super(Block.Settings.copy(parentDoorType), parentDoorType.blockSetType);
+		super(parentDoorType.blockSetType, Block.Settings.copy(parentDoorType));
 
 		this.materialCategory = materialCategory;
 		this.parentDoorType = (DoorBlock) parentDoorType;

src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java

@@ -28,7 +28,7 @@ public static BlockState copyState(BlockState state) {
 	private final TrapdoorBlock parentTrapdoorType;
 
 	GlassTrapdoorBlock(MaterialCategory materialCategory, TrapdoorBlock parentTrapdoorType) {
-		super(Block.Settings.copy(parentTrapdoorType), parentTrapdoorType.blockSetType);
+		super(parentTrapdoorType.blockSetType, Block.Settings.copy(parentTrapdoorType));
 
 		this.materialCategory = materialCategory;
 		this.parentTrapdoorType = (TrapdoorBlock) parentTrapdoorType;

src/main/resources/fabric.mod.json

@@ -41,7 +41,7 @@
 		]
 	},
 	"depends": {
-		"minecraft": "1.20.2",
+		"minecraft": ">=1.20.3",
 		"fabric-item-group-api-v1": "*",
 		"fabric-blockrenderlayer-v1": "*"
 	}