From d9c49d1c076add39665f7db0234e1b3170b4e1dc Mon Sep 17 00:00:00 2001 From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com> Date: Sat, 13 Jan 2024 09:48:33 +0100 Subject: [PATCH] Revert "1.20.2-rc2" This reverts commit 145df60b. --- docs/README.md | 2 +- gradle.properties | 4 +- .../vehicle/AbstractMinecart.java.patch | 47 ++++++++++--------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/docs/README.md b/docs/README.md index f67c1545a4..edeb91e441 100644 --- a/docs/README.md +++ b/docs/README.md @@ -26,7 +26,7 @@ [![craftbukkit-version][]][craftbukkit-commit] [![spigot-version][]][spigot-commit] -at commit (done): 374dbc7a +at commit (done): 145df60b maybe todo commits for build/fmlloader system until 1.20.1: - e34090c8 - e00de1a3 diff --git a/gradle.properties b/gradle.properties index 6882577789..25eef96088 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false JAVA_VERSION=17 -MC_VERSION=1.20.2 +MC_VERSION=1.20.2-rc1 FORGE_VERSION=48.1.0 KETTING_VERSION=0.0.1 MC_NEXT_VERSION=1.21 -MCP_VERSION=20230921.100330 +MCP_VERSION=20230915.121641 MAPPING_CHANNEL=official MAPPING_VERSION=1.20.2 diff --git a/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractMinecart.java.patch b/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractMinecart.java.patch index 7f5a424ec9..6c82fe9a0d 100644 --- a/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractMinecart.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractMinecart.java.patch @@ -1,15 +1,15 @@ --- a/net/minecraft/world/entity/vehicle/AbstractMinecart.java +++ b/net/minecraft/world/entity/vehicle/AbstractMinecart.java -@@ -48,7 +_,7 @@ +@@ -46,7 +_,7 @@ import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public abstract class AbstractMinecart extends Entity { +public abstract class AbstractMinecart extends Entity implements net.minecraftforge.common.extensions.IForgeAbstractMinecart { - private static final float LOWERED_PASSENGER_ATTACHMENT_Y = 0.0F; private static final float PASSENGER_ATTACHMENT_Y = 0.1875F; private static final EntityDataAccessor DATA_ID_HURT = SynchedEntityData.defineId(AbstractMinecart.class, EntityDataSerializers.INT); -@@ -88,6 +_,19 @@ + private static final EntityDataAccessor DATA_ID_HURTDIR = SynchedEntityData.defineId(AbstractMinecart.class, EntityDataSerializers.INT); +@@ -85,6 +_,19 @@ p_38135_.put(RailShape.NORTH_WEST, Pair.of(vec3i2, vec3i)); p_38135_.put(RailShape.NORTH_EAST, Pair.of(vec3i2, vec3i1)); }); @@ -29,7 +29,7 @@ protected AbstractMinecart(EntityType p_38087_, Level p_38088_) { super(p_38087_, p_38088_); -@@ -102,6 +_,14 @@ +@@ -99,6 +_,14 @@ this.zo = p_38094_; } @@ -44,7 +44,7 @@ public static AbstractMinecart createMinecart(Level p_38120_, double p_38121_, double p_38122_, double p_38123_, AbstractMinecart.Type p_38124_) { if (p_38124_ == AbstractMinecart.Type.CHEST) { return new MinecartChest(p_38120_, p_38121_, p_38122_, p_38123_); -@@ -136,7 +_,7 @@ +@@ -133,7 +_,7 @@ } public boolean isPushable() { @@ -53,7 +53,7 @@ } protected Vec3 getRelativePortalPosition(Direction.Axis p_38132_, BlockUtil.FoundRectangle p_38133_) { -@@ -204,6 +_,19 @@ +@@ -200,6 +_,19 @@ if (this.isInvulnerableTo(p_38117_)) { return false; } else { @@ -73,7 +73,7 @@ this.setHurtDir(-this.getHurtDir()); this.setHurtTime(10); this.markHurt(); -@@ -211,6 +_,15 @@ +@@ -207,6 +_,15 @@ this.gameEvent(GameEvent.ENTITY_DAMAGE, p_38117_.getEntity()); boolean flag = p_38117_.getEntity() instanceof Player && ((Player)p_38117_.getEntity()).getAbilities().instabuild; if (flag || this.getDamage() > 40.0F) { @@ -89,7 +89,7 @@ this.ejectPassengers(); if (flag && !this.hasCustomName()) { this.discard(); -@@ -265,6 +_,14 @@ +@@ -261,6 +_,14 @@ } public void tick() { @@ -104,7 +104,7 @@ if (this.getHurtTime() > 0) { this.setHurtTime(this.getHurtTime() - 1); } -@@ -274,7 +_,7 @@ +@@ -270,7 +_,7 @@ } this.checkBelowWorld(); @@ -113,7 +113,7 @@ if (this.level().isClientSide) { if (this.lerpSteps > 0) { this.lerpPositionAndRotationStep(this.lerpSteps, this.lerpX, this.lerpY, this.lerpZ, this.lerpYRot, this.lerpXRot); -@@ -300,9 +_,9 @@ +@@ -296,9 +_,9 @@ BlockPos blockpos = new BlockPos(k, i, j); BlockState blockstate = this.level().getBlockState(blockpos); this.onRails = BaseRailBlock.isRail(blockstate); @@ -125,7 +125,7 @@ this.activateMinecart(k, i, j, blockstate.getValue(PoweredRailBlock.POWERED)); } } else { -@@ -327,20 +_,61 @@ +@@ -323,20 +_,61 @@ } this.setRot(this.getYRot(), this.getXRot()); @@ -190,7 +190,7 @@ entity.push(this); } } -@@ -357,23 +_,34 @@ +@@ -353,23 +_,34 @@ } protected double getMaxSpeed() { @@ -229,7 +229,7 @@ } } -@@ -387,18 +_,19 @@ +@@ -383,18 +_,19 @@ d1 = (double)p_38156_.getY(); boolean flag = false; boolean flag1 = false; @@ -252,7 +252,7 @@ switch (railshape) { case ASCENDING_EAST: this.setDeltaMovement(vec31.add(-d3, 0.0D, 0.0D)); -@@ -444,7 +_,7 @@ +@@ -440,7 +_,7 @@ } } @@ -261,7 +261,7 @@ double d22 = this.getDeltaMovement().horizontalDistance(); if (d22 < 0.03D) { this.setDeltaMovement(Vec3.ZERO); -@@ -473,10 +_,7 @@ +@@ -469,10 +_,7 @@ d0 = d23 + d4 * d14; d2 = d10 + d5 * d14; this.setPos(d0, d1, d2); @@ -273,7 +273,7 @@ if (vec3i.getY() != 0 && Mth.floor(this.getX()) - p_38156_.getX() == vec3i.getX() && Mth.floor(this.getZ()) - p_38156_.getZ() == vec3i.getZ()) { this.setPos(this.getX(), this.getY() + (double)vec3i.getY(), this.getZ()); } else if (vec3i1.getY() != 0 && Mth.floor(this.getX()) - p_38156_.getX() == vec3i1.getX() && Mth.floor(this.getZ()) - p_38156_.getZ() == vec3i1.getZ()) { -@@ -504,7 +_,10 @@ +@@ -500,7 +_,10 @@ this.setDeltaMovement(d26 * (double)(j - p_38156_.getX()), vec35.y, d26 * (double)(i - p_38156_.getZ())); } @@ -285,7 +285,7 @@ Vec3 vec36 = this.getDeltaMovement(); double d27 = vec36.horizontalDistance(); if (d27 > 0.01D) { -@@ -547,7 +_,7 @@ +@@ -543,7 +_,7 @@ } protected void applyNaturalSlowdown() { @@ -294,7 +294,7 @@ Vec3 vec3 = this.getDeltaMovement(); vec3 = vec3.multiply(d0, 0.0D, d0); if (this.isInWater()) { -@@ -568,7 +_,7 @@ +@@ -564,7 +_,7 @@ BlockState blockstate = this.level().getBlockState(new BlockPos(i, j, k)); if (BaseRailBlock.isRail(blockstate)) { @@ -303,7 +303,7 @@ p_38098_ = (double)j; if (railshape.isAscending()) { p_38098_ = (double)(j + 1); -@@ -607,7 +_,7 @@ +@@ -603,7 +_,7 @@ BlockState blockstate = this.level().getBlockState(new BlockPos(i, j, k)); if (BaseRailBlock.isRail(blockstate)) { @@ -312,7 +312,7 @@ Pair pair = exits(railshape); Vec3i vec3i = pair.getFirst(); Vec3i vec3i1 = pair.getSecond(); -@@ -669,9 +_,21 @@ +@@ -665,9 +_,21 @@ } public void push(Entity p_38165_) { @@ -334,7 +334,7 @@ double d0 = p_38165_.getX() - this.getX(); double d1 = p_38165_.getZ() - this.getZ(); double d2 = d0 * d0 + d1 * d1; -@@ -702,11 +_,11 @@ +@@ -698,11 +_,11 @@ Vec3 vec32 = this.getDeltaMovement(); Vec3 vec33 = p_38165_.getDeltaMovement(); @@ -348,7 +348,8 @@ p_38165_.setDeltaMovement(vec33.multiply(0.2D, 1.0D, 0.2D)); p_38165_.push(vec32.x + d0, 0.0D, vec32.z + d1); this.setDeltaMovement(vec32.multiply(0.95D, 1.0D, 0.95D)); -@@ -824,6 +_,42 @@ +@@ -819,7 +_,43 @@ + public void setCustomDisplay(boolean p_38139_) { this.getEntityData().set(DATA_ID_CUSTOM_DISPLAY, p_38139_); } @@ -391,7 +392,7 @@ public ItemStack getPickResult() { Item item; switch (this.getMinecartType()) { -@@ -858,4 +_,26 @@ +@@ -854,4 +_,26 @@ HOPPER, COMMAND_BLOCK; }