diff --git a/common/src/main/java/dev/architectury/registry/block/BlockPropertiesExtension.java b/common/src/main/java/dev/architectury/registry/block/BlockPropertiesExtension.java index b869d981..37da95f4 100644 --- a/common/src/main/java/dev/architectury/registry/block/BlockPropertiesExtension.java +++ b/common/src/main/java/dev/architectury/registry/block/BlockPropertiesExtension.java @@ -20,11 +20,4 @@ package dev.architectury.registry.block; public interface BlockPropertiesExtension { - @Deprecated - default BlockProperties tool(ToolType type) { - return tool(type, 0); - } - - @Deprecated - BlockProperties tool(ToolType type, int level); } \ No newline at end of file diff --git a/common/src/main/java/dev/architectury/registry/level/entity/EntityRendererRegistry.java b/common/src/main/java/dev/architectury/registry/level/entity/EntityRendererRegistry.java index 337619a1..16cf2645 100644 --- a/common/src/main/java/dev/architectury/registry/level/entity/EntityRendererRegistry.java +++ b/common/src/main/java/dev/architectury/registry/level/entity/EntityRendererRegistry.java @@ -25,7 +25,6 @@ import net.fabricmc.api.Environment; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; -import org.jetbrains.annotations.ApiStatus; import java.util.function.Supplier; @@ -34,12 +33,6 @@ public final class EntityRendererRegistry { private EntityRendererRegistry() { } - @Deprecated - @ApiStatus.ScheduledForRemoval - public static void register(EntityType type, EntityRendererProvider provider) { - register(() -> type, provider); - } - @ExpectPlatform public static void register(Supplier> type, EntityRendererProvider provider) { throw new AssertionError(); diff --git a/fabric/src/main/java/dev/architectury/registry/block/fabric/BlockPropertiesImpl.java b/fabric/src/main/java/dev/architectury/registry/block/fabric/BlockPropertiesImpl.java index b970b08a..b0662a8e 100644 --- a/fabric/src/main/java/dev/architectury/registry/block/fabric/BlockPropertiesImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/block/fabric/BlockPropertiesImpl.java @@ -20,9 +20,7 @@ package dev.architectury.registry.block.fabric; import dev.architectury.registry.block.BlockProperties; -import dev.architectury.registry.block.ToolType; import net.fabricmc.fabric.impl.object.builder.BlockSettingsInternals; -import net.fabricmc.fabric.impl.object.builder.FabricBlockInternals; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; @@ -71,11 +69,5 @@ public class BlockPropertiesImpl { public Impl(Material material, Function function) { super(material, function); } - - @Override - public BlockProperties tool(ToolType type, int level) { - FabricBlockInternals.computeExtraData(this).addMiningLevel(type.fabricTag.get(), level); - return this; - } } } diff --git a/forge/src/main/java/dev/architectury/registry/block/forge/BlockPropertiesImpl.java b/forge/src/main/java/dev/architectury/registry/block/forge/BlockPropertiesImpl.java index 4f735dba..d652d58e 100644 --- a/forge/src/main/java/dev/architectury/registry/block/forge/BlockPropertiesImpl.java +++ b/forge/src/main/java/dev/architectury/registry/block/forge/BlockPropertiesImpl.java @@ -64,11 +64,5 @@ public class BlockPropertiesImpl { public Impl(Material material, Function function) { super(material, function); } - - @Override - @Deprecated - public BlockProperties tool(ToolType type, int level) { - return this; - } } } diff --git a/testmod-common/src/main/java/dev/architectury/test/TestMod.java b/testmod-common/src/main/java/dev/architectury/test/TestMod.java index 84d623de..eef1c202 100644 --- a/testmod-common/src/main/java/dev/architectury/test/TestMod.java +++ b/testmod-common/src/main/java/dev/architectury/test/TestMod.java @@ -63,7 +63,7 @@ public class TestMod { public static void initializeClient() { TestKeybinds.initialize(); TestModNet.initializeClient(); - EntityRendererRegistry.register(TestEntity.TYPE, context -> + EntityRendererRegistry.register(() -> TestEntity.TYPE, context -> new MinecartRenderer<>(context, ModelLayers.MINECART)); } }