[v3.0.1+1.21] support Minecraft 1.21 (#76)

* bump deps

* disable integration with shulker box tooltip

* replaced `new Identifier` with `Identifier.of`

* replaced `Instrument` with `NoteBlockInstrument`

* fixed recipe tests

* fixed tab spaces

* fixed ReinforcedShulkerBoxBlockEntityRenderer

* fixed custom recipes

* renamed data pack directories

* fixed fabric.mod.json

* fixed loot table tests

* bump mod version to v3.0.1+1.21

* removed VoidScreenHandler

* fixed release metadata

build.gradle

@@ -39,10 +39,10 @@ repositories {
 	// 	url "https://maven.kyrptonaught.dev"
 	// }
 
-	// Shulker Box Tooltip
-	maven {
-		url "https://maven.misterpemodder.com/libs-release"
-	}
+	// // Shulker Box Tooltip
+	// maven {
+	// 	url "https://maven.misterpemodder.com/libs-release"
+	// }
 }
 
 loom {
@@ -97,8 +97,8 @@ dependencies {
 	// // Quick Shulker deps
 	// modImplementation "net.kyrptonaught:shulkerutils:${project.shulkerutils_version}"
 
-	// Shulker Box Tooltip
-	modImplementation "com.misterpemodder:shulkerboxtooltip-fabric:${project.shulker_box_tooltip_version}"
+	// // Shulker Box Tooltip
+	// modImplementation "com.misterpemodder:shulkerboxtooltip-fabric:${project.shulker_box_tooltip_version}"
 }
 
 processResources {
@@ -166,14 +166,13 @@ curseforge {
 
 		addGameVersion "Fabric"
 		addGameVersion "Java 21"
-		addGameVersion "1.20.5"
-		addGameVersion "1.20.6"
+		addGameVersion "1.21"
 
 		relations {
 			requiredDependency "fabric-api"
 			embeddedLibrary "cloth-config"
 			optionalDependency "modmenu"
-			optionalDependency "shulkerboxtooltip"
+			// optionalDependency "shulkerboxtooltip"
 			// optionalDependency "quick-shulker"
 			optionalDependency "reinforced-chests"
 		}
@@ -191,14 +190,14 @@ modrinth {
 	versionType = "release"
 	changelog = "[v${project.version}](https://github.com/Aton-Kish/reinforced-shulker-boxes/releases/tag/v" + java.net.URLEncoder.encode(project.version, "UTF-8") + ")"
 
-	gameVersions = ["1.20.5", "1.20.6"]
+	gameVersions = ["1.21"]
 	loaders = ["fabric"]
 
 	dependencies {
 		required.project "fabric-api"
 		embedded.project "cloth-config"
 		optional.project "modmenu"
-		optional.project "shulkerboxtooltip"
+		// optional.project "shulkerboxtooltip"
 		// optional.project "quickshulker"
 		optional.project "reinforced-chests"
 	}

gradle.properties

@@ -4,22 +4,22 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.6
-	yarn_mappings=1.20.6+build.3
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.2
 	loader_version=0.15.11
 
 # Mod Properties
-	mod_version=3.0.0+1.20
+	mod_version=3.0.1+1.21
 	mod_id=reinfshulker
 	maven_group=atonkish.reinfshulker
 	archives_base_name=reinforced-shulker-boxes
 
 # Dependencies
-	fabric_version=0.100.0+1.20.6
-	reinforced_core_version=4.0.0+1.20
-	reinforced_chests_version=3.0.0+1.20
+	fabric_version=0.100.1+1.21
+	reinforced_core_version=4.0.1+1.21
+	reinforced_chests_version=3.0.1+1.21
 	# quick_shulker_version=1.4.0-1.20
-	shulker_box_tooltip_version=4.1.0-alpha.4+1.20.6
+	# shulker_box_tooltip_version=4.1.0-alpha.4+1.20.6
 	# # Quick Shulker deps
 	# shulkerutils_version=1.0.4-1.19
 

src/client/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java

@@ -25,7 +25,7 @@ public class ModTexturedRenderLayers {
     public static SpriteIdentifier registerMaterialDefaultSprite(String namespace, ReinforcingMaterial material) {
         if (!REINFORCED_SHULKER_TEXTURE_ID_MAP.containsKey(material)) {
             SpriteIdentifier identifier = new SpriteIdentifier(TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE,
-                    new Identifier(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker"));
+                    Identifier.of(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker"));
             REINFORCED_SHULKER_TEXTURE_ID_MAP.put(material, identifier);
         }
 
@@ -37,7 +37,7 @@ public static List<SpriteIdentifier> registerMaterialColoringSprites(String name
         if (!COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP.containsKey(material)) {
             List<SpriteIdentifier> identifiers = Stream.of(DyeColor.values()).map((color) -> {
                 return new SpriteIdentifier(TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE,
-                        new Identifier(namespace,
+                        Identifier.of(namespace,
                                 "entity/reinforced_shulker/" + material.getName() + "/shulker_" + color.getName()));
             }).collect(ImmutableList.toImmutableList());
             COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP.put(material, identifiers);

src/client/java/atonkish/reinfshulker/client/render/block/entity/ReinforcedShulkerBoxBlockEntityRenderer.java

@@ -65,7 +65,7 @@ public void render(ReinforcedShulkerBoxBlockEntity reinforcedShulkerBoxBlockEnti
         modelPart.yaw = 270.0F * reinforcedShulkerBoxBlockEntity.getAnimationProgress(tickDelta) * 0.017453292F;
         VertexConsumer vertexConsumer = spriteIdentifier2.getVertexConsumer(vertexConsumers,
                 RenderLayer::getEntityCutoutNoCull);
-        this.model.render(matrices, vertexConsumer, light, overlay, 1.0F, 1.0F, 1.0F, 1.0F);
+        this.model.render(matrices, vertexConsumer, light, overlay);
         matrices.pop();
     }
 }

src/main/java/atonkish/reinfshulker/block/ModBlocks.java

@@ -41,6 +41,6 @@ public static Block registerMaterialDyeColor(String namespace, ReinforcingMateri
     }
 
     private static Block register(String namespace, String id, Block block) {
-        return Registry.register(Registries.BLOCK, new Identifier(namespace, id), block);
+        return Registry.register(Registries.BLOCK, Identifier.of(namespace, id), block);
     }
 }

src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java

@@ -34,7 +34,7 @@ public static BlockEntityType<ReinforcedShulkerBoxBlockEntity> registerMaterial(
 
     private static BlockEntityType<ReinforcedShulkerBoxBlockEntity> create(String namespace, String id,
             BlockEntityType.Builder<ReinforcedShulkerBoxBlockEntity> builder) {
-        return Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(namespace, id),
+        return Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(namespace, id),
                 builder.build(null));
     }
 

src/main/java/atonkish/reinfshulker/gametest/testcase/AdvancementTests.java

@@ -62,16 +62,16 @@ public class AdvancementTests {
                         String.format("Obtain Copper Shulker Box recipe advancement by having %s",
                                 item.getName().getString()),
                         item,
-                        new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box")));
+                        Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box")));
             }
             add(AdvancementTests.createTest(
                     "Obtain Copper Shulker Box recipe advancement by having Copper Ingot",
                     Items.COPPER_INGOT,
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box")));
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box")));
             add(AdvancementTests.createTest(
                     "Obtain Copper Shulker Box recipe advancement by having Copper Chest",
                     atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("copper")),
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                             "recipes/decorations/copper_shulker_box_from_copper_chest")));
 
             // Iron Shulker Box
@@ -81,16 +81,16 @@ public class AdvancementTests {
                         String.format("Obtain Iron Shulker Box recipe advancement by having %s",
                                 item.getName().getString()),
                         item,
-                        new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box")));
+                        Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box")));
             }
             add(AdvancementTests.createTest(
                     "Obtain Iron Shulker Box recipe advancement by having Iron Ingot",
                     Items.IRON_INGOT,
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box")));
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box")));
             add(AdvancementTests.createTest(
                     "Obtain Iron Shulker Box recipe advancement by having Iron Chest",
                     atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("iron")),
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                             "recipes/decorations/iron_shulker_box_from_iron_chest")));
 
             // Gold Shulker Box
@@ -100,16 +100,16 @@ public class AdvancementTests {
                         String.format("Obtain Gold Shulker Box recipe advancement by having %s",
                                 item.getName().getString()),
                         item,
-                        new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box")));
+                        Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box")));
             }
             add(AdvancementTests.createTest(
                     "Obtain Gold Shulker Box recipe advancement by having Gold Ingot",
                     Items.GOLD_INGOT,
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box")));
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box")));
             add(AdvancementTests.createTest(
                     "Obtain Gold Shulker Box recipe advancement by having Gold Chest",
                     atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("gold")),
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                             "recipes/decorations/gold_shulker_box_from_gold_chest")));
 
             // Diamond Shulker Box
@@ -119,16 +119,16 @@ public class AdvancementTests {
                         String.format("Obtain Diamond Shulker Box recipe advancement by having %s",
                                 item.getName().getString()),
                         item,
-                        new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box")));
+                        Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box")));
             }
             add(AdvancementTests.createTest(
                     "Obtain Diamond Shulker Box recipe advancement by having Diamond Ingot",
                     Items.DIAMOND,
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box")));
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box")));
             add(AdvancementTests.createTest(
                     "Obtain Diamond Shulker Box recipe advancement by having Diamond Chest",
                     atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("diamond")),
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                             "recipes/decorations/diamond_shulker_box_from_diamond_chest")));
 
             // Netherite Shulker Box
@@ -138,19 +138,19 @@ public class AdvancementTests {
                         String.format("Obtain Netherite Shulker Box recipe advancement by having %s",
                                 item.getName().getString()),
                         item,
-                        new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                        Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                                 "recipes/decorations/netherite_shulker_box_smithing")));
             }
             add(AdvancementTests.createTest(
                     "Obtain Netherite Shulker Box recipe advancement by having Netherite Ingot",
                     Items.NETHERITE_INGOT,
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                             "recipes/decorations/netherite_shulker_box_smithing")));
             add(AdvancementTests.createTest(
                     "Obtain Netherite Shulker Box recipe advancement by having Netherite Chest",
                     atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP
                             .get(ReinforcingMaterials.MAP.get("netherite")),
-                    new Identifier(ReinforcedShulkerBoxesMod.MOD_ID,
+                    Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID,
                             "recipes/decorations/netherite_shulker_box_from_netherite_chest")));
         }
     };

src/main/java/atonkish/reinfshulker/gametest/testcase/LootTableTests.java

@@ -8,7 +8,6 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
-import net.minecraft.entity.EntityType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -198,7 +197,7 @@ private static TestFunction createTest(String name, Block shulkerBoxBlock, Item
                     CompletableFuture.allOf(futurePartialAct1, futurePartialAct2).thenRun(() -> {
                         try {
                             context.expectBlock(Blocks.AIR, blockPos);
-                            context.expectEntitiesAround(EntityType.ITEM, blockPos, shouldDrop ? 1 : 0, 1);
+                            context.expectItemsAt(shulkerBoxBlock.asItem(), blockPos, 1, shouldDrop ? 1 : 0);
                         } catch (Exception e) {
                             ReinforcedShulkerBoxesMod.LOGGER.error("[{}] {}", testName, e.getMessage());
                             throw e;