From 4358767de751f635239ca2376b6ba4f6e01b0190 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 27 Sep 2020 00:29:53 +0300 Subject: [PATCH] Crafting table fix --- .../common/CraftingScreenHandlerMixin.java | 29 +++++++++++++++++++ .../resources/betterend.mixins.common.json | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ru/betterend/mixin/common/CraftingScreenHandlerMixin.java diff --git a/src/main/java/ru/betterend/mixin/common/CraftingScreenHandlerMixin.java b/src/main/java/ru/betterend/mixin/common/CraftingScreenHandlerMixin.java new file mode 100644 index 00000000..ac54037a --- /dev/null +++ b/src/main/java/ru/betterend/mixin/common/CraftingScreenHandlerMixin.java @@ -0,0 +1,29 @@ +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.block.CraftingTableBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.screen.CraftingScreenHandler; +import net.minecraft.screen.ScreenHandlerContext; + +@Mixin(CraftingScreenHandler.class) +public abstract class CraftingScreenHandlerMixin +{ + @Shadow + @Final + private ScreenHandlerContext context; + + @Inject(method = "canUse", at = @At("HEAD"), cancellable = true) + private void canUse(PlayerEntity player, CallbackInfoReturnable info) { + info.setReturnValue(context.run((world, pos) -> { + return world.getBlockState(pos).getBlock() instanceof CraftingTableBlock; + }, true)); + info.cancel(); + } +} diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index a79359d4..6cfb90af 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -7,7 +7,8 @@ "DimensionTypeMixin", "RecipeManagerMixin", "ServerPlayNetworkHandlerMixin", - "TagGroupLoaderMixin" + "TagGroupLoaderMixin", + "CraftingScreenHandlerMixin" ], "injectors": { "defaultRequire": 1