diff --git a/build.gradle.kts b/build.gradle.kts index af5ab2e..1689eb9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.3" + id("io.papermc.paperweight.patcher") version "1.3.4" } repositories { diff --git a/gradle.properties b/gradle.properties index 03872f6..b7e063d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=wtf.etil.mirai version=1.18.1-R0.1-SNAPSHOT mcVersion=1.18.1 packageVersion=1_18_R1 -pufferfishRef=3e75ff07a5f95e1d627f47bec2baa8eed7a54e00 +pufferfishRef=110966ec14ddce354d8f1d3c28939025cfa86ab3 org.gradle.caching=true org.gradle.caching.debug=false diff --git a/patches/api/0011-LivingEntity-safeFallDistance.patch b/patches/api/0011-LivingEntity-safeFallDistance.patch deleted file mode 100644 index 41115f3..0000000 --- a/patches/api/0011-LivingEntity-safeFallDistance.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 5 May 2019 12:58:19 -0500 -Subject: [PATCH] LivingEntity safeFallDistance - -Original code by PurpurMC, licensed under MIT -You can find the original code on https://github.com/PurpurMC/Purpur - -diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 31353bd20404a8c2acf6bf0df524dc3cae324272..e532430b7444cef4e383b3afb637cc6060d8686a 100644 ---- a/src/main/java/org/bukkit/entity/LivingEntity.java -+++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -910,4 +910,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource - */ - void setHurtDirection(float hurtDirection); - // Paper end -+ -+ // Purpur start -+ /** -+ * Gets the distance (in blocks) this entity can safely fall without taking damage -+ * -+ * @return Safe fall distance -+ */ -+ float getSafeFallDistance(); -+ -+ /** -+ * Set the distance (in blocks) this entity can safely fall without taking damage -+ * -+ * @param safeFallDistance Safe fall distance -+ */ -+ void setSafeFallDistance(float safeFallDistance); -+ // Purpur end - } diff --git a/patches/api/0012-disable-AnnotationTest.patch b/patches/api/0011-disable-AnnotationTest.patch similarity index 100% rename from patches/api/0012-disable-AnnotationTest.patch rename to patches/api/0011-disable-AnnotationTest.patch diff --git a/patches/server/0078-LivingEntity-safeFallDistance.patch b/patches/server/0078-LivingEntity-safeFallDistance.patch deleted file mode 100644 index a9c7954..0000000 --- a/patches/server/0078-LivingEntity-safeFallDistance.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 5 May 2019 12:58:45 -0500 -Subject: [PATCH] LivingEntity safeFallDistance - -Original code by PurpurMC, licensed under MIT -You can find the original code on https://github.com/PurpurMC/Purpur - -diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7f8c9538c231a7aca163ecdb3966cd2dc23e2cad..1f41e0a3d2b4b5bd5f2db217ef24a5711ac8513d 100644 ---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java -+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -251,6 +251,7 @@ public abstract class LivingEntity extends Entity { - // CraftBukkit start - public int expToDrop; - public int maxAirTicks = 300; -+ public float safeFallDistance = 3.0F; // Purpur - public boolean forceDrops; - public ArrayList drops = new ArrayList(); - public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes; -@@ -346,8 +347,8 @@ public abstract class LivingEntity extends Entity { - this.tryAddSoulSpeed(); - } - -- if (!this.level.isClientSide && this.fallDistance > 3.0F && onGround) { -- float f = (float) Mth.ceil(this.fallDistance - 3.0F); -+ if (!this.level.isClientSide && this.fallDistance > this.safeFallDistance && onGround) { // Purpur -+ float f = (float) Mth.ceil(this.fallDistance - this.safeFallDistance); // Purpur - - if (!landedState.isAir()) { - double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D); -@@ -1921,7 +1922,7 @@ public abstract class LivingEntity extends Entity { - MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP); - float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1); - -- return Mth.ceil((fallDistance - 3.0F - f2) * damageMultiplier); -+ return Mth.ceil((fallDistance - this.safeFallDistance - f2) * damageMultiplier); // Purpur - } - - protected void playBlockFallSound() { -diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java -index a726006888bbbdb290bcda3ac4fd45d68ba51b79..829753b2a811e97a16189d932f03f4f652b185c6 100644 ---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java -+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java -@@ -286,7 +286,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener, - - @Override - protected int calculateFallDamage(float fallDistance, float damageMultiplier) { -- return Mth.ceil((fallDistance * 0.5F - 3.0F) * damageMultiplier); -+ return Mth.ceil((fallDistance * 0.5F - this.safeFallDistance) * damageMultiplier); - } - - protected int getInventorySize() { -diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java -index 0d578ab12c874bd2daccc4322a3fe1abafa4bc18..a183226bb0cf01c5aaf7babe1d08fa9ab7388648 100644 ---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java -+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java -@@ -12,6 +12,7 @@ import net.minecraft.world.level.LevelReader; - public class Giant extends Monster { - public Giant(EntityType type, Level world) { - super(type, world); -+ this.safeFallDistance = 10.0F; // Purpur - } - - @Override -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index c022751e3b45469cc0ad6732e2d6ff08918bafa4..1dcfe129ec3633de67404ab5ab72cdcee31d3d9d 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -920,4 +920,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); - } - // Paper end -+ -+ // Purpur start -+ @Override -+ public float getSafeFallDistance() { -+ return getHandle().safeFallDistance; -+ } -+ -+ @Override -+ public void setSafeFallDistance(float safeFallDistance) { -+ getHandle().safeFallDistance = safeFallDistance; -+ } -+ // Purpur end - } diff --git a/patches/server/0079-lithium-precompute-shape-arrays.patch b/patches/server/0078-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0079-lithium-precompute-shape-arrays.patch rename to patches/server/0078-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0080-vmp-ingredient_matching.patch b/patches/server/0079-vmp-ingredient_matching.patch similarity index 100% rename from patches/server/0080-vmp-ingredient_matching.patch rename to patches/server/0079-vmp-ingredient_matching.patch diff --git a/patches/server/0081-Fix-MC-121706.patch b/patches/server/0080-Fix-MC-121706.patch similarity index 100% rename from patches/server/0081-Fix-MC-121706.patch rename to patches/server/0080-Fix-MC-121706.patch diff --git a/patches/server/0082-vmp-entity.iteration.patch b/patches/server/0081-vmp-entity.iteration.patch similarity index 100% rename from patches/server/0082-vmp-entity.iteration.patch rename to patches/server/0081-vmp-entity.iteration.patch diff --git a/patches/server/0083-vmp-spawn_density_cap.patch b/patches/server/0082-vmp-spawn_density_cap.patch similarity index 100% rename from patches/server/0083-vmp-spawn_density_cap.patch rename to patches/server/0082-vmp-spawn_density_cap.patch diff --git a/patches/server/0084-Configurable-server-metrics.patch b/patches/server/0083-Configurable-server-metrics.patch similarity index 100% rename from patches/server/0084-Configurable-server-metrics.patch rename to patches/server/0083-Configurable-server-metrics.patch diff --git a/patches/server/0085-Configurable-FastMath.round.patch b/patches/server/0084-Configurable-FastMath.round.patch similarity index 100% rename from patches/server/0085-Configurable-FastMath.round.patch rename to patches/server/0084-Configurable-FastMath.round.patch diff --git a/patches/server/0086-lithium-tag.patch b/patches/server/0085-lithium-tag.patch similarity index 100% rename from patches/server/0086-lithium-tag.patch rename to patches/server/0085-lithium-tag.patch diff --git a/patches/server/0087-Time-Utilities.patch b/patches/server/0086-Time-Utilities.patch similarity index 100% rename from patches/server/0087-Time-Utilities.patch rename to patches/server/0086-Time-Utilities.patch diff --git a/patches/server/0088-Add-new-Object-0-to-reduce-allocs.patch b/patches/server/0087-Add-new-Object-0-to-reduce-allocs.patch similarity index 100% rename from patches/server/0088-Add-new-Object-0-to-reduce-allocs.patch rename to patches/server/0087-Add-new-Object-0-to-reduce-allocs.patch diff --git a/patches/server/0089-PaperPR-Don-t-tick-markers.patch b/patches/server/0088-PaperPR-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0089-PaperPR-Don-t-tick-markers.patch rename to patches/server/0088-PaperPR-Don-t-tick-markers.patch diff --git a/patches/server/0090-PaperPR-Add-Alternate-Current-redstone-implementatio.patch b/patches/server/0089-PaperPR-Add-Alternate-Current-redstone-implementatio.patch similarity index 100% rename from patches/server/0090-PaperPR-Add-Alternate-Current-redstone-implementatio.patch rename to patches/server/0089-PaperPR-Add-Alternate-Current-redstone-implementatio.patch diff --git a/patches/server/0091-lithium-entity.fast_elytra_check.patch b/patches/server/0090-lithium-entity.fast_elytra_check.patch similarity index 100% rename from patches/server/0091-lithium-entity.fast_elytra_check.patch rename to patches/server/0090-lithium-entity.fast_elytra_check.patch diff --git a/patches/server/0092-lithium-profiler.patch b/patches/server/0091-lithium-profiler.patch similarity index 100% rename from patches/server/0092-lithium-profiler.patch rename to patches/server/0091-lithium-profiler.patch diff --git a/patches/server/0093-lithium-entity.fast_hand_swing.patch b/patches/server/0092-lithium-entity.fast_hand_swing.patch similarity index 100% rename from patches/server/0093-lithium-entity.fast_hand_swing.patch rename to patches/server/0092-lithium-entity.fast_hand_swing.patch diff --git a/patches/server/0094-c2me-optimization.math.patch b/patches/server/0093-c2me-optimization.math.patch similarity index 100% rename from patches/server/0094-c2me-optimization.math.patch rename to patches/server/0093-c2me-optimization.math.patch diff --git a/patches/server/0095-lithium-entity.fast_powder_snow_check.patch b/patches/server/0094-lithium-entity.fast_powder_snow_check.patch similarity index 100% rename from patches/server/0095-lithium-entity.fast_powder_snow_check.patch rename to patches/server/0094-lithium-entity.fast_powder_snow_check.patch diff --git a/patches/server/0096-lithium-collections.attributes.patch b/patches/server/0095-lithium-collections.attributes.patch similarity index 100% rename from patches/server/0096-lithium-collections.attributes.patch rename to patches/server/0095-lithium-collections.attributes.patch diff --git a/patches/server/0097-c2me-vectorizations.vectorize_noise.patch b/patches/server/0096-c2me-vectorizations.vectorize_noise.patch similarity index 100% rename from patches/server/0097-c2me-vectorizations.vectorize_noise.patch rename to patches/server/0096-c2me-vectorizations.vectorize_noise.patch diff --git a/patches/server/0098-lithium-collections.entity_by_type.patch b/patches/server/0097-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0098-lithium-collections.entity_by_type.patch rename to patches/server/0097-lithium-collections.entity_by_type.patch diff --git a/patches/server/0099-lithium-collections.entity_filtering.patch b/patches/server/0098-lithium-collections.entity_filtering.patch similarity index 100% rename from patches/server/0099-lithium-collections.entity_filtering.patch rename to patches/server/0098-lithium-collections.entity_filtering.patch diff --git a/patches/server/0100-lithium-chunk.serialization.patch b/patches/server/0099-lithium-chunk.serialization.patch similarity index 100% rename from patches/server/0100-lithium-chunk.serialization.patch rename to patches/server/0099-lithium-chunk.serialization.patch diff --git a/patches/server/0101-lithium-world.inline_height.patch b/patches/server/0100-lithium-world.inline_height.patch similarity index 100% rename from patches/server/0101-lithium-world.inline_height.patch rename to patches/server/0100-lithium-world.inline_height.patch diff --git a/patches/server/0102-hydrogen.patch b/patches/server/0101-hydrogen.patch similarity index 100% rename from patches/server/0102-hydrogen.patch rename to patches/server/0101-hydrogen.patch diff --git a/patches/server/0103-Configurable-criterion-triggers.patch b/patches/server/0102-Configurable-criterion-triggers.patch similarity index 100% rename from patches/server/0103-Configurable-criterion-triggers.patch rename to patches/server/0102-Configurable-criterion-triggers.patch diff --git a/patches/server/0104-Set-item-stuck-sleep-to-15-ticks.patch b/patches/server/0103-Set-item-stuck-sleep-to-15-ticks.patch similarity index 100% rename from patches/server/0104-Set-item-stuck-sleep-to-15-ticks.patch rename to patches/server/0103-Set-item-stuck-sleep-to-15-ticks.patch diff --git a/patches/server/0105-Smarter-statistics-ticking.patch b/patches/server/0104-Smarter-statistics-ticking.patch similarity index 100% rename from patches/server/0105-Smarter-statistics-ticking.patch rename to patches/server/0104-Smarter-statistics-ticking.patch diff --git a/patches/server/0106-lithium-collections.brain-and-ai.task.memory_change_.patch b/patches/server/0105-lithium-collections.brain-and-ai.task.memory_change_.patch similarity index 100% rename from patches/server/0106-lithium-collections.brain-and-ai.task.memory_change_.patch rename to patches/server/0105-lithium-collections.brain-and-ai.task.memory_change_.patch diff --git a/patches/server/0107-lithium-ai.brain.patch b/patches/server/0106-lithium-ai.brain.patch similarity index 100% rename from patches/server/0107-lithium-ai.brain.patch rename to patches/server/0106-lithium-ai.brain.patch diff --git a/patches/server/0108-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch b/patches/server/0107-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch similarity index 100% rename from patches/server/0108-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch rename to patches/server/0107-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch diff --git a/patches/server/0109-some-entity-micro-opts.patch b/patches/server/0108-some-entity-micro-opts.patch similarity index 100% rename from patches/server/0109-some-entity-micro-opts.patch rename to patches/server/0108-some-entity-micro-opts.patch diff --git a/patches/server/0110-lithium-cache-iterate-outwards.patch b/patches/server/0109-lithium-cache-iterate-outwards.patch similarity index 100% rename from patches/server/0110-lithium-cache-iterate-outwards.patch rename to patches/server/0109-lithium-cache-iterate-outwards.patch diff --git a/patches/server/0111-lithium-ai.raid.patch b/patches/server/0110-lithium-ai.raid.patch similarity index 100% rename from patches/server/0111-lithium-ai.raid.patch rename to patches/server/0110-lithium-ai.raid.patch diff --git a/patches/server/0112-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0111-Dont-eat-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0112-Dont-eat-blocks-in-non-ticking-chunks.patch rename to patches/server/0111-Dont-eat-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0113-Fast-speed-check.patch b/patches/server/0112-Fast-speed-check.patch similarity index 100% rename from patches/server/0113-Fast-speed-check.patch rename to patches/server/0112-Fast-speed-check.patch diff --git a/patches/server/0114-lithium-block.moving_block_shapes.patch b/patches/server/0113-lithium-block.moving_block_shapes.patch similarity index 100% rename from patches/server/0114-lithium-block.moving_block_shapes.patch rename to patches/server/0113-lithium-block.moving_block_shapes.patch diff --git a/patches/server/0115-lithium-shapes.blockstate_cache.patch b/patches/server/0114-lithium-shapes.blockstate_cache.patch similarity index 100% rename from patches/server/0115-lithium-shapes.blockstate_cache.patch rename to patches/server/0114-lithium-shapes.blockstate_cache.patch diff --git a/patches/server/0116-lithium-gen.patch b/patches/server/0115-lithium-gen.patch similarity index 100% rename from patches/server/0116-lithium-gen.patch rename to patches/server/0115-lithium-gen.patch