From ddbf4a0cd26490843eb2ecc37e77739825312b26 Mon Sep 17 00:00:00 2001
From: Thutmose <Thutmose@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:53:42 -0500
Subject: [PATCH] another round of elevator adjustments

This makes changes to hitboxes of the elevator while it is moving, to
help with some issues in high latency environments, when the server and
client have different ideas as to what blocks are colliding with the
player.
---
 build.gradle                                  | 13 -----
 .../entity/blockentity/BlockEntityBase.java   |  2 +-
 .../entity/blockentity/block/TempBlock.java   | 52 ++++++++++++++++---
 .../entity/blockentity/block/TempTile.java    |  1 -
 4 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index b4305e5095..9030072a81 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,19 +113,6 @@ minecraft {
                 MainMods { sources sourceSets.main }
             }
         }
-        data = {
-            workingDirectory project.file('run')
-            //property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            properties 'mixin.env.remapRefMap': 'true'
-            property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
-            property 'forge.logging.console.level', 'debug'
-            args '--mod', 'pokecube', '--all', '--output', file('src/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0]
-            mods {
-                pokecube {
-                    source sourceSets.main
-                }
-            }
-        }
     }
 }
 
diff --git a/src/main/java/thut/api/entity/blockentity/BlockEntityBase.java b/src/main/java/thut/api/entity/blockentity/BlockEntityBase.java
index b7792a170f..14d3007867 100644
--- a/src/main/java/thut/api/entity/blockentity/BlockEntityBase.java
+++ b/src/main/java/thut/api/entity/blockentity/BlockEntityBase.java
@@ -296,7 +296,7 @@ public void checkCollision()
 
                 var entityR = this.position().add(pos.x(), pos.y(), pos.z());
 
-                if (newVy > 0) entityR = entityR.add(0, newVy, 0);
+                if (newVy > 0) entityR = entityR.add(0, 0, 0);
 
                 var entityO = this.position().subtract(xo, yo, zo);
                 double x = entity.getX();
diff --git a/src/main/java/thut/api/entity/blockentity/block/TempBlock.java b/src/main/java/thut/api/entity/blockentity/block/TempBlock.java
index b2aabc6c9e..84664f648d 100644
--- a/src/main/java/thut/api/entity/blockentity/block/TempBlock.java
+++ b/src/main/java/thut/api/entity/blockentity/block/TempBlock.java
@@ -47,6 +47,9 @@ public static TempBlock make()
 
     private static boolean solidCheck(final BlockState state, final BlockGetter reader, final BlockPos pos)
     {
+        BlockEntity be = reader.getBlockEntity(pos);
+        if (be instanceof TempTile temp && temp.getEffectiveState() != null)
+            return temp.getEffectiveState().isRedstoneConductor(reader, pos);
         return false;
     }
 
@@ -125,13 +128,25 @@ protected void createBlockStateDefinition(final StateDefinition.Builder<Block, B
 
     @Override
     public void entityInside(final BlockState state, final Level level, final BlockPos pos, final Entity entity)
-    {}
+    {
+        final BlockEntity be = level.getBlockEntity(pos);
+        if (be instanceof TempTile temp && temp.getEffectiveState() != null)
+            temp.getEffectiveState().entityInside(level, pos, entity);
+    }
 
     @Override
     public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, float distance)
     {
         final BlockEntity te = level.getBlockEntity(pos);
-        if (te instanceof TempTile tile) distance = tile.onVerticalCollide(entity, distance);
+        if (te instanceof TempTile tile)
+        {
+            distance = tile.onVerticalCollide(entity, distance);
+            if (tile.getEffectiveState() != null)
+            {
+                tile.getEffectiveState().getBlock().stepOn(level, pos, state, entity);
+                return;
+            }
+        }
         super.fallOn(level, state, pos, entity, distance);
     }
 
@@ -139,7 +154,11 @@ public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, f
     public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity)
     {
         final BlockEntity te = level.getBlockEntity(pos);
-        if (te instanceof TempTile tile) tile.onVerticalCollide(entity, 0);
+        if (te instanceof TempTile tile)
+        {
+            tile.onVerticalCollide(entity, 0);
+            if (tile.getEffectiveState() != null) tile.getEffectiveState().getBlock().stepOn(level, pos, state, entity);
+        }
     }
 
     @Override
@@ -158,10 +177,31 @@ public VoxelShape getShape(final BlockState state, final BlockGetter worldIn, fi
         final BlockEntity te = worldIn.getBlockEntity(pos);
         if (te instanceof TempTile temp)
         {
-            boolean notForcedBox = true;
+            // Default to true for collision, for fast moving things that have
+            // not collided with us yet.
+            boolean forCollision = true;
+
+            // Now check if it should be modified.
             if (context instanceof EntityCollisionContext c && c.getEntity() != null)
-                notForcedBox = temp.blockEntity == null || temp.blockEntity.recentCollides.containsKey(c.getEntity());
-            return temp.getShape(notForcedBox);
+            {
+                boolean collider = false;
+
+                forCollision = temp.blockEntity == null
+                        || (collider = temp.blockEntity.recentCollides.containsKey(c.getEntity()));
+
+                // If it has already collided, we need to check if it
+                // intersects our bounds, if not, we are not colliding, so
+                // report full box for interaction purposes.
+                if (collider)
+                {
+                    VoxelShape base = temp.getShape(false);
+                    if (!base.isEmpty())
+                    {
+                        forCollision = base.bounds().intersects(c.getEntity().getBoundingBox());
+                    }
+                }
+            }
+            return temp.getShape(forCollision);
         }
         return Shapes.empty();
     }
diff --git a/src/main/java/thut/api/entity/blockentity/block/TempTile.java b/src/main/java/thut/api/entity/blockentity/block/TempTile.java
index 9afe227b8c..c3608de489 100644
--- a/src/main/java/thut/api/entity/blockentity/block/TempTile.java
+++ b/src/main/java/thut/api/entity/blockentity/block/TempTile.java
@@ -106,7 +106,6 @@ public InteractionResult use(final BlockState state, final Level world, final Bl
             }
             catch (Exception e)
             {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
                 NO_INTERACT.add(eff);
             }