imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.19' into 1.19.2

Browse Source
This commit is contained in:
Max
2023-04-05 16:34:19 +02:00
parent 93dd95c6a0 a62231ab87
commit 6e3e5738b6
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fabric/src/main/java/dev/architectury/mixin/fabric/MixinBlockItem.java
View File

@@ -30,10 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(BlockItem.class) @Mixin(BlockItem.class)
public abstract class MixinBlockItem { public abstract class MixinBlockItem {
@Inject(method = "place", @Inject(method = "place", at = @At("HEAD"), cancellable = true)
at = @At(value = "INVOKE",
target = "Lnet/minecraft/world/item/context/BlockPlaceContext;getClickedPos()Lnet/minecraft/core/BlockPos;"),
cancellable = true)
private void place(BlockPlaceContext context, CallbackInfoReturnable<InteractionResult> cir) { private void place(BlockPlaceContext context, CallbackInfoReturnable<InteractionResult> cir) {
var result = BlockEvent.PLACE.invoker().placeBlock(context.getLevel(), context.getClickedPos(), context.getLevel().getBlockState(context.getClickedPos()), context.getPlayer()); var result = BlockEvent.PLACE.invoker().placeBlock(context.getLevel(), context.getClickedPos(), context.getLevel().getBlockState(context.getClickedPos()), context.getPlayer());
if (result.isPresent()) { if (result.isPresent()) {

2
fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerPlayer.java
View File

@@ -37,7 +37,7 @@ import java.util.OptionalInt;
public class MixinServerPlayer { public class MixinServerPlayer {
@Inject(method = "restoreFrom", at = @At("RETURN")) @Inject(method = "restoreFrom", at = @At("RETURN"))
private void restoreFrom(ServerPlayer serverPlayer, boolean bl, CallbackInfo ci) { private void restoreFrom(ServerPlayer serverPlayer, boolean bl, CallbackInfo ci) {
PlayerEvent.PLAYER_CLONE.invoker().clone((ServerPlayer) (Object) this, serverPlayer, bl); PlayerEvent.PLAYER_CLONE.invoker().clone(serverPlayer, (ServerPlayer) (Object) this, bl);
} }
@Inject(method = "openMenu", at = @At("RETURN")) @Inject(method = "openMenu", at = @At("RETURN"))