Fix Entity eye height for multipart entities.

This commit is contained in:
LexManos committed 2023-07-15 10:45:21 -07:00
1 parent 150e8281ae
commit 16863c8d3b
3 files changed
+10 -10

No files matched your search

@@ -21,7 +21,7 @@
+ m_142416_(net.minecraft.client.gui.components.Button.m_253074_(Component.m_237113_(">"), b -> tabPage = Math.min(tabPage + 1, maxPages))
+ .m_252794_(guiLeft + f_169556_ - 20, guiTop - 50).m_253046_(20, 20).m_253136_());
+ maxPages = this.f_97335_.size() / AdvancementTabType.MAX_TABS;
+ }
+ }
}
public void m_7861_() {
@@ -604,7 +604,7 @@
public float m_274421_() {
return this.f_19793_;
}
@@ -3319,6 +_,103 @@
@@ -3319,6 +_,111 @@
public boolean m_142265_(Level p_146843_, BlockPos p_146844_) {
return true;
}
@@ -703,6 +703,14 @@
+ return this.forgeFluidTypeHeight.object2DoubleEntrySet().stream().max(java.util.Comparator.comparingDouble(Object2DoubleMap.Entry::getDoubleValue)).map(Object2DoubleMap.Entry::getKey).orElseGet(net.minecraftforge.common.ForgeMod.EMPTY_TYPE);
+ }
+
+ 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);
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(evt);
+ return evt.getNewSize();
+ }
+
+ /* ================================== Forge End =====================================*/
+
@@ -430,14 +430,6 @@ public interface IForgeEntity extends ICapabilitySerializable<CompoundTag>
return false;
}
default EntityDimensions getDimensionsForge(Pose pose)
{
EntityDimensions size = self().getDimensions(pose);
EntityEvent.Size evt = new EntityEvent.Size(self(), pose, size);
MinecraftForge.EVENT_BUS.post(evt);
return evt.getNewSize();
}
default float getEyeHeightForge(Pose pose, EntityDimensions size)
{
float eyeHeight = self().getEyeHeightAccess(pose, size);