Update to MC 1.19.4 (#12)

* Add notice on compiling previous versions

* Update mod to 1.19.4-pre2
Bump version

* Update the release workflow as well

* Move README FAQ below images

* Fix wrong MC version dependency in FMJ

* Remove LazyDFU, 1.19.4 DFU optimizations are good enough

* Use vanilla `Material` class instead of custom `MaterialCategory`

* Update to `1.19.4-rc2`

* Add more properties related to releases

* Update to MC 1.19.4

---------

Co-authored-by: NebelNidas <[email protected]>

.github/workflows/release.yaml

@@ -48,12 +48,18 @@ jobs:
           files-primary: build/libs/!(*-@(dev|sources)).jar
           files-secondary: null
 
-          name: Release 4.1.2 for Minecraft 1.19.3
-          version: 4.1.2+1.19.3
+          name: Release 4.2.0 for Minecraft 1.19.4
+          version: 4.2.0+1.19.4
           version-type: release
 
           loaders: |
             fabric
 
           dependencies: |
-            fabric-api       | depends
+            fabric-api | depends | *
+
+          game-versions: |
+            1.19.4
+
+          java: |
+            17

README.md

@@ -13,3 +13,7 @@ Simply combine a normal door with a glass pane in a crafting table, or right cli
 ![Glass doors](./assets/2019-07-09_16.47.56.png)
 
 ![Glass doors and trapdoors](./assets/2020-09-27_02.12.44.png)
+
+
+## FAQ for developers and the like
+If you wish to compile a previous version of Modern Glass Doors, please clone the repo using the appropriate tag from your desired version.

build.gradle

@@ -68,7 +68,6 @@ dependencies {
 		modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 		modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-		modRuntimeOnly "maven.modrinth:lazydfu:${project.lazydfu_version}"
 		modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}"
 		modRuntimeOnly "maven.modrinth:lithium:${project.lithium_version}"
 		modRuntimeOnly "maven.modrinth:starlight:${project.starlight_version}"

gradle.properties

@@ -2,30 +2,29 @@
 org.gradle.jvmargs = -Xmx2G
 
 # Gradle Plugins
-fabric_loom_version = 1.0-SNAPSHOT
+fabric_loom_version = 1.1-SNAPSHOT
 loom_quiltflower_version = 1.8.0
 checkstyle_version = 10.5.0
 
 # Mod Properties
-mod_version = 4.1.2+1.19.3
+mod_version = 4.2.0+1.19.4
 maven_group = com.github.reviversmc
 archives_base_name = modern-glass-doors
 
 # Mod Dependencies
-minecraft_version = 1.19.3
-fabric_loader_version = 0.14.13
-fabric_api_version = 0.73.0+1.19.3
-yarn_mappings = 1.19.3+build.5
+minecraft_version = 1.19.4
+fabric_loader_version = 0.14.18
+fabric_api_version = 0.76.0+1.19.4
+yarn_mappings = 1.19.4+build.1
 
 
 # If true, third-party mods will be loaded during runtime in the developer run configurations
 use_third_party_mods = true
 
-modmenu_version = 5.0.2
-lazydfu_version = 0.1.3
-sodium_version = mc1.19.3-0.4.9
-lithium_version = mc1.19.3-0.10.4
+modmenu_version = 6.1.0-rc.4
+sodium_version = mc1.19.4-0.4.10
+lithium_version = mc1.19.4-0.11.1
 starlight_version = 1.1.1+1.19
-ferrite_core_version = 5.1.0-fabric
-smoothboot_version = 1.19-1.7.1
+ferrite_core_version = 5.2.0-fabric
+smoothboot_version = 1.19.4-1.7.0
 no_fade_version = 3550935

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

@@ -3,6 +3,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.DoorBlock;
+import net.minecraft.block.Material;
 
 public class GlassDoorBlock extends DoorBlock {
 	public static BlockState copyState(BlockState state) {
@@ -22,17 +23,17 @@ public static BlockState copyState(BlockState state) {
 		return state;
 	}
 
-	public final MaterialCategory materialCategory;
+	public final Material materialCategory;
 	public final DoorBlock parentDoorType;
 
-	GlassDoorBlock(MaterialCategory material, DoorBlock parentDoorType) {
-		super(Block.Settings.copy(parentDoorType), parentDoorType.closeSound, parentDoorType.openSound);
+	GlassDoorBlock(Material materialCategory, DoorBlock parentDoorType) {
+		super(Block.Settings.copy(parentDoorType), parentDoorType.blockSetType);
 
-		this.materialCategory = material;
+		this.materialCategory = materialCategory;
 		this.parentDoorType = (DoorBlock) parentDoorType;
 	}
 
-	public MaterialCategory getMaterialCategory() {
+	public Material getMaterialCategory() {
 		return materialCategory;
 	}
 

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

@@ -2,6 +2,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
 import net.minecraft.block.TrapdoorBlock;
 
 public class GlassTrapdoorBlock extends TrapdoorBlock {
@@ -24,17 +25,17 @@ public static BlockState copyState(BlockState state) {
 		return state;
 	}
 
-	private final MaterialCategory materialCategory;
+	private final Material materialCategory;
 	private final TrapdoorBlock parentTrapdoorType;
 
-	GlassTrapdoorBlock(MaterialCategory materialCategory, TrapdoorBlock parentTrapdoorType) {
-		super(Block.Settings.copy(parentTrapdoorType), parentTrapdoorType.closeSound, parentTrapdoorType.openSound);
+	GlassTrapdoorBlock(Material materialCategory, TrapdoorBlock parentTrapdoorType) {
+		super(Block.Settings.copy(parentTrapdoorType), parentTrapdoorType.blockSetType);
 
 		this.materialCategory = materialCategory;
 		this.parentTrapdoorType = (TrapdoorBlock) parentTrapdoorType;
 	}
 
-	public MaterialCategory getMaterialCategory() {
+	public Material getMaterialCategory() {
 		return materialCategory;
 	}
 

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

@@ -7,6 +7,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.DoorBlock;
+import net.minecraft.block.Material;
 import net.minecraft.block.TrapdoorBlock;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
@@ -22,32 +23,32 @@ public class ModernGlassDoorsBlocks {
 	public static final List<GlassTrapdoorBlock> GLASS_TRAPDOORS = new ArrayList<>();
 
 	// Glass doors
-	public static final Block OAK_GLASS_DOOR = registerDoor("oak", MaterialCategory.WOOD, Blocks.OAK_DOOR);
-	public static final Block SPRUCE_GLASS_DOOR = registerDoor("spruce", MaterialCategory.WOOD, Blocks.SPRUCE_DOOR);
-	public static final Block BIRCH_GLASS_DOOR = registerDoor("birch", MaterialCategory.WOOD, Blocks.BIRCH_DOOR);
-	public static final Block ACACIA_GLASS_DOOR = registerDoor("acacia", MaterialCategory.WOOD, Blocks.ACACIA_DOOR);
-	public static final Block JUNGLE_GLASS_DOOR = registerDoor("jungle", MaterialCategory.WOOD, Blocks.JUNGLE_DOOR);
-	public static final Block DARK_OAK_GLASS_DOOR = registerDoor("dark_oak", MaterialCategory.WOOD, Blocks.DARK_OAK_DOOR);
-	public static final Block CRIMSON_GLASS_DOOR = registerDoor("crimson", MaterialCategory.NON_FLAMMABLE_WOOD, Blocks.CRIMSON_DOOR);
-	public static final Block WARPED_GLASS_DOOR = registerDoor("warped", MaterialCategory.NON_FLAMMABLE_WOOD, Blocks.WARPED_DOOR);
-	public static final Block IRON_GLASS_DOOR = registerDoor("iron", MaterialCategory.METAL, Blocks.IRON_DOOR);
-	public static final Block MANGROVE_GLASS_DOOR = registerDoor("mangrove", MaterialCategory.WOOD, Blocks.MANGROVE_DOOR);
-	public static final Block BAMBOO_GLASS_DOOR = registerDoor("bamboo", MaterialCategory.WOOD, Blocks.BAMBOO_DOOR);
+	public static final Block OAK_GLASS_DOOR = registerDoor("oak", Material.WOOD, Blocks.OAK_DOOR);
+	public static final Block SPRUCE_GLASS_DOOR = registerDoor("spruce", Material.WOOD, Blocks.SPRUCE_DOOR);
+	public static final Block BIRCH_GLASS_DOOR = registerDoor("birch", Material.WOOD, Blocks.BIRCH_DOOR);
+	public static final Block ACACIA_GLASS_DOOR = registerDoor("acacia", Material.WOOD, Blocks.ACACIA_DOOR);
+	public static final Block JUNGLE_GLASS_DOOR = registerDoor("jungle", Material.WOOD, Blocks.JUNGLE_DOOR);
+	public static final Block DARK_OAK_GLASS_DOOR = registerDoor("dark_oak", Material.WOOD, Blocks.DARK_OAK_DOOR);
+	public static final Block CRIMSON_GLASS_DOOR = registerDoor("crimson", Material.NETHER_WOOD, Blocks.CRIMSON_DOOR);
+	public static final Block WARPED_GLASS_DOOR = registerDoor("warped", Material.NETHER_WOOD, Blocks.WARPED_DOOR);
+	public static final Block IRON_GLASS_DOOR = registerDoor("iron", Material.METAL, Blocks.IRON_DOOR);
+	public static final Block MANGROVE_GLASS_DOOR = registerDoor("mangrove", Material.WOOD, Blocks.MANGROVE_DOOR);
+	public static final Block BAMBOO_GLASS_DOOR = registerDoor("bamboo", Material.WOOD, Blocks.BAMBOO_DOOR);
 
 	// Glass trapdoors
-	public static final Block OAK_GLASS_TRAPDOOR = registerTrapdoor("oak", MaterialCategory.WOOD, Blocks.OAK_TRAPDOOR);
-	public static final Block SPRUCE_GLASS_TRAPDOOR = registerTrapdoor("spruce", MaterialCategory.WOOD, Blocks.SPRUCE_TRAPDOOR);
-	public static final Block BIRCH_GLASS_TRAPDOOR = registerTrapdoor("birch", MaterialCategory.WOOD, Blocks.BIRCH_TRAPDOOR);
-	public static final Block ACACIA_GLASS_TRAPDOOR = registerTrapdoor("acacia", MaterialCategory.WOOD, Blocks.ACACIA_TRAPDOOR);
-	public static final Block JUNGLE_GLASS_TRAPDOOR = registerTrapdoor("jungle", MaterialCategory.WOOD, Blocks.JUNGLE_TRAPDOOR);
-	public static final Block DARK_OAK_GLASS_TRAPDOOR = registerTrapdoor("dark_oak", MaterialCategory.WOOD, Blocks.DARK_OAK_TRAPDOOR);
-	public static final Block CRIMSON_GLASS_TRAPDOOR = registerTrapdoor("crimson", MaterialCategory.NON_FLAMMABLE_WOOD, Blocks.CRIMSON_TRAPDOOR);
-	public static final Block WARPED_GLASS_TRAPDOOR = registerTrapdoor("warped", MaterialCategory.NON_FLAMMABLE_WOOD, Blocks.WARPED_TRAPDOOR);
-	public static final Block IRON_GLASS_TRAPDOOR = registerTrapdoor("iron", MaterialCategory.METAL, Blocks.IRON_TRAPDOOR);
-	public static final Block MANGROVE_GLASS_TRAPDOOR = registerTrapdoor("mangrove", MaterialCategory.WOOD, Blocks.MANGROVE_TRAPDOOR);
-	public static final Block BAMBOO_GLASS_TRAPDOOR = registerTrapdoor("bamboo", MaterialCategory.WOOD, Blocks.BAMBOO_TRAPDOOR);
+	public static final Block OAK_GLASS_TRAPDOOR = registerTrapdoor("oak", Material.WOOD, Blocks.OAK_TRAPDOOR);
+	public static final Block SPRUCE_GLASS_TRAPDOOR = registerTrapdoor("spruce", Material.WOOD, Blocks.SPRUCE_TRAPDOOR);
+	public static final Block BIRCH_GLASS_TRAPDOOR = registerTrapdoor("birch", Material.WOOD, Blocks.BIRCH_TRAPDOOR);
+	public static final Block ACACIA_GLASS_TRAPDOOR = registerTrapdoor("acacia", Material.WOOD, Blocks.ACACIA_TRAPDOOR);
+	public static final Block JUNGLE_GLASS_TRAPDOOR = registerTrapdoor("jungle", Material.WOOD, Blocks.JUNGLE_TRAPDOOR);
+	public static final Block DARK_OAK_GLASS_TRAPDOOR = registerTrapdoor("dark_oak", Material.WOOD, Blocks.DARK_OAK_TRAPDOOR);
+	public static final Block CRIMSON_GLASS_TRAPDOOR = registerTrapdoor("crimson", Material.NETHER_WOOD, Blocks.CRIMSON_TRAPDOOR);
+	public static final Block WARPED_GLASS_TRAPDOOR = registerTrapdoor("warped", Material.NETHER_WOOD, Blocks.WARPED_TRAPDOOR);
+	public static final Block IRON_GLASS_TRAPDOOR = registerTrapdoor("iron", Material.METAL, Blocks.IRON_TRAPDOOR);
+	public static final Block MANGROVE_GLASS_TRAPDOOR = registerTrapdoor("mangrove", Material.WOOD, Blocks.MANGROVE_TRAPDOOR);
+	public static final Block BAMBOO_GLASS_TRAPDOOR = registerTrapdoor("bamboo", Material.WOOD, Blocks.BAMBOO_TRAPDOOR);
 
-	public static Block registerDoor(String material, MaterialCategory materialCategory, Block parentDoorType) {
+	public static Block registerDoor(String material, Material materialCategory, Block parentDoorType) {
 		assert parentDoorType instanceof DoorBlock;
 
 		GlassDoorBlock door = new GlassDoorBlock(materialCategory, (DoorBlock) parentDoorType);
@@ -62,7 +63,7 @@ public static Block registerDoor(String material, MaterialCategory materialCateg
 		return door;
 	}
 
-	public static Block registerTrapdoor(String material, MaterialCategory materialCategory, Block parentTrapdoorType) {
+	public static Block registerTrapdoor(String material, Material materialCategory, Block parentTrapdoorType) {
 		assert parentTrapdoorType instanceof TrapdoorBlock;
 
 		GlassTrapdoorBlock trapdoor = new GlassTrapdoorBlock(materialCategory, (TrapdoorBlock) parentTrapdoorType);

src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsBlockTagProvider.java

@@ -8,6 +8,7 @@
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.Material;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.BlockTags;
@@ -46,46 +47,38 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
 				getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS),
 				getOrCreateTagBuilder(WOODEN_GLASS_TRAPDOORS));
 
-		List<FabricTagBuilder> metalGlassTrapDoorTagBuilders = Arrays.asList(
+		List<FabricTagBuilder> metalGlassTrapdoorTagBuilders = Arrays.asList(
 				getOrCreateTagBuilder(BlockTags.TRAPDOORS),
 				getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE),
 				getOrCreateTagBuilder(METAL_GLASS_TRAPDOORS));
 
-		for (GlassDoorBlock door: ModernGlassDoorsBlocks.GLASS_DOORS) {
-			switch (door.getMaterialCategory()) {
-				case NON_FLAMMABLE_WOOD:
-				case WOOD:
-					for (FabricTagBuilder tagBuilder : woodenGlassDoorTagBuilders) {
-						tagBuilder.add(door);
-					}
-
-					break;
+		Material material;
 
-				case METAL:
-					for (FabricTagBuilder tagBuilder : metalGlassDoorTagBuilders) {
-						tagBuilder.add(door);
-					}
-
-					break;
+		for (GlassDoorBlock door: ModernGlassDoorsBlocks.GLASS_DOORS) {
+			material = door.getMaterialCategory();
+
+			if (material == Material.NETHER_WOOD || material == Material.WOOD) {
+				for (FabricTagBuilder tagBuilder : woodenGlassDoorTagBuilders) {
+					tagBuilder.add(door);
+				}
+			} else if (material == Material.METAL) {
+				for (FabricTagBuilder tagBuilder : metalGlassDoorTagBuilders) {
+					tagBuilder.add(door);
+				}
 			}
 		}
 
 		for (GlassTrapdoorBlock trapdoor: ModernGlassDoorsBlocks.GLASS_TRAPDOORS) {
-			switch (trapdoor.getMaterialCategory()) {
-				case NON_FLAMMABLE_WOOD:
-				case WOOD:
-					for (FabricTagBuilder tagBuilder : woodenGlassTrapdoorTagBuilders) {
-						tagBuilder.add(trapdoor);
-					}
-
-					break;
-
-				case METAL:
-					for (FabricTagBuilder tagBuilder : metalGlassTrapDoorTagBuilders) {
-						tagBuilder.add(trapdoor);
-					}
-
-					break;
+			material = trapdoor.getMaterialCategory();
+
+			if (material == Material.NETHER_WOOD || material == Material.WOOD) {
+				for (FabricTagBuilder tagBuilder : woodenGlassTrapdoorTagBuilders) {
+					tagBuilder.add(trapdoor);
+				}
+			} else if (material == Material.METAL) {
+				for (FabricTagBuilder tagBuilder : metalGlassTrapdoorTagBuilders) {
+					tagBuilder.add(trapdoor);
+				}
 			}
 		}
 

src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsItemTagProvider.java

@@ -4,12 +4,12 @@
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
+import net.minecraft.block.Material;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.ItemTags;
 
 import com.github.reviversmc.modern_glass_doors.blocks.GlassDoorBlock;
 import com.github.reviversmc.modern_glass_doors.blocks.GlassTrapdoorBlock;
-import com.github.reviversmc.modern_glass_doors.blocks.MaterialCategory;
 import com.github.reviversmc.modern_glass_doors.blocks.ModernGlassDoorsBlocks;
 
 public class ModernGlassDoorsItemTagProvider extends FabricTagProvider.ItemTagProvider {
@@ -20,13 +20,13 @@ public ModernGlassDoorsItemTagProvider(FabricDataOutput output, CompletableFutur
 	@Override
 	protected void configure(RegistryWrapper.WrapperLookup arg) {
 		for (GlassDoorBlock door: ModernGlassDoorsBlocks.GLASS_DOORS) {
-			if (door.getMaterialCategory() == MaterialCategory.NON_FLAMMABLE_WOOD) {
+			if (door.getMaterialCategory() == Material.NETHER_WOOD) {
 				getOrCreateTagBuilder(ItemTags.NON_FLAMMABLE_WOOD).add(door.asItem());
 			}
 		}
 
 		for (GlassTrapdoorBlock trapdoor: ModernGlassDoorsBlocks.GLASS_TRAPDOORS) {
-			if (trapdoor.getMaterialCategory() == MaterialCategory.NON_FLAMMABLE_WOOD) {
+			if (trapdoor.getMaterialCategory() == Material.NETHER_WOOD) {
 				getOrCreateTagBuilder(ItemTags.NON_FLAMMABLE_WOOD).add(trapdoor.asItem());
 			}
 		}

src/main/resources/fabric.mod.json

@@ -39,7 +39,7 @@
 		]
 	},
 	"depends": {
-		"minecraft": ">=1.19.3",
+		"minecraft": ">=1.19.4-rc.2",
 		"fabric-item-group-api-v1": "*",
 		"fabric-blockrenderlayer-v1": "*"
 	}

src/main/resources/modern_glass_doors.accesswidener

@@ -1,5 +1,3 @@
 accessWidener	v1	named
-accessible	field	net/minecraft/block/DoorBlock	closeSound	Lnet/minecraft/sound/SoundEvent;
-accessible	field	net/minecraft/block/DoorBlock	openSound	Lnet/minecraft/sound/SoundEvent;
-accessible	field	net/minecraft/block/TrapdoorBlock	closeSound	Lnet/minecraft/sound/SoundEvent;
-accessible	field	net/minecraft/block/TrapdoorBlock	openSound	Lnet/minecraft/sound/SoundEvent;
+accessible	field	net/minecraft/block/DoorBlock	blockSetType	Lnet/minecraft/block/BlockSetType;
+accessible	field	net/minecraft/block/TrapdoorBlock	blockSetType	Lnet/minecraft/block/BlockSetType;