aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0760-Friction-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0760-Friction-API.patch')
-rw-r--r--patches/unapplied/server/0760-Friction-API.patch245
1 files changed, 245 insertions, 0 deletions
diff --git a/patches/unapplied/server/0760-Friction-API.patch b/patches/unapplied/server/0760-Friction-API.patch
new file mode 100644
index 0000000000..d0219e68b9
--- /dev/null
+++ b/patches/unapplied/server/0760-Friction-API.patch
@@ -0,0 +1,245 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Noah van der Aa <[email protected]>
+Date: Wed, 15 Sep 2021 20:44:22 +0200
+Subject: [PATCH] Friction API
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index d239108bd98fe885eba50a17855f2d62de02c70e..cd2d6b55b494830797014dbc3cc1f0fbf6518249 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -296,6 +296,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ public boolean bukkitPickUpLoot;
+ public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
+ public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
++ public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
+
+ @Override
+ public float getBukkitYaw() {
+@@ -722,7 +723,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ }
+
+ public boolean shouldDiscardFriction() {
+- return this.discardFriction;
++ return !this.frictionState.toBooleanOrElse(!this.discardFriction); // Paper - Friction API
+ }
+
+ public void setDiscardFriction(boolean noDrag) {
+@@ -796,6 +797,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+
+ @Override
+ public void addAdditionalSaveData(CompoundTag nbt) {
++ // Paper start - Friction API
++ if (this.frictionState != net.kyori.adventure.util.TriState.NOT_SET) {
++ nbt.putString("Paper.FrictionState", this.frictionState.toString());
++ }
++ // Paper end - Friction API
+ nbt.putFloat("Health", this.getHealth());
+ nbt.putShort("HurtTime", (short) this.hurtTime);
+ nbt.putInt("HurtByTimestamp", this.lastHurtByMobTimestamp);
+@@ -839,6 +845,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ }
+ this.internalSetAbsorptionAmount(absorptionAmount);
+ // Paper end - Check for NaN
++ // Paper start - Friction API
++ if (nbt.contains("Paper.FrictionState")) {
++ String fs = nbt.getString("Paper.FrictionState");
++ try {
++ frictionState = net.kyori.adventure.util.TriState.valueOf(fs);
++ } catch (Exception ignored) {
++ LOGGER.error("Unknown friction state " + fs + " for " + this);
++ }
++ }
++ // Paper end - Friction API
+ if (nbt.contains("attributes", 9) && this.level() != null && !this.level().isClientSide) {
+ this.getAttributes().load(nbt.getList("attributes", 10));
+ }
+diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+index d555fd0b200c012f30ed0c0ec09a37b25a737b76..7a6d51020d9c6be33b4c34c0d608559589d5b390 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -63,6 +63,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+ private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
+ public boolean canMobPickup = true; // Paper - Item#canEntityPickup
+ private int despawnRate = -1; // Paper - Alternative item-despawn-rate
++ public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
+
+ public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
+ super(type, world);
+@@ -186,7 +187,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+ this.applyEffectsFromBlocks();
+ float f = 0.98F;
+
+- if (this.onGround()) {
++ // Paper start - Friction API
++ if (frictionState == net.kyori.adventure.util.TriState.FALSE) {
++ f = 1F;
++ } else if (this.onGround()) {
++ // Paper end - Friction API
+ f = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F;
+ }
+
+@@ -409,6 +414,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+
+ @Override
+ public void addAdditionalSaveData(CompoundTag nbt) {
++ // Paper start - Friction API
++ if (this.frictionState != net.kyori.adventure.util.TriState.NOT_SET) {
++ nbt.putString("Paper.FrictionState", this.frictionState.toString());
++ }
++ // Paper end - Friction API
+ nbt.putShort("Health", (short) this.health);
+ nbt.putShort("Age", (short) this.age);
+ nbt.putShort("PickupDelay", (short) this.pickupDelay);
+@@ -451,6 +461,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
+ this.setItem(ItemStack.EMPTY);
+ }
+
++ // Paper start - Friction API
++ if (nbt.contains("Paper.FrictionState")) {
++ String fs = nbt.getString("Paper.FrictionState");
++ try {
++ frictionState = net.kyori.adventure.util.TriState.valueOf(fs);
++ } catch (Exception ignored) {
++ com.mojang.logging.LogUtils.getLogger().error("Unknown friction state " + fs + " for " + this);
++ }
++ }
++ // Paper end - Friction API
++
+ if (this.getItem().isEmpty()) {
+ this.discard(null); // CraftBukkit - add Bukkit remove cause
+ }
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+index f88c1becd08e7b10f228624160b85f89a379fbeb..cdc8606ffe5c75ee19d92e9f86f26b2a502d765e 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+@@ -93,6 +93,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
+ private double flyingZ = 0.95;
+ public Double maxSpeed;
+ // CraftBukkit end
++ public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
+
+ protected AbstractMinecart(EntityType<?> type, Level world) {
+ super(type, world);
+@@ -552,6 +553,16 @@ public abstract class AbstractMinecart extends VehicleEntity {
+
+ this.flipped = nbt.getBoolean("FlippedRotation");
+ this.firstTick = nbt.getBoolean("HasTicked");
++ // Paper start - Friction API
++ if (nbt.contains("Paper.FrictionState")) {
++ String fs = nbt.getString("Paper.FrictionState");
++ try {
++ frictionState = net.kyori.adventure.util.TriState.valueOf(fs);
++ } catch (Exception ignored) {
++ com.mojang.logging.LogUtils.getLogger().error("Unknown friction state " + fs + " for " + this);
++ }
++ }
++ // Paper end - Friction API
+ }
+
+ @Override
+@@ -564,6 +575,12 @@ public abstract class AbstractMinecart extends VehicleEntity {
+
+ nbt.putBoolean("FlippedRotation", this.flipped);
+ nbt.putBoolean("HasTicked", this.firstTick);
++
++ // Paper start - Friction API
++ if (this.frictionState != net.kyori.adventure.util.TriState.NOT_SET) {
++ nbt.putString("Paper.FrictionState", this.frictionState.toString());
++ }
++ // Paper end - Friction API
+ }
+
+ @Override
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java b/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
+index 60b8d8c1ccfe7f9d1a327d1a361493e97ca9ad4c..f43439b31a14b9db4744512465d81134ebe5b3e1 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
+@@ -554,6 +554,7 @@ public class NewMinecartBehavior extends MinecartBehavior {
+
+ @Override
+ public double getSlowdownFactor() {
++ if (this.minecart.frictionState == net.kyori.adventure.util.TriState.FALSE) return 1; // Paper
+ return this.minecart.isVehicle() || !this.minecart.slowWhenEmpty ? 0.997D : 0.975D; // CraftBukkit - add !this.slowWhenEmpty
+ }
+
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java b/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
+index 62ae79808aba4112ea845311080bb496174a68d2..04a622f52353ebcc21f41c233f5a0fd67690cf4a 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
+@@ -528,6 +528,7 @@ public class OldMinecartBehavior extends MinecartBehavior {
+
+ @Override
+ public double getSlowdownFactor() {
++ if (this.minecart.frictionState == net.kyori.adventure.util.TriState.FALSE) return 1; // Paper
+ return this.minecart.isVehicle() || !this.minecart.slowWhenEmpty ? 0.997D : 0.96D; // CraftBukkit - add !this.slowWhenEmpty
+ }
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+@@ -99,6 +99,18 @@ public class CraftItem extends CraftEntity implements Item {
+ this.getHandle().age = willAge ? 0 : NO_AGE_TIME;
+ }
+
++ @org.jetbrains.annotations.NotNull
++ @Override
++ public net.kyori.adventure.util.TriState getFrictionState() {
++ return this.getHandle().frictionState;
++ }
++
++ @Override
++ public void setFrictionState(@org.jetbrains.annotations.NotNull net.kyori.adventure.util.TriState state) {
++ java.util.Objects.requireNonNull(state, "state may not be null");
++ this.getHandle().frictionState = state;
++ }
++
+ @Override
+ public int getHealth() {
+ return this.getHandle().health;
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index 1ceaa081231a617bd87331b308c24d9c7a8dcf2b..2fd4a3068d86a37cc18c9203448823c53d590ffb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -1198,4 +1198,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+ nmsStack.hurtAndBreak(amount, this.getHandle(), slot, true);
+ }
+ // Paper end - ItemStack damage API
++ // Paper start - friction API
++ @org.jetbrains.annotations.NotNull
++ @Override
++ public net.kyori.adventure.util.TriState getFrictionState() {
++ return this.getHandle().frictionState;
++ }
++
++ @Override
++ public void setFrictionState(@org.jetbrains.annotations.NotNull net.kyori.adventure.util.TriState state) {
++ java.util.Objects.requireNonNull(state, "state may not be null");
++ this.getHandle().frictionState = state;
++ }
++ // Paper end - friction API
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
+index e02ecbdc158311bdc7e4d13307de6e2a2cf54235..b42bce0c4f4b3aac2729cfdad392d863245ed693 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
+@@ -127,4 +127,18 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
+ public int getDisplayBlockOffset() {
+ return this.getHandle().getDisplayOffset();
+ }
++
++ // Paper start - Friction API
++ @org.jetbrains.annotations.NotNull
++ @Override
++ public net.kyori.adventure.util.TriState getFrictionState() {
++ return this.getHandle().frictionState;
++ }
++
++ @Override
++ public void setFrictionState(@org.jetbrains.annotations.NotNull net.kyori.adventure.util.TriState state) {
++ java.util.Objects.requireNonNull(state, "state may not be null");
++ this.getHandle().frictionState = state;
++ }
++ // Paper end - Friction API
+ }