From 7e06e9ce3f16957c57a82300565d1d89eb0db598 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Mon, 18 Dec 2023 13:27:35 +0100
Subject: [PATCH] Fixed build issues with Chairs

---
 .../betterx/bclib/furniture/block/BaseChair.java  |  4 ++--
 .../bclib/furniture/entity/EntityChair.java       | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/furniture/block/BaseChair.java b/src/main/java/org/betterx/bclib/furniture/block/BaseChair.java
index 46104541..531229d2 100644
--- a/src/main/java/org/betterx/bclib/furniture/block/BaseChair.java
+++ b/src/main/java/org/betterx/bclib/furniture/block/BaseChair.java
@@ -112,11 +112,11 @@ public abstract class BaseChair extends AbstractChair {
     }
 
     @Override
-    public void playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
+    public BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
         if (player.isCreative() && state.getValue(TOP) && world.getBlockState(pos.below()).getBlock() == this) {
             world.setBlockAndUpdate(pos.below(), Blocks.AIR.defaultBlockState());
         }
-        super.playerWillDestroy(world, pos, state, player);
+        return super.playerWillDestroy(world, pos, state, player);
     }
 
     public static class Wood extends BaseChair implements BehaviourWood {
diff --git a/src/main/java/org/betterx/bclib/furniture/entity/EntityChair.java b/src/main/java/org/betterx/bclib/furniture/entity/EntityChair.java
index 30c2964a..cd226983 100644
--- a/src/main/java/org/betterx/bclib/furniture/entity/EntityChair.java
+++ b/src/main/java/org/betterx/bclib/furniture/entity/EntityChair.java
@@ -9,15 +9,14 @@ import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntitySelector;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.*;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.animal.WaterAnimal;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 
+import org.joml.Vector3f;
+
 import java.util.List;
 import org.jetbrains.annotations.Nullable;
 
@@ -115,13 +114,13 @@ public class EntityChair extends Entity {
     }
 
     @Override
-    public double getPassengersRidingOffset() {
-        return 0.0;
+    protected Vector3f getPassengerAttachmentPoint(Entity entity, EntityDimensions entityDimensions, float f) {
+        return new Vector3f(0.0f, 0.0f, 0.0f);
     }
 
     @Override
-    public double getMyRidingOffset() {
-        return 0.0;
+    protected float ridingOffset(Entity entity) {
+        return 0.0f;
     }
 
     @Override