From a2c681827d9c729ced79ca8fa2e48f163b3d148b Mon Sep 17 00:00:00 2001
From: shartte <shartte@users.noreply.github.com>
Date: Fri, 17 Sep 2021 21:06:14 +0200
Subject: [PATCH] Compile Fixes (#1729)
---
.../fabricmc/fabric/test/dimension/VoidChunkGenerator.java | 5 +++--
.../interaction/MixinServerPlayerInteractionManager.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java b/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java
index 60da94e21..335fc2096 100644
--- a/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java
+++ b/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java
@@ -66,8 +66,9 @@ public class VoidChunkGenerator extends ChunkGenerator {
}
@Override
- public MultiNoiseUtil.MultiNoiseSampler method_38277() {
- return null;
+ public MultiNoiseUtil.MultiNoiseSampler method_38276() {
+ // Mirror what Vanilla does in the debug chunk generator
+ return (x, y, z) -> MultiNoiseUtil.createNoiseValuePoint(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
}
@Override
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerInteractionManager.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerInteractionManager.java
index 1537f1117..a6af35dfb 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerInteractionManager.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerInteractionManager.java
@@ -27,7 +27,8 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
+import net.minecraft.network.Packet;
+import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
import net.minecraft.item.ItemStack;
import net.minecraft.server.network.ServerPlayerEntity;
@@ -67,7 +68,7 @@ public class MixinServerPlayerInteractionManager {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity != null) {
- BlockEntityUpdateS2CPacket updatePacket = BlockEntityUpdateS2CPacket.method_38586(blockEntity);
+ Packet<ClientPlayPacketListener> updatePacket = blockEntity.method_38235();
if (updatePacket != null) {
this.player.networkHandler.sendPacket(updatePacket);