diff --git a/gradle.properties b/gradle.properties index 90a7715..66ce545 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ fabric.loom.multiProjectOptimisation=true maven_group=com.terraformersmc.terraform-api version=10.0.0-alpha.7 -minecraft_version=24w10a -yarn_mappings=24w10a+build.7 +minecraft_version=24w11a +yarn_mappings=24w11a+build.2 loader_version=0.15.7 -fabric_version=0.96.8+1.20.5 +fabric_version=0.96.10+1.20.5 diff --git a/terraform-wood-api-v1/src/main/java/com/terraformersmc/terraform/sign/SpriteIdentifierRegistry.java b/terraform-wood-api-v1/src/main/java/com/terraformersmc/terraform/sign/SpriteIdentifierRegistry.java new file mode 100644 index 0000000..fca74b1 --- /dev/null +++ b/terraform-wood-api-v1/src/main/java/com/terraformersmc/terraform/sign/SpriteIdentifierRegistry.java @@ -0,0 +1,37 @@ +package com.terraformersmc.terraform.sign; + +import java.util.Collection; +import java.util.List; + +import net.minecraft.client.util.SpriteIdentifier; + +/** + * @deprecated SpriteIdentifierRegistry is no longer used + * + *

It is no longer necessary to separately register the sign sprite identifiers. + * This class is deprecated and will be removed. + * Calls to {@link #addIdentifier(SpriteIdentifier)} are now no-ops. + */ +@Deprecated(forRemoval = true, since = "10.0.0") +public class SpriteIdentifierRegistry { + public static final SpriteIdentifierRegistry INSTANCE = new SpriteIdentifierRegistry(); + + /** + * @deprecated Ignores the provided sprite identifier + * + * @param sprite Sprite identifier which no longer needs to be registered + */ + @Deprecated(forRemoval = true, since = "10.0.0") + public void addIdentifier(SpriteIdentifier sprite) { + } + + /** + * @deprecated Returns an empty list + * + * @return Collection of registered sign sprite identifiers + */ + @Deprecated(forRemoval = true, since = "10.0.0") + public Collection getIdentifiers() { + return List.of(); + } +} diff --git a/terraform-wood-api-v1/src/testmod/java/com/terraformersmc/terraform/wood/test/TerraformWoodTest.java b/terraform-wood-api-v1/src/testmod/java/com/terraformersmc/terraform/wood/test/TerraformWoodTest.java index 152e50a..7c5598c 100644 --- a/terraform-wood-api-v1/src/testmod/java/com/terraformersmc/terraform/wood/test/TerraformWoodTest.java +++ b/terraform-wood-api-v1/src/testmod/java/com/terraformersmc/terraform/wood/test/TerraformWoodTest.java @@ -12,7 +12,7 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.HangingSignItem; @@ -72,16 +72,16 @@ public void onInitialize() { .build(); // Signs - Block sign = new TerraformSignBlock(SIGN_TEXTURE_ID, FabricBlockSettings.copyOf(Blocks.OAK_SIGN).sounds(BlockSoundGroup.ANVIL)); + Block sign = new TerraformSignBlock(SIGN_TEXTURE_ID, AbstractBlock.Settings.copy(Blocks.OAK_SIGN).sounds(BlockSoundGroup.ANVIL)); Registry.register(Registries.BLOCK, CUSTOM_SIGN_ID, sign); - Block wallSign = new TerraformWallSignBlock(SIGN_TEXTURE_ID, FabricBlockSettings.copyOf(Blocks.OAK_WALL_SIGN).sounds(BlockSoundGroup.SAND).dropsLike(sign)); + Block wallSign = new TerraformWallSignBlock(SIGN_TEXTURE_ID, AbstractBlock.Settings.copy(Blocks.OAK_WALL_SIGN).sounds(BlockSoundGroup.SAND).dropsLike(sign)); Registry.register(Registries.BLOCK, CUSTOM_WALL_SIGN_ID, wallSign); - Block hangingSign = new TerraformHangingSignBlock(HANGING_SIGN_TEXTURE_ID, HANGING_SIGN_GUI_TEXTURE_ID, FabricBlockSettings.copyOf(Blocks.OAK_HANGING_SIGN).sounds(BlockSoundGroup.WOOL)); + Block hangingSign = new TerraformHangingSignBlock(HANGING_SIGN_TEXTURE_ID, HANGING_SIGN_GUI_TEXTURE_ID, AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN).sounds(BlockSoundGroup.WOOL)); Registry.register(Registries.BLOCK, CUSTOM_HANGING_SIGN_ID, hangingSign); - Block wallHangingSign = new TerraformWallHangingSignBlock(HANGING_SIGN_TEXTURE_ID, HANGING_SIGN_GUI_TEXTURE_ID, FabricBlockSettings.copyOf(Blocks.OAK_WALL_HANGING_SIGN).sounds(BlockSoundGroup.SCULK_SENSOR).dropsLike(hangingSign)); + Block wallHangingSign = new TerraformWallHangingSignBlock(HANGING_SIGN_TEXTURE_ID, HANGING_SIGN_GUI_TEXTURE_ID, AbstractBlock.Settings.copy(Blocks.OAK_WALL_HANGING_SIGN).sounds(BlockSoundGroup.SCULK_SENSOR).dropsLike(hangingSign)); Registry.register(Registries.BLOCK, CUSTOM_WALL_HANGING_SIGN_ID, wallHangingSign); Item signItem = new SignItem(new Item.Settings().maxCount(16), sign, wallSign);