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

…v/c2me-port

Licensing/LICENSE.md

@@ -3,6 +3,7 @@ All files in the buildSrc folder are licensed under MIT found [here](../buildSrc
 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 "Tic-Tacs" are licensed under LGPLv3 found [here](https://github.com/Gegy/tic-tacs/blob/1.16.4/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.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.

PATCHES.md

@@ -267,7 +267,6 @@ This is an overview over all patches that are currently used.
 | api | Lagging threshold | William Blake Galbreath | |
 | server | Left handed API | BillyGalbreath | |
 | api | Left handed API | BillyGalbreath | |
-| server | Lithium: CompactSineLUT | JellySquid | |
 | server | LivingEntity safeFallDistance | William Blake Galbreath | |
 | api | LivingEntity safeFallDistance | William Blake Galbreath | |
 | server | LivingEntity#broadcastItemBreak | William Blake Galbreath | |
@@ -350,6 +349,7 @@ This is an overview over all patches that are currently used.
 | 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 | Preload ProtocolLib EnumWrappers | ishland | |
 | server | Prevent long map entry creation in light engine | Spottedleaf | |
 | server | Prevent unload() calls removing tickets for sync loads | Spottedleaf | |

README.md

@@ -18,6 +18,7 @@ Yatopia combines the code from many [Paper](https://github.com/PaperMC/Paper) fo
 * [Origami](https://github.com/Minebench/Origami)
 * [Purpur](https://github.com/pl3xgaming/Purpur)
 * [Airplane](https://github.com/Technove/Airplane)
+* [Cadmium](https://github.com/LucilleTea/cadmium-fabric)
 * [Tic-Tacs](https://github.com/Gegy/tic-tacs)
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 # Check on https://gradle.org/release-checksums/
-distributionSha256Sum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
+distributionSha256Sum=dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

patches/server/0065-lithium-shape.patch

@@ -258,10 +258,10 @@ index 0000000000000000000000000000000000000000..e210e0fa39b74805429832c3d232fadb
 + }
 +}
 diff --git a/src/main/java/net/minecraft/util/MathHelper.java b/src/main/java/net/minecraft/util/MathHelper.java
-index b95115aca72ba0cf6451096ddbd8b50a8f3bb5c6..0afb8c643cb3e5938e12183c6132797d6ed645bb 100644
+index e9e7fcf2b63febe2a7d055826fabb86bc13a5cf3..e03246ba1b462a7d800f7b1fbc2fce59d5e3e4a6 100644
 --- a/src/main/java/net/minecraft/util/MathHelper.java
 +++ b/src/main/java/net/minecraft/util/MathHelper.java
-@@ -198,6 +198,7 @@ public class MathHelper {
+@@ -196,6 +196,7 @@ public class MathHelper {
  return c(f, f + f3, f2);
  }