Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5

Licensing/LICENSE.md

@@ -3,5 +3,7 @@
 All patches (.patch files) marked with "lithium" are licensed under LGPL3 found [here](https://github.com/CaffeineMC/lithium-fabric/blob/1.16.x/dev/LICENSE.txt).<br>
 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).<br>
 All patches (.patch files) marked with "krypton" are licensed under MIT found [here](https://github.com/astei/krypton/blob/master/LICENSE).<br>
+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).<br>
+All patches (.patch files) marked with "LazyDFU" are licensed under MIT found [here](https://github.com/astei/lazydfu/blob/master/LICENSE).<br>
 All other patches (.patch files) included in this repo are licensed under the MIT license found [here](MIT.md).<br>
 See [EMC](https://github.com/starlis/empirecraft/blob/master/README.md), [Akarin](https://github.com/Akarin-project/Akarin/blob/1.16.3/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.

PATCHES.md

@@ -293,6 +293,8 @@ # Patches
 | api |  PlayerSetSpawnerTypeWithEggEvent      | William Blake Galbreath |  |
 | 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 |  Port hydrogen      | JellySquid |  |
 | server |  Preload ProtocolLib EnumWrappers      | ishland |  |
 | server |  Prevent light queue overfill when no players are online      | Spottedleaf |  |

README.md

@@ -20,6 +20,8 @@ ## So what is Yatopia?
 * [Airplane](https://github.com/Technove/Airplane)
 * [Hydrogen](https://github.com/jellysquid3/hydrogen-fabric)
 * [Krypton](https://github.com/astei/krypton)
+* [Cadmium](https://github.com/LucilleTea/cadmium-fabric)
+* [LazyDFU](https://github.com/astei/lazydfu)
 
 
 ## Try it out 

buildSrc/src/main/kotlin/MCDevImports.kt

@@ -24,5 +24,22 @@ val libraryImports = setOf<LibraryImport>(
     LibraryImport("com.mojang", "brigadier", "com/mojang/brigadier", "CommandDispatcher"),
     LibraryImport("com.mojang", "brigadier", "com/mojang/brigadier/tree", "LiteralCommandNode"),
     LibraryImport("com.mojang", "brigadier", "com/mojang/brigadier/suggestion", "SuggestionsBuilder"),
-    LibraryImport("com.mojang", "brigadier", "com/mojang/brigadier/arguments", "BoolArgumentType")
-)
+    LibraryImport("com.mojang", "brigadier", "com/mojang/brigadier/arguments", "BoolArgumentType"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers", "FieldFinder"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers", "DataFixUtils"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers", "TypeRewriteRule"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers", "Typed"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers", "TypedOptic"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers", "View"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/functions", "Apply"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/functions", "Comp"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/functions", "PointFree"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/functions", "PointFreeRule"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/optics", "IdAdapter"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/optics", "Inj1"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/optics", "Inj2"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/optics", "Optics"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/optics", "Proj1"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/optics", "Proj2"),
+    LibraryImport("com.mojang", "datafixerupper", "com/mojang/datafixers/types", "Type")
+)

patches/server/0066-Port-LazyDFU.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andrew Steinborn <git@steinborn.me>
+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/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
+index b149e32aac86ce2f7521958fa7394e4f5b852174..b077104a751dc921b37dacd092924d6f08850ac3 100644
+--- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
++++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
+@@ -18,7 +18,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);