FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-21 03:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions7

1.15 cherry pick compile fixes

Browse source
This commit is contained in:
modmuss50 2020-08-21 17:31:07 +01:00
parent 32491f53dd
commit ec432e1979
3 changed files with 2 additions and 8 deletions
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric
impl/event/interaction
InteractionEventsRouter.java
mixin/event/interaction
MixinServerPlayerInteractionManager.java
fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1
FabricItemSettings.java

2
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouter.java
View file

@ -18,7 +18,7 @@ package net.fabricmc.fabric.impl.event.interaction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.block.BlockState;
import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
import net.minecraft.client.network.packet.BlockUpdateS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.ActionResult;

2
fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerInteractionManager.java
View file

@ -99,7 +99,7 @@ public class MixinServerPlayerInteractionManager {
}
}
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBroken(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V"), method = "tryBreakBlock", locals = LocalCapture.CAPTURE_FAILHARD)
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBroken(Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V"), method = "tryBreakBlock", locals = LocalCapture.CAPTURE_FAILHARD)
private void onBlockBroken(BlockPos pos, CallbackInfoReturnable<Boolean> cir, BlockState state, BlockEntity entity, Block block, boolean b1) {
PlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(this.world, this.player, pos, state, entity);
}

6
fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemSettings.java
View file

@ -85,10 +85,4 @@ public class FabricItemSettings extends Item.Settings {
super.rarity(rarity);
return this;
}
@Override
public FabricItemSettings fireproof() {
super.fireproof();
return this;
}
}