From 26adf4da44372df2819c6bbfeb179e02dd8acb14 Mon Sep 17 00:00:00 2001
From: Jonathan Colmenares <me@jonathing.me>
Date: Mon, 17 Jul 2023 07:49:39 -0700
Subject: [PATCH] Re-add EntityEvent.Size methods to maintain bincompat

---
 .../minecraft/world/entity/Entity.java.patch  |  4 +-
 .../event/entity/EntityEvent.java             | 50 ++++++++++++++++---
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch
index f6c8110cc7..7568f7728e 100644
--- a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch
+++ b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch
@@ -705,8 +705,8 @@
 +
 +   public EntityDimensions getDimensionsForge(Pose pose) {
 +       EntityDimensions size = m_6972_(pose);
-+       if (size == null) size = this.f_19815_; // this is called in the entity constructor so it is possible that subclasses are not initalized and dont return anything here. Souse the default.
-+       var evt = new net.minecraftforge.event.entity.EntityEvent.Size(this, pose, size);
++       if (size == null) size = this.f_19815_; // this is called in the entity constructor so it is possible that subclasses are not initalized and dont return anything here. So use the default.
++       var evt = new net.minecraftforge.event.entity.EntityEvent.Size(this, pose, size, this.m_6380_(pose, size));
 +       net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(evt);
 +       return evt.getNewSize();
 +   }
diff --git a/src/main/java/net/minecraftforge/event/entity/EntityEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityEvent.java
index 60b9526f24..6342eb70ac 100644
--- a/src/main/java/net/minecraftforge/event/entity/EntityEvent.java
+++ b/src/main/java/net/minecraftforge/event/entity/EntityEvent.java
@@ -128,8 +128,8 @@ public class EntityEvent extends Event
     }
 
     /**
-     * This event is fired whenever {@link IForgeEntity#getDimensionsForge(Pose)} gets called.<br>
-     * CAREFUL: This is also fired in the Entity constructor. Therefore the entity(subclass) might not be fully initialized. Check Entity#isAddedToWorld() or !Entity#firstUpdate.<br>
+     * This event is fired whenever {@link Entity#getDimensionsForge(Pose)} gets called.<br>
+     * CAREFUL: This is also fired in the Entity constructor. Therefore, the entity (subclass) might not be fully initialized. Check {@link Entity#isAddedToWorld()} or {@code !Entity.firstUpdate}.<br>
      * If you change the player's size, you probably want to set the eye height accordingly as well<br>
      * <br>
      * This event is not {@link Cancelable}.<br>
@@ -143,24 +143,60 @@ public class EntityEvent extends Event
         private final Pose pose;
         private final EntityDimensions originalSize;
         private EntityDimensions newSize;
+        private final float oldEyeHeight;
+        private float newEyeHeight;
 
         public Size(Entity entity, Pose pose, EntityDimensions size)
+        {
+            this(entity, pose, size, 1.0f); // Eye height doesn't matter this is just for binary compatibility.
+        }
+
+        @Deprecated(forRemoval = true, since = "1.20.1")
+        public Size(Entity entity, Pose pose, EntityDimensions size, float defaultEyeHeight)
+        {
+            this(entity, pose, size, size, defaultEyeHeight, defaultEyeHeight);
+        }
+
+        @Deprecated(forRemoval = true, since = "1.20.1")
+        public Size(Entity entity, Pose pose, EntityDimensions oldSize, EntityDimensions newSize, float oldEyeHeight, float newEyeHeight)
         {
             super(entity);
             this.pose = pose;
-            this.originalSize = size;
-            this.newSize = size;
+            this.originalSize = oldSize;
+            this.newSize = newSize;
+            this.oldEyeHeight = oldEyeHeight;
+            this.newEyeHeight = newEyeHeight;
         }
 
         public Pose getPose() { return pose; }
+        /** @deprecated Use {@link #getOriginalSize()} */
+        @Deprecated(forRemoval = true, since = "1.20.1")
+        public EntityDimensions getOldSize() { return this.getOriginalSize(); }
         public EntityDimensions getOriginalSize() { return originalSize; }
         public EntityDimensions getNewSize() { return newSize; }
-        public void setNewSize(EntityDimensions newSize) { this.newSize = newSize; }
+        public void setNewSize(EntityDimensions size) { this.newSize = size; }
+
+        /** @deprecated Use {@link EyeHeight} to hook into changes to eye height. Updating the eye height will not actually so anything anymore. */
+        @Deprecated(forRemoval = true)
+        public void setNewSize(EntityDimensions size, boolean updateEyeHeight)
+        {
+            this.setNewSize(size);
+            if (updateEyeHeight)
+            {
+                this.newEyeHeight = this.getEntity().getEyeHeightAccess(this.getPose(), this.newSize);
+            }
+        }
+        /** @deprecated Use {@link EyeHeight} to hook into changes to eye height. */
+        @Deprecated(forRemoval = true, since = "1.20.1")
+        public float getOldEyeHeight() { return oldEyeHeight; }
+        /** @deprecated Use {@link EyeHeight} to hook into changes to eye height. */
+        @Deprecated(forRemoval = true, since = "1.20.1")
+        public void setNewEyeHeight(float eyeHeight) { this.newEyeHeight = eyeHeight; }
     }
 
     /**
-     * This event is fired whenever {@link IForgeEntity#getEyeHeightForge(Pose)} gets called.<br>
-     * CAREFUL: This is also fired in the Entity constructor. Therefore the entity(subclass) might not be fully initialized. Check Entity#isAddedToWorld() or !Entity#firstUpdate.<br>
+     * This event is fired whenever {@link IForgeEntity#getEyeHeightForge(Pose, EntityDimensions)} gets called.<br>
+     * CAREFUL: This is also fired in the Entity constructor. Therefore, the entity (subclass) might not be fully initialized. Check {@link Entity#isAddedToWorld()} or {@code !Entity.firstUpdate}.<br>
      * <br>
      * This event is not {@link Cancelable}.<br>
      * <br>