From 8211a5048a2d0b333a49d6aa6117c4ae56a93ab1 Mon Sep 17 00:00:00 2001 From: Curle <42079760+TheCurle@users.noreply.github.com> Date: Mon, 17 May 2021 21:51:23 +0100 Subject: [PATCH] Reinstate the MinecartCollisionHandler field to AbstractMinecartEntity (#7748) Closes #7506. --- .../AbstractMinecartEntity.java.patch | 23 +++++++++++++++++++ .../common/IMinecartCollisionHandler.java | 2 +- .../extensions/IForgeEntityMinecart.java | 2 ++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/entity/item/minecart/AbstractMinecartEntity.java.patch b/patches/minecraft/net/minecraft/entity/item/minecart/AbstractMinecartEntity.java.patch index bf62baeb5b..641082f16d 100644 --- a/patches/minecraft/net/minecraft/entity/item/minecart/AbstractMinecartEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/item/minecart/AbstractMinecartEntity.java.patch @@ -9,6 +9,14 @@ private static final DataParameter field_184265_a = EntityDataManager.func_187226_a(AbstractMinecartEntity.class, DataSerializers.field_187192_b); private static final DataParameter field_184266_b = EntityDataManager.func_187226_a(AbstractMinecartEntity.class, DataSerializers.field_187192_b); private static final DataParameter field_184267_c = EntityDataManager.func_187226_a(AbstractMinecartEntity.class, DataSerializers.field_187193_c); +@@ -77,6 +_,7 @@ + p_226574_0_.put(RailShape.NORTH_WEST, Pair.of(vector3i2, vector3i)); + p_226574_0_.put(RailShape.NORTH_EAST, Pair.of(vector3i2, vector3i1)); + }); ++ private static net.minecraftforge.common.IMinecartCollisionHandler COLLISIONS = null; + private int field_70510_h; + private double field_70511_i; + private double field_70509_j; @@ -89,6 +_,7 @@ private double field_70507_ar; @OnlyIn(Dist.CLIENT) @@ -17,6 +25,21 @@ protected AbstractMinecartEntity(EntityType p_i48538_1_, World p_i48538_2_) { super(p_i48538_1_, p_i48538_2_); +@@ -103,6 +_,14 @@ + this.field_70167_r = p_i48539_5_; + this.field_70166_s = p_i48539_7_; + } ++ ++ public net.minecraftforge.common.IMinecartCollisionHandler getCollisionHandler() { ++ return COLLISIONS; ++ } ++ ++ public static void registerCollisionHandler(@Nullable net.minecraftforge.common.IMinecartCollisionHandler handler) { ++ COLLISIONS = handler; ++ } + + public static AbstractMinecartEntity func_184263_a(World p_184263_0_, double p_184263_1_, double p_184263_3_, double p_184263_5_, AbstractMinecartEntity.Type p_184263_7_) { + if (p_184263_7_ == AbstractMinecartEntity.Type.CHEST) { @@ -138,7 +_,7 @@ } diff --git a/src/main/java/net/minecraftforge/common/IMinecartCollisionHandler.java b/src/main/java/net/minecraftforge/common/IMinecartCollisionHandler.java index 4215cd4a8c..b766bf6352 100644 --- a/src/main/java/net/minecraftforge/common/IMinecartCollisionHandler.java +++ b/src/main/java/net/minecraftforge/common/IMinecartCollisionHandler.java @@ -25,7 +25,7 @@ import net.minecraft.entity.item.minecart.AbstractMinecartEntity; /** * This class defines a replacement for the default minecart collision code. - * Only one handler can be registered at a time. It it registered with EntityMinecart.registerCollisionHandler(). + * Only one handler can be registered at a time. It it registered with AbstractMinecartEntity.registerCollisionHandler(). * If you use this, make it a configuration option. * @author CovertJaguar */ diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java b/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java index a0adf5379b..da1fdd1681 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java @@ -32,6 +32,7 @@ public interface IForgeEntityMinecart public static float DEFAULT_MAX_SPEED_AIR_LATERAL = 0.4f; public static float DEFAULT_MAX_SPEED_AIR_VERTICAL = -1.0f; public static double DEFAULT_AIR_DRAG = 0.95f; + /** TODO: Remove 1.17 */ public static IMinecartCollisionHandler COLLISIONS = null; default AbstractMinecartEntity getMinecart() { @@ -41,6 +42,7 @@ public interface IForgeEntityMinecart /** * Gets the current global Minecart Collision handler if none * is registered, returns null + * TODO: remove 1.17 * @return The collision handler or null */ default IMinecartCollisionHandler getCollisionHandler() {