Faster Sheep.getOffspringColor

etil2jz · Jun 29, 2022 · 64a31b5 · 64a31b5
1 parent 0750e5f
commit 64a31b5
Show file tree

Hide file tree

Showing 42 changed files with 245 additions and 96 deletions.
diff --git 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.8-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.3.9-SNAPSHOT"
 }
 
 repositories {

diff --git a/...63-lithium-entity.fast_elytra_check.patch → ...62-lithium-entity.fast_elytra_check.patch b/...63-lithium-entity.fast_elytra_check.patch → ...62-lithium-entity.fast_elytra_check.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a42f5e16e18586d4a72cdfd517e7796728701d6c..0968f6b6d32760ceb5717c5f8fc100377f4c2d7d 100644
+index f6af6dc1c686d477212cd68031d4983f85234a7f..de9b209597bad45ac1ea918b43745dc92b085082 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3422,6 +3422,8 @@ public abstract class LivingEntity extends Entity {

diff --git a/patches/server/0064-lithium-profiler.patch → patches/server/0063-lithium-profiler.patch b/patches/server/0064-lithium-profiler.patch → patches/server/0063-lithium-profiler.patch
diff --git a/...0065-lithium-entity.fast_hand_swing.patch → ...0064-lithium-entity.fast_hand_swing.patch b/...0065-lithium-entity.fast_hand_swing.patch → ...0064-lithium-entity.fast_hand_swing.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0968f6b6d32760ceb5717c5f8fc100377f4c2d7d..15fc1ccef371bf8b2b27238193f9d6b57e521b4e 100644
+index de9b209597bad45ac1ea918b43745dc92b085082..9e71182c927dec5ede91d7e7c6a842e69b10db6a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2463,6 +2463,8 @@ public abstract class LivingEntity extends Entity {

diff --git a/patches/server/0066-c2me-opts-math.patch → patches/server/0065-c2me-opts-math.patch b/patches/server/0066-c2me-opts-math.patch → patches/server/0065-c2me-opts-math.patch
diff --git a/...thium-entity.fast_powder_snow_check.patch → ...thium-entity.fast_powder_snow_check.patch b/...thium-entity.fast_powder_snow_check.patch → ...thium-entity.fast_powder_snow_check.patch
@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 15fc1ccef371bf8b2b27238193f9d6b57e521b4e..c096b4e83d82518f0cee143496b648e010b72754 100644
+index 9e71182c927dec5ede91d7e7c6a842e69b10db6a..858ccbfd456777a61e9579beb997abb568d5b75e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -569,11 +569,11 @@ public abstract class LivingEntity extends Entity {

diff --git a/...0068-lithium-collections.attributes.patch → ...0067-lithium-collections.attributes.patch b/...0068-lithium-collections.attributes.patch → ...0067-lithium-collections.attributes.patch
diff --git a/...-lithium-collections.entity_by_type.patch → ...-lithium-collections.entity_by_type.patch b/...-lithium-collections.entity_by_type.patch → ...-lithium-collections.entity_by_type.patch
diff --git a/...ithium-collections.entity_filtering.patch → ...ithium-collections.entity_filtering.patch b/...ithium-collections.entity_filtering.patch → ...ithium-collections.entity_filtering.patch
diff --git a/...er/0071-lithium-chunk.serialization.patch → ...er/0070-lithium-chunk.serialization.patch b/...er/0071-lithium-chunk.serialization.patch → ...er/0070-lithium-chunk.serialization.patch
diff --git a/...072-Configurable-criterion-triggers.patch → ...071-Configurable-criterion-triggers.patch b/...072-Configurable-criterion-triggers.patch → ...071-Configurable-criterion-triggers.patch
@@ -42,11 +42,11 @@ index f5aca2054dcad52301b9b99e44fbd3723aabdad7..f120e10679d38f3db22315f16a00622a
              // CraftBukkit start - initialize oldLevel, fire PlayerLevelChangeEvent, and tick client-sided world border
              if (this.oldLevel == -1) {
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 2cd6f76c378f3666617e33a0b7dca439316aa325..e86875be3f0e723d3242c9809cd05e767ee49ea4 100644
+index 4ef25b6203371b9c22275e1015ea75d870acf8da..4ace3c19551ea1cc5079d0570f5f0e70f1cae6a5 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-@@ -249,4 +249,13 @@ public class MiraiConfig {
-         riskyMathRoundOpt = getBoolean("use-risky-mathround-opt", riskyMathRoundOpt);
+@@ -244,4 +244,13 @@ public class MiraiConfig {
+         serverMetrics = getBoolean("enable-server-metrics", serverMetrics);
      }
 
 +    public static boolean criterionTriggerEnterBlock = true;

diff --git a/...73-Set-item-stuck-sleep-to-15-ticks.patch → ...72-Set-item-stuck-sleep-to-15-ticks.patch b/...73-Set-item-stuck-sleep-to-15-ticks.patch → ...72-Set-item-stuck-sleep-to-15-ticks.patch
diff --git a/...ver/0074-Smarter-statistics-ticking.patch → ...ver/0073-Smarter-statistics-ticking.patch b/...ver/0074-Smarter-statistics-ticking.patch → ...ver/0073-Smarter-statistics-ticking.patch
@@ -10,7 +10,7 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index fc01e48c0e2c7f4e56379cb8b89c78e7a874c053..8f0bc485597167caef4ed01e787181fff0bd2598 100644
+index b22e4068407f3012b62683abd060509829e61c62..da94849a59825b6b2ca886df3080d026e1720418 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -283,19 +283,21 @@ public abstract class Player extends LivingEntity {

diff --git a/..._entity_tracking-and-ai.nearby_enti.patch → ..._entity_tracking-and-ai.nearby_enti.patch b/..._entity_tracking-and-ai.nearby_enti.patch → ..._entity_tracking-and-ai.nearby_enti.patch
diff --git a/.../server/0076-some-entity-micro-opts.patch → .../server/0075-some-entity-micro-opts.patch b/.../server/0076-some-entity-micro-opts.patch → .../server/0075-some-entity-micro-opts.patch
diff --git a/...nt-eat-blocks-in-non-ticking-chunks.patch → ...nt-eat-blocks-in-non-ticking-chunks.patch b/...nt-eat-blocks-in-non-ticking-chunks.patch → ...nt-eat-blocks-in-non-ticking-chunks.patch
diff --git a/patches/server/0078-Fast-speed-check.patch → patches/server/0077-Fast-speed-check.patch b/patches/server/0078-Fast-speed-check.patch → patches/server/0077-Fast-speed-check.patch
@@ -34,10 +34,10 @@ index 9fc77dc845fc993ebb9d96f9af107f7e1e8e8a39..6b4370f8dffdaebb861ec59d0dad3fe5
                  this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2));
                  // Paper start - remove expensive streams from here
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index e86875be3f0e723d3242c9809cd05e767ee49ea4..e2d86b2845cbc17ef418d4421bde71134f407ae5 100644
+index 4ace3c19551ea1cc5079d0570f5f0e70f1cae6a5..4da53712474506e80c265ee38e1e1e88f51e3ec9 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-@@ -258,4 +258,9 @@ public class MiraiConfig {
+@@ -253,4 +253,9 @@ public class MiraiConfig {
          criterionTriggerLocation = getBoolean("criterion-trigger.location", criterionTriggerLocation);
      }
 

diff --git a/...0079-lithium-cache-iterate-outwards.patch → ...0078-lithium-cache-iterate-outwards.patch b/...0079-lithium-cache-iterate-outwards.patch → ...0078-lithium-cache-iterate-outwards.patch
diff --git a/patches/server/0080-lithium-ai.raid.patch → patches/server/0079-lithium-ai.raid.patch b/patches/server/0080-lithium-ai.raid.patch → patches/server/0079-lithium-ai.raid.patch
diff --git a/...1-lithium-block.moving_block_shapes.patch → ...0-lithium-block.moving_block_shapes.patch b/...1-lithium-block.moving_block_shapes.patch → ...0-lithium-block.moving_block_shapes.patch
diff --git a/...082-lithium-shapes.blockstate_cache.patch → ...081-lithium-shapes.blockstate_cache.patch b/...082-lithium-shapes.blockstate_cache.patch → ...081-lithium-shapes.blockstate_cache.patch
diff --git a/patches/server/0083-lithium-gen.patch → patches/server/0082-lithium-gen.patch b/patches/server/0083-lithium-gen.patch → patches/server/0082-lithium-gen.patch
diff --git a/...e-look-changes-from-crashing-the-se.patch → ...e-look-changes-from-crashing-the-se.patch b/...e-look-changes-from-crashing-the-se.patch → ...e-look-changes-from-crashing-the-se.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR Stop large look changes from crashing the server
 Taken from https://github.com/PaperMC/Paper/pull/7459
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c096b4e83d82518f0cee143496b648e010b72754..a03930ebdb3ebc766db4414eee38c6aa4c39fc56 100644
+index 858ccbfd456777a61e9579beb997abb568d5b75e..4a0ef94baec5b16ca0eee8d971851a08038b1825 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3006,37 +3006,12 @@ public abstract class LivingEntity extends Entity {

diff --git a/...-more-collision-code-skipping-logic.patch → ...-more-collision-code-skipping-logic.patch b/...-more-collision-code-skipping-logic.patch → ...-more-collision-code-skipping-logic.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR Add more collision code skipping logic
 Taken from https://github.com/PaperMC/Paper/pull/7581
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a03930ebdb3ebc766db4414eee38c6aa4c39fc56..08e50fb20be2f1a4266c1bfe59eb8fe83c6942ab 100644
+index 4a0ef94baec5b16ca0eee8d971851a08038b1825..10fe0a33e7d2663e27413b3affe035e91de37255 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3439,6 +3439,10 @@ public abstract class LivingEntity extends Entity {

diff --git a/...p-for-entity-trackers-for-faster-it.patch → ...p-for-entity-trackers-for-faster-it.patch b/...p-for-entity-trackers-for-faster-it.patch → ...p-for-entity-trackers-for-faster-it.patch
diff --git a/patches/server/0087-c2me-reduce_allocs.patch → patches/server/0086-c2me-reduce_allocs.patch b/patches/server/0087-c2me-reduce_allocs.patch → patches/server/0086-c2me-reduce_allocs.patch
diff --git a/...088-lithium-ai.sensor.secondary_poi.patch → ...087-lithium-ai.sensor.secondary_poi.patch b/...088-lithium-ai.sensor.secondary_poi.patch → ...087-lithium-ai.sensor.secondary_poi.patch
diff --git a/...ck-function-tag-running-before-load.patch → ...ck-function-tag-running-before-load.patch b/...ck-function-tag-running-before-load.patch → ...ck-function-tag-running-before-load.patch
diff --git a/...hes/server/0090-lithium-suffocation.patch → ...hes/server/0089-lithium-suffocation.patch b/...hes/server/0090-lithium-suffocation.patch → ...hes/server/0089-lithium-suffocation.patch
diff --git a/...Optimize-default-values-for-configs.patch → ...Optimize-default-values-for-configs.patch b/...Optimize-default-values-for-configs.patch → ...Optimize-default-values-for-configs.patch
diff --git a/...92-Configurable-map-update-interval.patch → ...91-Configurable-map-update-interval.patch b/...92-Configurable-map-update-interval.patch → ...91-Configurable-map-update-interval.patch
@@ -27,10 +27,10 @@ index 67b88da702b780f79c0496cb17f1e6f1f8dd6c2b..712707da510977bfa1ce4b991fd8a8f5
                  // CraftBukkit start
                  java.util.Collection<MapDecoration> icons = new java.util.ArrayList<MapDecoration>();
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index e2d86b2845cbc17ef418d4421bde71134f407ae5..02b630ed8ac8ad07b9571dc15d4c18165b7062d6 100644
+index 4da53712474506e80c265ee38e1e1e88f51e3ec9..ea398d72cdbec80add81971f3cf34b750e9448ae 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-@@ -263,4 +263,9 @@ public class MiraiConfig {
+@@ -258,4 +258,9 @@ public class MiraiConfig {
          fastSpeedCheck = getBoolean("fast-speed-check", fastSpeedCheck);
      }
 

diff --git a/...er-saturation-depleting-on-peaceful.patch → ...er-saturation-depleting-on-peaceful.patch b/...er-saturation-depleting-on-peaceful.patch → ...er-saturation-depleting-on-peaceful.patch
@@ -8,7 +8,7 @@ the displayed hunger bar never goes down. Hunger (or any related value, includin
 should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 8f0bc485597167caef4ed01e787181fff0bd2598..4e520a7c5bdf0eb3830905859ea106396fa79653 100644
+index da94849a59825b6b2ca886df3080d026e1720418..8d465c3ca7af2a804a4c178f054063d6a1a5ddad 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1911,6 +1911,7 @@ public abstract class Player extends LivingEntity {

diff --git a/.../0094-Fix-mobs-attacking-themselves.patch → .../0093-Fix-mobs-attacking-themselves.patch b/.../0094-Fix-mobs-attacking-themselves.patch → .../0093-Fix-mobs-attacking-themselves.patch
diff --git a/...s-resetting-their-brewTime-when-bei.patch → ...s-resetting-their-brewTime-when-bei.patch b/...s-resetting-their-brewTime-when-bei.patch → ...s-resetting-their-brewTime-when-bei.patch
diff --git a/...r/0096-lithium-world.tick_scheduler.patch → ...r/0095-lithium-world.tick_scheduler.patch b/...r/0096-lithium-world.tick_scheduler.patch → ...r/0095-lithium-world.tick_scheduler.patch
@@ -3,6 +3,8 @@ From: Arthur Blanchot <blanchot.arthur@protonmail.ch>
 Date: Fri, 24 Jun 2022 21:17:05 +0200
 Subject: [PATCH] lithium: world.tick_scheduler
 
+Original license: GPLv3
+Original project: https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/me/jellysquid/mods/lithium/common/world/scheduler/OrderedTickQueue.java b/src/main/java/me/jellysquid/mods/lithium/common/world/scheduler/OrderedTickQueue.java
 new file mode 100644

diff --git a/.../0097-Save-Json-list-asynchronously.patch → .../0096-Save-Json-list-asynchronously.patch b/.../0097-Save-Json-list-asynchronously.patch → .../0096-Save-Json-list-asynchronously.patch
diff --git a/...ps-the-predicate-order-of-collision.patch → ...ps-the-predicate-order-of-collision.patch b/...ps-the-predicate-order-of-collision.patch → ...ps-the-predicate-order-of-collision.patch
diff --git a/.../0099-Fix-head-rotation-packet-spam.patch → .../0098-Fix-head-rotation-packet-spam.patch b/.../0099-Fix-head-rotation-packet-spam.patch → .../0098-Fix-head-rotation-packet-spam.patch
diff --git a/...-Cache-block-break-animation-packet.patch → ...-Cache-block-break-animation-packet.patch b/...-Cache-block-break-animation-packet.patch → ...-Cache-block-break-animation-packet.patch
diff --git a/...1-Use-more-fastutil-data-structures.patch → ...0-Use-more-fastutil-data-structures.patch b/...1-Use-more-fastutil-data-structures.patch → ...0-Use-more-fastutil-data-structures.patch