revolutionary innovation

you can now sit on chairs
Fusion-Flux · Jul 26, 2023 · d0508dc · d0508dc
1 parent 2c59b4d
commit d0508dc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/src/main/java/com/fusionflux/portalcubed/entity/ChairEntity.java b/src/main/java/com/fusionflux/portalcubed/entity/ChairEntity.java
@@ -1,12 +1,28 @@
 package com.fusionflux.portalcubed.entity;
 
+import com.fusionflux.portalcubed.util.PortalCubedComponents;
+
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 
 public class ChairEntity extends CorePhysicsEntity  {
     public ChairEntity(EntityType<? extends PathfinderMob> type, Level world) {
         super(type, world);
     }
 
+    @Override
+    protected InteractionResult physicsEntityInteraction(Player player, InteractionHand hand) {
+        if (isVehicle() || level().isClientSide())
+            return InteractionResult.PASS;
+        CorePhysicsEntity heldEntity = PortalCubedComponents.HOLDER_COMPONENT.get(player).entityBeingHeld();
+        if (heldEntity == this)
+            return InteractionResult.PASS;
+
+        player.startRiding(this);
+        return InteractionResult.SUCCESS;
+    }
 }
diff --git a/src/main/java/com/fusionflux/portalcubed/entity/CorePhysicsEntity.java b/src/main/java/com/fusionflux/portalcubed/entity/CorePhysicsEntity.java
@@ -114,8 +114,15 @@ public boolean hurt(DamageSource source, float amount) {
     @Override
     @NotNull
     protected InteractionResult mobInteract(Player player, InteractionHand hand) {
-        Level level = level();
-        if (level.isClientSide() || !player.isCreative() || !player.isShiftKeyDown())
+        return player.isShiftKeyDown() ? toggleLock(player, hand) : physicsEntityInteraction(player, hand);
+    }
+
+    protected InteractionResult physicsEntityInteraction(Player player, InteractionHand hand) {
+        return InteractionResult.PASS;
+    }
+
+    private InteractionResult toggleLock(Player player, InteractionHand hand) {
+        if (level().isClientSide() || !player.isCreative())
             return InteractionResult.PASS;
         ItemStack stack = player.getItemInHand(hand);
         if (!stack.is(PortalCubedItems.HAMMER))

diff --git a/src/main/java/com/fusionflux/portalcubed/entity/RadioEntity.java b/src/main/java/com/fusionflux/portalcubed/entity/RadioEntity.java
@@ -116,12 +116,8 @@ public void tick() {
         }
     }
 
-    @NotNull
     @Override
-    protected InteractionResult mobInteract(Player player, InteractionHand hand) {
-        if (player.isShiftKeyDown())
-            return super.mobInteract(player, hand);
-
+    protected InteractionResult physicsEntityInteraction(Player player, InteractionHand hand) {
         if (!level().isClientSide && player.getItemInHand(hand).is(PortalCubedItems.WRENCHES)) {
             setAllowMute(!isAllowMute());
             if (isAllowMute()) {