From 647424c3c99467018329c840b1d7816bc55bce76 Mon Sep 17 00:00:00 2001 From: woodiertexas Date: Sun, 12 Jan 2025 15:31:46 -0800 Subject: [PATCH] untested 1.21.1 port --- build.gradle | 2 +- gradle.properties | 10 +++++----- .../architecture_extensions/ArchExItemGroups.java | 2 +- .../ArchitectureExtensionsBlocks.java | 6 +++--- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 8847e90..302fa37 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "org.quiltmc:quilt-mappings:${project.yarn_mappings}:intermediary-v2" + mappings "org.quiltmc:quilt-mappings:${project.quilt_mappings}:intermediary-v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/gradle.properties b/gradle.properties index 382e314..1564358 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.16.9 +minecraft_version=1.21.1 +quilt_mappings=1.21.1+build.9 +loader_version=0.16.10 # Mod Properties -mod_version=4.0.0+mc1.20.1 +mod_version=4.0.0+mc1.21.1 maven_group=gay.debuggy archives_base_name=architecture_extensions # Dependencies -fabric_version=0.92.3+1.20.1 +fabric_version=0.114.0+1.21.1 diff --git a/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java b/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java index 4e7ad4f..d466872 100644 --- a/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java +++ b/src/main/java/gay/debuggy/architecture_extensions/ArchExItemGroups.java @@ -14,7 +14,7 @@ public class ArchExItemGroups { public static RegistryKey makeItemGroupKey(String mod_id, String itemGroupPath) { - return RegistryKey.of(Registries.ITEM_GROUP.getKey(), new Identifier(mod_id, itemGroupPath)); + return RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(mod_id, itemGroupPath)); } public static final RegistryKey ARCH_EX_JSON_BLOCKS_KEY = makeItemGroupKey(MOD_ID, "json_blocks"); diff --git a/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java b/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java index e0fe55c..7897cf1 100644 --- a/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java +++ b/src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensionsBlocks.java @@ -12,12 +12,12 @@ public class ArchitectureExtensionsBlocks { private static T registerBlock(String path, T block) { - Registry.register(Registries.BLOCK, new Identifier(ArchitectureExtensions.MOD_ID, path), block); - Registry.register(Registries.ITEM, new Identifier(ArchitectureExtensions.MOD_ID, path), new BlockItem(block, new Item.Settings())); + Registry.register(Registries.BLOCK, Identifier.of(ArchitectureExtensions.MOD_ID, path), block); + Registry.register(Registries.ITEM, Identifier.of(ArchitectureExtensions.MOD_ID, path), new BlockItem(block, new Item.Settings())); return block; } - public static final BeamBlock BIRCH_BEAM = registerBlock("birch_beam", new BeamBlock(FabricBlockSettings.copyOf(Blocks.BIRCH_LOG))); + public static final BeamBlock BIRCH_BEAM = registerBlock("birch_beam", new BeamBlock(Block.Settings.copy(Blocks.BIRCH_LOG))); public static void init() {} } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ab348e7..bd897b0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ "mixins": [], "depends": { "fabricloader": ">=0.16.9", - "minecraft": ["1.20", "1.20.1"], + "minecraft": ["1.21.1"], "java": ">=17", "fabric-api": "*" }