diff --git a/src/main/java/org/betterx/bclib/mixin/common/BlockStateBaseMixin.java b/src/main/java/org/betterx/bclib/mixin/common/BlockStateBaseMixin.java deleted file mode 100644 index d32bce37..00000000 --- a/src/main/java/org/betterx/bclib/mixin/common/BlockStateBaseMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.betterx.bclib.mixin.common; - -import org.betterx.bclib.util.MethodReplace; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.function.Function; - -@Mixin(BlockStateBase.class) -public class BlockStateBaseMixin { - @Inject(method = "is(Lnet/minecraft/world/level/block/Block;)Z", at = @At("HEAD"), cancellable = true) - private void bclib_replaceFunction(Block block, CallbackInfoReturnable info) { - Function replacement = MethodReplace.getBlockReplace(block); - if (replacement != null) { - info.setReturnValue(replacement.apply(BlockStateBase.class.cast(this))); - } - } -} diff --git a/src/main/java/org/betterx/bclib/util/MethodReplace.java b/src/main/java/org/betterx/bclib/util/MethodReplace.java index 5dbe1ca7..dbe1a7f5 100644 --- a/src/main/java/org/betterx/bclib/util/MethodReplace.java +++ b/src/main/java/org/betterx/bclib/util/MethodReplace.java @@ -19,6 +19,7 @@ public class MethodReplace { MethodReplace.item = item; } + @Deprecated(forRemoval = true) public static void addBlockReplace(Block block, Function blockReplace) { MethodReplace.blockReplace = blockReplace; MethodReplace.block = block; @@ -35,6 +36,7 @@ public class MethodReplace { } @Nullable + @Deprecated(forRemoval = true) public static Function getBlockReplace(Block block) { if (MethodReplace.block != block) { return null; diff --git a/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json index 0f3c6372..9caf55af 100644 --- a/src/main/resources/bclib.mixins.common.json +++ b/src/main/resources/bclib.mixins.common.json @@ -9,7 +9,6 @@ "BiomeGenerationSettingsAccessor", "BiomeMixin", "BiomeSourceMixin", - "BlockStateBaseMixin", "BoneMealItemMixin", "ChunkGeneratorAccessor", "ChunkGeneratorMixin",