From 7833379e6ff7303693878d19fc30d5a81b8a8a81 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 3 May 2021 15:28:52 -0400 Subject: [PATCH] drop lazydfu --- Licensing/LICENSE.md | 1 - PATCHES.md | 1 - README.md | 1 - ...atch => 0061-Lithium-CompactSineLUT.patch} | 0 patches/server/0061-Port-LazyDFU.patch | 49 ------------------- ...g.patch => 0062-tic-tacs-unblocking.patch} | 0 ...BlockPos.iterateOutwards-by-caching.patch} | 0 ...m-block.patch => 0064-lithium-block.patch} | 0 ...entity.patch => 0065-lithium-entity.patch} | 0 ...thium-gen.patch => 0066-lithium-gen.patch} | 0 ...m-shape.patch => 0067-lithium-shape.patch} | 0 ...ing-block-entities-that-are-doing-n.patch} | 0 12 files changed, 52 deletions(-) rename patches/server/{0062-Lithium-CompactSineLUT.patch => 0061-Lithium-CompactSineLUT.patch} (100%) delete mode 100644 patches/server/0061-Port-LazyDFU.patch rename patches/server/{0063-tic-tacs-unblocking.patch => 0062-tic-tacs-unblocking.patch} (100%) rename patches/server/{0064-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch => 0063-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch} (100%) rename patches/server/{0065-lithium-block.patch => 0064-lithium-block.patch} (100%) rename patches/server/{0066-lithium-entity.patch => 0065-lithium-entity.patch} (100%) rename patches/server/{0067-lithium-gen.patch => 0066-lithium-gen.patch} (100%) rename patches/server/{0068-lithium-shape.patch => 0067-lithium-shape.patch} (100%) rename patches/server/{0069-lithium-skip-ticking-block-entities-that-are-doing-n.patch => 0068-lithium-skip-ticking-block-entities-that-are-doing-n.patch} (100%) diff --git a/Licensing/LICENSE.md b/Licensing/LICENSE.md index 2d768ddd..80b2b880 100644 --- a/Licensing/LICENSE.md +++ b/Licensing/LICENSE.md @@ -4,7 +4,6 @@ All patches (.patch files) marked with "lithium" are licensed under LGPL3 found All patches (.patch files) marked with "hydrogen" are licensed under LGPL3 found [here](https://github.com/CaffeineMC/hydrogen-fabric/blob/1.16.x/LICENSE.txt).
All patches (.patch files) marked with "krypton" are licensed under MIT found [here](https://github.com/astei/krypton/blob/master/LICENSE).
All patches (.patch files) marked with "Cadmium" are licensed under MIT found [here](https://github.com/LucilleTea/cadmium-fabric/blob/1.16.x/dev-my-fork/LICENSE.txt).
-All patches (.patch files) marked with "LazyDFU" are licensed under MIT found [here](https://github.com/astei/lazydfu/blob/master/LICENSE).
All patches (.patch files) marked with "Tic-Tacs" are licensed under LGPLv3 found [here](https://github.com/Gegy/tic-tacs/blob/1.16.4/LICENSE).
All other patches (.patch files) included in this repo are licensed under the MIT license found [here](MIT.md).
See [EMC](https://github.com/starlis/empirecraft/blob/master/README.md), [Akarin](https://github.com/Akarin-project/Akarin/blob/1.16.5/LICENSE.md), [Purpur](https://github.com/pl3xgaming/Purpur/blob/ver/1.16.5/LICENSE), [Airplane](https://github.com/Technove/Airplane/blob/master/PATCHES-LICENSE), [Origami](https://github.com/Minebench/Origami/blob/1.16/PATCHES-LICENSE), and [Tuinity](https://github.com/Spottedleaf/Tuinity/blob/master/PATCHES-LICENSE) for the license of patches automatically pulled during upstream updates. diff --git a/PATCHES.md b/PATCHES.md index 9a9cdae9..e111f359 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -341,7 +341,6 @@ This is an overview over all patches that are currently used. | server | Players should not cram to death | William Blake Galbreath | | | server | Populator seed controls | Spottedleaf | | | server | Port Cadmium | Lucy-t | | -| server | Port LazyDFU | Andrew Steinborn | | | server | Preload ProtocolLib EnumWrappers | ishland | | | server | Prevent long map entry creation in light engine | Spottedleaf | | | server | Prevent unload() calls removing tickets for sync loads | Spottedleaf | | diff --git a/README.md b/README.md index a1ae85f9..a8f07229 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ Yatopia combines the code from many [Paper](https://github.com/PaperMC/Paper) fo * [Purpur](https://github.com/pl3xgaming/Purpur) * [Airplane](https://github.com/Technove/Airplane) * [Cadmium](https://github.com/LucilleTea/cadmium-fabric) -* [LazyDFU](https://github.com/astei/lazydfu) * [Tic-Tacs](https://github.com/Gegy/tic-tacs) diff --git a/patches/server/0062-Lithium-CompactSineLUT.patch b/patches/server/0061-Lithium-CompactSineLUT.patch similarity index 100% rename from patches/server/0062-Lithium-CompactSineLUT.patch rename to patches/server/0061-Lithium-CompactSineLUT.patch diff --git a/patches/server/0061-Port-LazyDFU.patch b/patches/server/0061-Port-LazyDFU.patch deleted file mode 100644 index 5c388962..00000000 --- a/patches/server/0061-Port-LazyDFU.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Andrew Steinborn -Date: Tue, 2 Feb 2021 20:59:35 -0500 -Subject: [PATCH] Port LazyDFU - - -diff --git a/src/main/java/me/steinborn/lazydfu/mod/LazyDataFixerBuilder.java b/src/main/java/me/steinborn/lazydfu/mod/LazyDataFixerBuilder.java -new file mode 100644 -index 0000000000000000000000000000000000000000..081aa46531a9df1dc732669a2c1e3180790468c4 ---- /dev/null -+++ b/src/main/java/me/steinborn/lazydfu/mod/LazyDataFixerBuilder.java -@@ -0,0 +1,23 @@ -+package me.steinborn.lazydfu.mod; -+ -+import com.mojang.datafixers.DataFixerBuilder; -+import com.mojang.datafixers.DataFixer; -+ -+import java.util.concurrent.Executor; -+ -+/** -+ * This version of {@code DataFixerBuilder} does not immediately initialize rules. -+ */ -+public class LazyDataFixerBuilder extends DataFixerBuilder { -+ -+ private static final Executor NO_OP_EXECUTOR = command -> {}; -+ -+ public LazyDataFixerBuilder(int dataVersion) { -+ super(dataVersion); -+ } -+ -+ @Override -+ public DataFixer build(Executor executor) { -+ return super.build(NO_OP_EXECUTOR); -+ } -+} -\ No newline at end of file -diff --git a/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java b/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java -index 625dcfaeffb83a0b8b53778c32287cac8daae540..5a22fd08cc2a09d8695ca060dee80183364164a1 100644 ---- a/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java -+++ b/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java -@@ -202,7 +202,7 @@ public class DataConverterRegistry { - // Yatopia start - private static final DataFixer c; - static { -- DataFixerBuilder datafixerbuilder = new DataFixerBuilder(SharedConstants.getGameVersion().getWorldVersion()); -+ DataFixerBuilder datafixerbuilder = new me.steinborn.lazydfu.mod.LazyDataFixerBuilder(SharedConstants.getGameVersion().getWorldVersion()); // Yatopia - Port LazyDFU - - a(datafixerbuilder); - c = datafixerbuilder.build(SystemUtils.d); diff --git a/patches/server/0063-tic-tacs-unblocking.patch b/patches/server/0062-tic-tacs-unblocking.patch similarity index 100% rename from patches/server/0063-tic-tacs-unblocking.patch rename to patches/server/0062-tic-tacs-unblocking.patch diff --git a/patches/server/0064-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch b/patches/server/0063-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch similarity index 100% rename from patches/server/0064-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch rename to patches/server/0063-lithium-optimize-BlockPos.iterateOutwards-by-caching.patch diff --git a/patches/server/0065-lithium-block.patch b/patches/server/0064-lithium-block.patch similarity index 100% rename from patches/server/0065-lithium-block.patch rename to patches/server/0064-lithium-block.patch diff --git a/patches/server/0066-lithium-entity.patch b/patches/server/0065-lithium-entity.patch similarity index 100% rename from patches/server/0066-lithium-entity.patch rename to patches/server/0065-lithium-entity.patch diff --git a/patches/server/0067-lithium-gen.patch b/patches/server/0066-lithium-gen.patch similarity index 100% rename from patches/server/0067-lithium-gen.patch rename to patches/server/0066-lithium-gen.patch diff --git a/patches/server/0068-lithium-shape.patch b/patches/server/0067-lithium-shape.patch similarity index 100% rename from patches/server/0068-lithium-shape.patch rename to patches/server/0067-lithium-shape.patch diff --git a/patches/server/0069-lithium-skip-ticking-block-entities-that-are-doing-n.patch b/patches/server/0068-lithium-skip-ticking-block-entities-that-are-doing-n.patch similarity index 100% rename from patches/server/0069-lithium-skip-ticking-block-entities-that-are-doing-n.patch rename to patches/server/0068-lithium-skip-ticking-block-entities-that-are-doing-n.patch