From 574bc968d3e7337112a4e2c1d9be8dc8cba6463d Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Fri, 22 Sep 2023 15:47:26 +0200 Subject: [PATCH] More work --- ...tom-table-implementation-for-blockstate-state-loo.patch} | 6 +++--- .../0674-Manually-inline-methods-in-BlockPosition.patch} | 0 ...e-craft-scheduler-threads-according-to-the-plugin.patch} | 0 ...timize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch | 0 .../0685-Optimise-chunk-tick-iteration.patch | 0 .../0686-Execute-chunk-tasks-mid-tick.patch | 0 ...tempt-to-recalculate-regionfile-header-if-it-is-co.patch | 0 .../0689-Detail-more-information-in-watchdog-dumps.patch | 0 .../0691-Distance-manager-tick-timings.patch | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename patches/{unapplied/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch => server/0673-Custom-table-implementation-for-blockstate-state-loo.patch} (98%) rename patches/{unapplied/server/0690-Manually-inline-methods-in-BlockPosition.patch => server/0674-Manually-inline-methods-in-BlockPosition.patch} (100%) rename patches/{unapplied/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch => server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%) rename patches/unapplied/{server => skipped}/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch (100%) rename patches/unapplied/{server => skipped}/0685-Optimise-chunk-tick-iteration.patch (100%) rename patches/unapplied/{server => skipped}/0686-Execute-chunk-tasks-mid-tick.patch (100%) rename patches/unapplied/{server => skipped}/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch (100%) rename patches/unapplied/{server => skipped}/0689-Detail-more-information-in-watchdog-dumps.patch (100%) rename patches/unapplied/{server => skipped}/0691-Distance-manager-tick-timings.patch (100%) diff --git a/patches/unapplied/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 98% rename from patches/unapplied/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch index 0318d05517..0023c8bd8c 100644 --- a/patches/unapplied/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch +++ b/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch @@ -246,7 +246,7 @@ index 89ba12d44865ecddebabbc39c769af4cd8c82702..5f285d190186a2ff5a61d05070593e1d } diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java -index ff1a0d125edd2ea10c870cbb62ae9aa23644b6dc..233215280f8494dbc33a2fd0b14e37e59f1cb643 100644 +index bf7ed22094ac92a152e522bafccffb9589f84343..591ee974391c465be0e523e2da0f176436a7d567 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java @@ -7,6 +7,13 @@ import java.util.Optional; @@ -264,7 +264,7 @@ index ff1a0d125edd2ea10c870cbb62ae9aa23644b6dc..233215280f8494dbc33a2fd0b14e37e5 super(name, Boolean.class); } diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java -index 0bca0f971dac994bd8b6ecd87e8b33e26c0f18f9..edd3c745efb40ee79a1393199c7a27ddaa2f8026 100644 +index 2d69d1c17f734ee38667d51e6fd0a268211ec595..034b2618aa178c003c34eb621c6beb7c30958a38 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java @@ -15,6 +15,15 @@ public class EnumProperty & StringRepresentable> extends Prope @@ -299,7 +299,7 @@ index 0bca0f971dac994bd8b6ecd87e8b33e26c0f18f9..edd3c745efb40ee79a1393199c7a27dd @Override diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java -index bdbe0362e49e73c05237f9f3143230e0b03e494e..8eb20ea852a8e89c431fea55a7b60833a6c8104f 100644 +index 33268d953b30d384564eee6dfab2a37fa722e465..dfeec6c580963e4a6f907e1344e2265d39326027 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java @@ -11,6 +11,16 @@ public class IntegerProperty extends Property { diff --git a/patches/unapplied/server/0690-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/unapplied/server/0690-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0674-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/unapplied/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/unapplied/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/skipped/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/unapplied/skipped/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch b/patches/unapplied/skipped/0685-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch rename to patches/unapplied/skipped/0685-Optimise-chunk-tick-iteration.patch diff --git a/patches/unapplied/server/0686-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/skipped/0686-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/unapplied/server/0686-Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/skipped/0686-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/unapplied/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/skipped/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/unapplied/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/skipped/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/skipped/0689-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/skipped/0689-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/unapplied/server/0691-Distance-manager-tick-timings.patch b/patches/unapplied/skipped/0691-Distance-manager-tick-timings.patch similarity index 100% rename from patches/unapplied/server/0691-Distance-manager-tick-timings.patch rename to patches/unapplied/skipped/0691-Distance-manager-tick-timings.patch