Compiles again.

This commit is contained in:
Sebastian Hartte
2020-07-27 23:50:28 +02:00
parent 56ecda5173
commit 84e6aaa122
136 changed files with 1004 additions and 1108 deletions
@@ -481,7 +481,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
|| material == Material.WATER || material.isLiquid();
return !ignoreMaterials && hardness >= 0f && w.isBlockLoaded(pos)
&& w.canMineBlockBody(Platform.getPlayer(w), pos);
&& w.isBlockModifiable(Platform.getPlayer(w), pos);
}
protected List<ItemStack> obtainBlockDrops(final ServerWorld w, final BlockPos pos) {
@@ -493,7 +493,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
ItemStack harvestTool = createHarvestTool(state);
if (harvestTool == null) {
if (!state.getMaterial().isToolNotRequired()) {
if (!state.getRequiresTool()) {
harvestTool = ItemStack.EMPTY;
} else {
// In case the block does NOT allow us to harvest it without a tool, or the
@@ -29,6 +29,7 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.Util;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraftforge.api.distmarker.Dist;
@@ -178,7 +179,7 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart
if (player.getHeldItem(hand).isEmpty()) {
this.isLocked = !this.isLocked;
player.sendMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get());
player.sendMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get(), Util.DUMMY_UUID);
this.getHost().markForSave();
this.getHost().markForUpdate();
}