diff --git a/build.gradle.kts b/build.gradle.kts index f42bfdd..7116994 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,7 +59,7 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.9.0:fat") + remapper("net.fabricmc:tiny-remapper:0.10.1:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") paperclip("io.papermc:paperclip:3.0.3") } diff --git a/gradle.properties b/gradle.properties index 8501bb6..df70543 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=62b220a87f6991c33423346e5f50e64058e7bdd9 +paperRef=00fd87a10fcdfa86db341c051b006303fe068b55 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0005-Gale-branding-changes.patch b/patches/server/0005-Gale-branding-changes.patch index 797fa6a..5c59de2 100644 --- a/patches/server/0005-Gale-branding-changes.patch +++ b/patches/server/0005-Gale-branding-changes.patch @@ -427,7 +427,7 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b921 .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d06185566b447c432d4dc2e3ba04d121bcdbc71b..e909e960005c512c42c7b8643e8f9241695bb81b 100644 +index 93b661e9cb7743aeff7da3972942cb73049a5e4c..9f5192212c492cefee9abd96aec6866e27ceb48e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -952,7 +952,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type)); ObjectMapper.Mutable mutable = (ObjectMapper.Mutable) factory.get(type); -@@ -166,7 +169,7 @@ public abstract class Configurations { +@@ -167,7 +170,7 @@ public abstract class Configurations { final YamlConfigurationLoader loader = result.loader(); final ConfigurationNode node = loader.load(); if (result.isNewFile()) { // add version to new files @@ -70,7 +70,7 @@ index c01b4393439838976965823298f12e4762e72eff..f54620e3f184a978d0b275087c4cc8b1 } else { this.verifyWorldConfigVersion(contextMap, node); } -@@ -227,7 +230,7 @@ public abstract class Configurations { +@@ -228,7 +231,7 @@ public abstract class Configurations { .build(); final ConfigurationNode worldNode = worldLoader.load(); if (newFile) { // set the version field if new file @@ -79,7 +79,7 @@ index c01b4393439838976965823298f12e4762e72eff..f54620e3f184a978d0b275087c4cc8b1 } else { this.verifyWorldConfigVersion(contextMap, worldNode); } -@@ -352,4 +355,25 @@ public abstract class Configurations { +@@ -353,4 +356,25 @@ public abstract class Configurations { return "ContextKey{" + this.name + "}"; } } @@ -188,7 +188,7 @@ index 8f23276796037d048eb114952891a01a40971b3e..ac9ceb54b894119cb30a22d37e035e2c } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e909e960005c512c42c7b8643e8f9241695bb81b..261bc188a5788988f4ad31ab1640798d619e1da7 100644 +index 9f5192212c492cefee9abd96aec6866e27ceb48e..295b76c60d9395d0beb234aff5691388bd3fe437 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,9 +3,6 @@ package net.minecraft.server; diff --git a/patches/server/0014-Use-timin.gs-by-default.patch b/patches/server/0014-Use-timin.gs-by-default.patch index 9ab7763..a2db030 100644 --- a/patches/server/0014-Use-timin.gs-by-default.patch +++ b/patches/server/0014-Use-timin.gs-by-default.patch @@ -13,10 +13,10 @@ As part of: Mirai (https://github.com/etil2jz/Mirai) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..53c7802053d01f7d4c92afbd92607605720db7b0 100644 +index f2e30d8743a97c0541808dc5c03300c0d881b843..71f1c1de486a72a6253b69b1a6a0a365faa5b5b4 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -97,7 +97,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -98,7 +98,7 @@ public class GlobalConfiguration extends ConfigurationPart { public class Timings extends ConfigurationPart { public boolean enabled = true; public boolean verbose = true; diff --git a/patches/server/0015-Recommend-disabling-timings-on-startup.patch b/patches/server/0015-Recommend-disabling-timings-on-startup.patch index e49798d..6d6ec9b 100644 --- a/patches/server/0015-Recommend-disabling-timings-on-startup.patch +++ b/patches/server/0015-Recommend-disabling-timings-on-startup.patch @@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 53c7802053d01f7d4c92afbd92607605720db7b0..d840237674c67c739e0f990a89f77a31cb706558 100644 +index 71f1c1de486a72a6253b69b1a6a0a365faa5b5b4..83ecb6402ddedd4a613afef7d3a9ad5a5ac6ae30 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -95,7 +95,10 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -96,7 +96,10 @@ public class GlobalConfiguration extends ConfigurationPart { @Deprecated(forRemoval = true) public class Timings extends ConfigurationPart { @@ -46,7 +46,7 @@ index 53c7802053d01f7d4c92afbd92607605720db7b0..d840237674c67c739e0f990a89f77a31 public boolean verbose = true; public String url = "https://timin.gs/"; // Gale - use timin.gs by default public boolean serverNamePrivacy = false; -@@ -109,6 +112,13 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -110,6 +113,13 @@ public class GlobalConfiguration extends ConfigurationPart { @PostProcess private void postProcess() { diff --git a/patches/server/0016-Make-timings-calls-final.patch b/patches/server/0016-Make-timings-calls-final.patch index b8dd335..7c1d03d 100644 --- a/patches/server/0016-Make-timings-calls-final.patch +++ b/patches/server/0016-Make-timings-calls-final.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a6c1bd3c37720ff692fb72c8648c3d2eb9247346..216cbb87356fd98ec7015cd31b0fde860ea92672 100644 +index 295b76c60d9395d0beb234aff5691388bd3fe437..2315d736b604ff35aa5bd839f3ea7bbc3f47e31c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1545,7 +1506,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop items; + private gg.airplane.structs.ItemListWithBitset optimizedItems; + // Gale end - Airplane - improve container checking with a bitset - private int cooldownTime; + public int cooldownTime; private long tickedGameTime; @@ -84,14 +87,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0070-Fix-MC-238526.patch b/patches/server/0069-Fix-MC-238526.patch similarity index 86% rename from patches/server/0070-Fix-MC-238526.patch rename to patches/server/0069-Fix-MC-238526.patch index bf81f95..1446ed5 100644 --- a/patches/server/0070-Fix-MC-238526.patch +++ b/patches/server/0069-Fix-MC-238526.patch @@ -49,18 +49,23 @@ index 9b897cf53f4bb5d366e6ac88dbed93c59d8fe541..53e3a40246da0a4d30ad8a7286d1a43d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 867849daa3a3eacaa90caad079234f8aa38d8dcf..1f99a324527d5329a21e795d3b6d95b535f415ef 100644 +index f8a561d91686d6df89a7374ca223972e435978c9..14f4a9fe5e8c185d1d8e6201bff24aabee43a634 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -100,6 +100,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable +@@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public GameplayMechanics gameplayMechanics; + public class GameplayMechanics extends ConfigurationPart { ++ public Fixes fixes; ++ public class Fixes extends ConfigurationPart { ++ + // Gale start - Purpur - fix MC-238526 + @Setting("mc-238526") + public boolean mc238526 = false; + // Gale end - Purpur - fix MC-238526 + - } - ++ } ++ public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration + public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable + diff --git a/patches/server/0069-Make-tripwire-duping-fix-configurable.patch b/patches/server/0069-Make-tripwire-duping-fix-configurable.patch deleted file mode 100644 index 3815df2..0000000 --- a/patches/server/0069-Make-tripwire-duping-fix-configurable.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> -Date: Sun, 6 Nov 2022 04:32:27 -0500 -Subject: [PATCH] Make tripwire duping fix configurable - -License: MIT (https://opensource.org/licenses/MIT) -Leaf - https://github.com/Winds-Studio/Leaf - -diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -index 3cb1db27dba902678a5848a1fb5e2c6ec6241e60..c615d528610168c4ad52730079f3525ab211b89e 100644 ---- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -@@ -91,7 +91,7 @@ public class TripWireBlock extends Block { - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) { - if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating - if (!moved && !state.is(newState.getBlock())) { -- this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), true); // Paper - fix tripwire state inconsistency -+ this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), world.galeConfig().gameplayMechanics.fixes.tripwireDuping); // Paper - fix tripwire state inconsistency // Gale - Leaf - make tripwire duping fix configurable - } - } - -diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f8a561d91686d6df89a7374ca223972e435978c9..867849daa3a3eacaa90caad079234f8aa38d8dcf 100644 ---- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -96,6 +96,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public GameplayMechanics gameplayMechanics; - public class GameplayMechanics extends ConfigurationPart { - -+ public Fixes fixes; -+ public class Fixes extends ConfigurationPart { -+ public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable -+ -+ } -+ - public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration - public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable - diff --git a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 93% rename from patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch index 145471e..7e0904c 100644 --- a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -64,14 +64,15 @@ index 161c128d27f50f145f88142191f1a5c93649ea65..6659abb4ab8a13a48c154d2e3f273eb1 entitycow.setPersistenceRequired(); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 1f99a324527d5329a21e795d3b6d95b535f415ef..34d9b53148d377d683d526ebc664aad3f0ee9c9a 100644 +index 14f4a9fe5e8c185d1d8e6201bff24aabee43a634..223983565d08c0a803afb27433aee31a4267c364 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -99,6 +99,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { public Fixes fixes; public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable -+ public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom ++ public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom ++ // Gale start - Purpur - fix MC-238526 @Setting("mc-238526") + public boolean mc238526 = false; diff --git a/patches/server/0072-Fix-MC-121706.patch b/patches/server/0071-Fix-MC-121706.patch similarity index 97% rename from patches/server/0072-Fix-MC-121706.patch rename to patches/server/0071-Fix-MC-121706.patch index 428a952..a33c189 100644 --- a/patches/server/0072-Fix-MC-121706.patch +++ b/patches/server/0071-Fix-MC-121706.patch @@ -65,7 +65,7 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 34d9b53148d377d683d526ebc664aad3f0ee9c9a..08c9d6ac15163679b07aef611e7d31ddb8cf9489 100644 +index 223983565d08c0a803afb27433aee31a4267c364..bcb7e0feda3aafd9a0c7e4a7ed41c867081df693 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0073-Fix-MC-110386.patch b/patches/server/0072-Fix-MC-110386.patch similarity index 96% rename from patches/server/0073-Fix-MC-110386.patch rename to patches/server/0072-Fix-MC-110386.patch index 844dc96..1cbfc62 100644 --- a/patches/server/0073-Fix-MC-110386.patch +++ b/patches/server/0072-Fix-MC-110386.patch @@ -35,7 +35,7 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 08c9d6ac15163679b07aef611e7d31ddb8cf9489..39703c8ffbd5b41a1b010f197908237d1078c015 100644 +index bcb7e0feda3aafd9a0c7e4a7ed41c867081df693..cb1e4ec01764c1be430ae45937706862a74afd26 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0074-Fix-MC-31819.patch b/patches/server/0073-Fix-MC-31819.patch similarity index 96% rename from patches/server/0074-Fix-MC-31819.patch rename to patches/server/0073-Fix-MC-31819.patch index be6ad90..71b6d73 100644 --- a/patches/server/0074-Fix-MC-31819.patch +++ b/patches/server/0073-Fix-MC-31819.patch @@ -35,7 +35,7 @@ index 567704f61034363e48ef2a5b5566ebdc91682297..e1b2b6a55d0a837d2a447dcc636a9f29 if (!this.abilities.invulnerable) { if (!this.level().isClientSide) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 39703c8ffbd5b41a1b010f197908237d1078c015..9abfdc9e1725b37987b661cd89b32cc43595396f 100644 +index cb1e4ec01764c1be430ae45937706862a74afd26..7f9c5012defeac5ae558e46d8fca6889fb1d0872 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0075-Fix-MC-26304.patch b/patches/server/0074-Fix-MC-26304.patch similarity index 100% rename from patches/server/0075-Fix-MC-26304.patch rename to patches/server/0074-Fix-MC-26304.patch diff --git a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 94% rename from patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch index 4f4ee08..e867c35 100644 --- a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,12 +49,12 @@ index 098fde8200a11f91f934ddab6b1486dac4014dfe..083130de6f6d5b6daa1564d5d51115f7 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9abfdc9e1725b37987b661cd89b32cc43595396f..01cc8c68e73392db88bd79e7fabd54a4262164b1 100644 +index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..56bf02a1f9741fc1c05ede0c0c79fea97d46271b 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -100,6 +100,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom + public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 97% rename from patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch index 5dd0536..b498275 100644 --- a/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,7 +55,7 @@ index e8faca6e443239968f0111519f9e5cd018ed3297..488a98e20b4f405d1ce4a224d2d2b515 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 01cc8c68e73392db88bd79e7fabd54a4262164b1..9660c8f7b3c87001caa7c1ddf5dbac9e7dc5feff 100644 +index 56bf02a1f9741fc1c05ede0c0c79fea97d46271b..0f205f02ce0553fb1f8db8aa903861102a570708 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -124,6 +124,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0078-Make-logging-login-locations-configurable.patch b/patches/server/0077-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0078-Make-logging-login-locations-configurable.patch rename to patches/server/0077-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0079-Reduce-array-allocations.patch b/patches/server/0078-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0079-Reduce-array-allocations.patch rename to patches/server/0078-Reduce-array-allocations.patch index 69d5746..995c1e1 100644 --- a/patches/server/0079-Reduce-array-allocations.patch +++ b/patches/server/0078-Reduce-array-allocations.patch @@ -355,7 +355,7 @@ index 4716f8bd8a64d4f20f0d5957c1e7fabf63020f43..9e37578ac79a63bb72cc04aae7ba4f6f if (enumprotocoldirection != this.receiving) { diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java -index 084ffde43447f6ff5e45e9fe3fc6a86bde65fd5a..4eafe7ee45f9dc071a8d0a7a4fa9b0800334d995 100644 +index 981d34dd4cfbc0932b147688751b98552c8beea8..53d80d46a857297987145fd956c8136b46185446 100644 --- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java +++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java @@ -15,6 +15,8 @@ import java.util.function.Consumer; diff --git a/patches/server/0080-Optimize-sun-burn-tick.patch b/patches/server/0079-Optimize-sun-burn-tick.patch similarity index 98% rename from patches/server/0080-Optimize-sun-burn-tick.patch rename to patches/server/0079-Optimize-sun-burn-tick.patch index 33586f3..9879a3a 100644 --- a/patches/server/0080-Optimize-sun-burn-tick.patch +++ b/patches/server/0079-Optimize-sun-burn-tick.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f369a104d147205520f3e89dccd6180db0773121..36045fcebdf2f8d0a918fc831fb49c094cc3b527 100644 +index dcee4af35f44f0dfe35ca95551cabedae4ea9f9e..7db079ab7670be9cfb72c3f2efa492fabb469405 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -308,7 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0085-Replace-class-map-with-optimized-collection.patch b/patches/server/0084-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0085-Replace-class-map-with-optimized-collection.patch rename to patches/server/0084-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0086-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0086-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0088-Cache-BlockStatePairKey-hash.patch b/patches/server/0087-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0088-Cache-BlockStatePairKey-hash.patch rename to patches/server/0087-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0089-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0088-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0089-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0088-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0089-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0089-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0090-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0090-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0092-Check-frozen-ticks-before-landing-block.patch b/patches/server/0091-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0092-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0091-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0093-Faster-chunk-serialization.patch b/patches/server/0092-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0093-Faster-chunk-serialization.patch rename to patches/server/0092-Faster-chunk-serialization.patch diff --git a/patches/server/0094-Update-boss-bar-within-tick.patch b/patches/server/0093-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0094-Update-boss-bar-within-tick.patch rename to patches/server/0093-Update-boss-bar-within-tick.patch diff --git a/patches/server/0095-Cache-ominous-banner-item.patch b/patches/server/0094-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0095-Cache-ominous-banner-item.patch rename to patches/server/0094-Cache-ominous-banner-item.patch diff --git a/patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0095-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0095-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0097-Cache-world-generator-sea-level.patch b/patches/server/0096-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0097-Cache-world-generator-sea-level.patch rename to patches/server/0096-Cache-world-generator-sea-level.patch diff --git a/patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0097-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0097-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0099-Optimize-villager-data-storage.patch b/patches/server/0098-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0099-Optimize-villager-data-storage.patch rename to patches/server/0098-Optimize-villager-data-storage.patch diff --git a/patches/server/0100-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0099-Skip-entity-move-if-movement-is-zero.patch similarity index 96% rename from patches/server/0100-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0099-Skip-entity-move-if-movement-is-zero.patch index 15e082a..89e7707 100644 --- a/patches/server/0100-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0099-Skip-entity-move-if-movement-is-zero.patch @@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 36045fcebdf2f8d0a918fc831fb49c094cc3b527..4fce39620c09189645d1c92311bba06c10b853f1 100644 +index 7db079ab7670be9cfb72c3f2efa492fabb469405..4f34ca69a0f417028bad01f4a29644a1e08bb9ca 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0101-Store-mob-counts-in-an-array.patch b/patches/server/0100-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0101-Store-mob-counts-in-an-array.patch rename to patches/server/0100-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0102-Use-linked-map-for-entity-trackers.patch b/patches/server/0101-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0102-Use-linked-map-for-entity-trackers.patch rename to patches/server/0101-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0103-Optimize-noise-generation.patch b/patches/server/0102-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0103-Optimize-noise-generation.patch rename to patches/server/0102-Optimize-noise-generation.patch diff --git a/patches/server/0104-Optimize-sheep-offspring-color.patch b/patches/server/0103-Optimize-sheep-offspring-color.patch similarity index 98% rename from patches/server/0104-Optimize-sheep-offspring-color.patch rename to patches/server/0103-Optimize-sheep-offspring-color.patch index 1ffd663..8347157 100644 --- a/patches/server/0104-Optimize-sheep-offspring-color.patch +++ b/patches/server/0103-Optimize-sheep-offspring-color.patch @@ -110,7 +110,7 @@ index 1d80678f7e8f658e43616f0baf723f096a99122a..865f244de1605303f22d8944174b0fe0 DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9660c8f7b3c87001caa7c1ddf5dbac9e7dc5feff..046957e51aa09f38f44e2ad0e48f7e2e254ec78e 100644 +index 0f205f02ce0553fb1f8db8aa903861102a570708..19115238d0fd845a788446d88d9ec9a52762c367 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch similarity index 93% rename from patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch index 6f36256..4846443 100644 --- a/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch @@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4fce39620c09189645d1c92311bba06c10b853f1..8d2820243903352ead1a584cfb4079a22b44be8b 100644 +index 4f34ca69a0f417028bad01f4a29644a1e08bb9ca..b4d78f2609a58e4aba0340ebfce229bb78135475 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -891,7 +891,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -31,7 +31,7 @@ index 4fce39620c09189645d1c92311bba06c10b853f1..8d2820243903352ead1a584cfb4079a2 this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 046957e51aa09f38f44e2ad0e48f7e2e254ec78e..d6d2a8b922fe06fc00090acb2ea06cb8d70eb88e 100644 +index 19115238d0fd845a788446d88d9ec9a52762c367..5d499e77800466210473e36b2355873807b9f86a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -127,6 +127,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0106-Skip-cloning-advancement-criteria.patch b/patches/server/0105-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0106-Skip-cloning-advancement-criteria.patch rename to patches/server/0105-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0107-Reduce-block-destruction-packet-allocations.patch b/patches/server/0106-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0107-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0106-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0108-Spread-out-sending-all-player-info.patch b/patches/server/0107-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0108-Spread-out-sending-all-player-info.patch rename to patches/server/0107-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0109-Optimize-player-list-for-sending-player-info.patch b/patches/server/0108-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0109-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0108-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0111-Send-multiple-keep-alive-packets.patch b/patches/server/0110-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0111-Send-multiple-keep-alive-packets.patch rename to patches/server/0110-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0112-Make-slow-login-timeout-configurable.patch b/patches/server/0111-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0112-Make-slow-login-timeout-configurable.patch rename to patches/server/0111-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0113-Make-max-interaction-distance-configurable.patch b/patches/server/0112-Make-max-interaction-distance-configurable.patch similarity index 98% rename from patches/server/0113-Make-max-interaction-distance-configurable.patch rename to patches/server/0112-Make-max-interaction-distance-configurable.patch index 3ad6e76..317b419 100644 --- a/patches/server/0113-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0112-Make-max-interaction-distance-configurable.patch @@ -86,7 +86,7 @@ index f46c16dd6ff9cd09ea579eecf99ce78c7eb39d49..430b8a2bb1639eeb7338e0f7b1030248 private void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index d6d2a8b922fe06fc00090acb2ea06cb8d70eb88e..fe008b7e8033fcf5793d4ab8f6929a3c2dfe2a94 100644 +index 5d499e77800466210473e36b2355873807b9f86a..c5b23bafb7909130a8a294e3b5bf94daa313ee11 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -9,6 +9,7 @@ import io.papermc.paper.configuration.PaperConfigurations; diff --git a/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 93% rename from patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch index e2c6bba..d73a2ec 100644 --- a/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch @@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8d2820243903352ead1a584cfb4079a22b44be8b..fa3084c310903824f8e266879251c5aaefc0c1e7 100644 +index b4d78f2609a58e4aba0340ebfce229bb78135475..c445d59036c9de418997ad3be9bc3912e8fefff4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3712,6 +3712,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -31,7 +31,7 @@ index 8d2820243903352ead1a584cfb4079a22b44be8b..fa3084c310903824f8e266879251c5aa entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - EntityPortalExitEvent entity.setDeltaMovement(velocity); // Paper - EntityPortalExitEvent diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index fe008b7e8033fcf5793d4ab8f6929a3c2dfe2a94..7f1be08866a4369855573f5fa3bf5397d5923f45 100644 +index c5b23bafb7909130a8a294e3b5bf94daa313ee11..f6e4fada132faeb37c076013ef7c54147de42ba8 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -126,6 +126,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch index 0820230..5498f80 100644 --- a/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index ed80960777b18faca2d6a99783e53daf5fa19e09..3380125f68b865977ac6275796158204 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 7f1be08866a4369855573f5fa3bf5397d5923f45..2919c7727d331dde6fc4dfd94e57fe2abaf9dc78 100644 +index f6e4fada132faeb37c076013ef7c54147de42ba8..bc8af8c6b5f0d4717317e072b3be7348b2eeee76 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -93,6 +93,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 95% rename from patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch index 67524f4..12a0c94 100644 --- a/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fa3084c310903824f8e266879251c5aaefc0c1e7..5ef482feccab75880e908b7ba511f3e324fd32a9 100644 +index c445d59036c9de418997ad3be9bc3912e8fefff4..3245cbbd3b5c14e234a4b79279792b961c45ebd1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4624,6 +4624,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -79,7 +79,7 @@ index 6560fda6525dceddc91b95c8dd82b10debd6b62f..9b33b8b6aa769aceeb8080814b0682cb if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 2919c7727d331dde6fc4dfd94e57fe2abaf9dc78..fdb02c7d0f0d5d9e954b564581293688edd99f36 100644 +index bc8af8c6b5f0d4717317e072b3be7348b2eeee76..9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 93% rename from patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch index fd06b71..6d10a36 100644 --- a/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,13 +38,13 @@ index 06b9fdd33fe888d298dfd24a67702a610233f10d..8d7cda352d1be1bd7638561d4727df9c @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index fdb02c7d0f0d5d9e954b564581293688edd99f36..fb8ea1f6eaa26c4b72ba7952d189edb42bf8ae2f 100644 +index 9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9..b736cef3509b1f6c7c6135c0f9e5d29f35c82053 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -107,6 +107,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public Fixes fixes; public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + + public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0118-Ignore-null-legacy-structure-data.patch b/patches/server/0117-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0118-Ignore-null-legacy-structure-data.patch rename to patches/server/0117-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0118-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0118-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 96% rename from patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch index 2f843f6..ec45018 100644 --- a/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,7 +36,7 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..9e4d0493aa814a392742c9ddc1815211 } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index fb8ea1f6eaa26c4b72ba7952d189edb42bf8ae2f..633bc62a41b2bc34496a507da9fe0e2eec10468d 100644 +index b736cef3509b1f6c7c6135c0f9e5d29f35c82053..2b8f53fc53dc69aa9afd516ef4a81ecf7b43e62c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -139,6 +139,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0120-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0120-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0122-CraftBukkit-UUID-to-world-map.patch b/patches/server/0121-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0122-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0121-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0123-Global-EULA-file.patch b/patches/server/0122-Global-EULA-file.patch similarity index 100% rename from patches/server/0123-Global-EULA-file.patch rename to patches/server/0122-Global-EULA-file.patch diff --git a/patches/server/0124-Specific-interval-TPS-API.patch b/patches/server/0123-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0124-Specific-interval-TPS-API.patch rename to patches/server/0123-Specific-interval-TPS-API.patch diff --git a/patches/server/0125-5-second-TPS-average.patch b/patches/server/0124-5-second-TPS-average.patch similarity index 97% rename from patches/server/0125-5-second-TPS-average.patch rename to patches/server/0124-5-second-TPS-average.patch index 81260c6..6289af4 100644 --- a/patches/server/0125-5-second-TPS-average.patch +++ b/patches/server/0124-5-second-TPS-average.patch @@ -59,7 +59,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7c32c60100cf2bd109eb8762efa856c1 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6f3d488fda697299f604e813b8eaa06ed9de828f..c8f751ab99e7c9995f1d45193c9e9ddf52b944c1 100644 +index 68197cddec15d43f9de373d096be2507e3e36227..20dcfac0f5f03a88a270628ea648278469220ba5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1055,6 +1055,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop