mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-26 06:57:51 +01:00
Fix deployers not calling BlockItem#onUse
This commit is contained in:
parent
fa4f5243bc
commit
6a13d6a7b1
4 changed files with 44 additions and 1 deletions
|
@ -300,7 +300,7 @@ public class DeployerHandler {
|
||||||
return;
|
return;
|
||||||
if (useItem == DENY)
|
if (useItem == DENY)
|
||||||
return;
|
return;
|
||||||
if (item instanceof BlockItem && !(item instanceof CartAssemblerBlockItem)
|
if (item instanceof CartAssemblerBlockItem
|
||||||
&& !clickedState.canBeReplaced(new BlockPlaceContext(itemusecontext)))
|
&& !clickedState.canBeReplaced(new BlockPlaceContext(itemusecontext)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
package com.simibubi.create.foundation.mixin;
|
||||||
|
|
||||||
|
import com.simibubi.create.content.kinetics.deployer.DeployerFakePlayer;
|
||||||
|
|
||||||
|
import net.minecraft.world.InteractionResult;
|
||||||
|
import net.minecraft.world.item.BlockItem;
|
||||||
|
|
||||||
|
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||||
|
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
@Mixin(BlockItem.class)
|
||||||
|
public class BlockItemMixin {
|
||||||
|
@Inject(method = "place", at = @At("HEAD"), cancellable = true)
|
||||||
|
private void create$fixDeployerPlacement(BlockPlaceContext pContext, CallbackInfoReturnable<InteractionResult> cir) {
|
||||||
|
BlockState state = pContext.getLevel().getBlockState(((UseOnContextAccessor) pContext).create$getHitResult().getBlockPos());
|
||||||
|
if (state != Blocks.AIR.defaultBlockState() && pContext.getPlayer() instanceof DeployerFakePlayer) {
|
||||||
|
cir.setReturnValue(InteractionResult.PASS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,14 @@
|
||||||
|
package com.simibubi.create.foundation.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.world.item.context.UseOnContext;
|
||||||
|
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
|
|
||||||
|
@Mixin(UseOnContext.class)
|
||||||
|
public interface UseOnContextAccessor {
|
||||||
|
@Invoker("getHitResult")
|
||||||
|
BlockHitResult create$getHitResult();
|
||||||
|
}
|
|
@ -6,6 +6,7 @@
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_17",
|
||||||
"refmap": "create.refmap.json",
|
"refmap": "create.refmap.json",
|
||||||
"mixins": [
|
"mixins": [
|
||||||
|
"BlockItemMixin",
|
||||||
"ClientboundMapItemDataPacketMixin",
|
"ClientboundMapItemDataPacketMixin",
|
||||||
"ContraptionDriverInteractMixin",
|
"ContraptionDriverInteractMixin",
|
||||||
"CustomItemUseEffectsMixin",
|
"CustomItemUseEffectsMixin",
|
||||||
|
@ -15,6 +16,7 @@
|
||||||
"MainMixin",
|
"MainMixin",
|
||||||
"MapItemSavedDataMixin",
|
"MapItemSavedDataMixin",
|
||||||
"TestCommandMixin",
|
"TestCommandMixin",
|
||||||
|
"UseOnContextAccessor",
|
||||||
"WaterWheelFluidSpreadMixin",
|
"WaterWheelFluidSpreadMixin",
|
||||||
"accessor.AbstractProjectileDispenseBehaviorAccessor",
|
"accessor.AbstractProjectileDispenseBehaviorAccessor",
|
||||||
"accessor.DispenserBlockAccessor",
|
"accessor.DispenserBlockAccessor",
|
||||||
|
|
Loading…
Reference in a new issue