From f49c1294e992f4b347494ebfd7765fed958f22eb Mon Sep 17 00:00:00 2001 From: toinouH Date: Mon, 8 Feb 2021 16:55:54 +0100 Subject: [PATCH] Updated licence for CaffeineMC --- Licensing/LICENSE.md | 4 ++-- patches/server/0011-lithium-MixinDirection.patch | 2 +- patches/server/0012-lithium-MixinBox.patch | 2 +- patches/server/0013-lithium-enum_values.patch | 2 +- patches/server/0014-lithium-MixinGoalSelector.patch | 2 +- patches/server/0015-lithium-HashedList.patch | 2 +- patches/server/0023-lithium-DataTrackerMixin.patch | 2 +- patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch | 2 +- patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch | 2 +- patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch | 2 +- patches/server/0049-lithium-reduce-allocations.patch | 2 +- patches/server/0060-Port-hydrogen.patch | 2 ++ patches/server/0062-lithium-cache-chunk-gen-sea-level.patch | 2 +- upstream/Purpur | 2 +- upstream/Tuinity | 2 +- 15 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Licensing/LICENSE.md b/Licensing/LICENSE.md index e3c7b33e..d1910300 100644 --- a/Licensing/LICENSE.md +++ b/Licensing/LICENSE.md @@ -1,7 +1,7 @@ The project without the build tools (Everything that is not a .patch file or in the buildSrc folder) are licensed under the MIT license found [here](MIT.md).
All files in the buildSrc folder are licensed under MIT found [here](../buildSrc/license.txt).
-All patches (.patch files) marked with "lithium" are licensed under LGPL3 found [here](https://github.com/jellysquid3/lithium-fabric/blob/1.16.x/dev/LICENSE.txt).
-All patches (.patch files) marked with "hydrogen" are licensed under LGPL3 found [here](https://github.com/jellysquid3/hydrogen-fabric/blob/1.16.x/LICENSE.txt).
+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).
+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 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.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. diff --git a/patches/server/0011-lithium-MixinDirection.patch b/patches/server/0011-lithium-MixinDirection.patch index e9fc5c40..586ff4d2 100644 --- a/patches/server/0011-lithium-MixinDirection.patch +++ b/patches/server/0011-lithium-MixinDirection.patch @@ -4,7 +4,7 @@ Date: Mon, 11 May 2020 21:00:44 +0200 Subject: [PATCH] lithium MixinDirection Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java index 814b168eaa4b74dce2b83bc8aa557b33aebf35fa..74e95bfcae5212c77383f7b8780dce293fda02dc 100644 diff --git a/patches/server/0012-lithium-MixinBox.patch b/patches/server/0012-lithium-MixinBox.patch index c91dbe8c..b1735e03 100644 --- a/patches/server/0012-lithium-MixinBox.patch +++ b/patches/server/0012-lithium-MixinBox.patch @@ -4,7 +4,7 @@ Date: Mon, 11 May 2020 21:02:57 +0200 Subject: [PATCH] lithium MixinBox Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java index 5c3d5b22b833d9f835e17803295b87893fd05e62..e1d2e5f61b01f812d53a41cd8ba5d45b5f8c7f19 100644 diff --git a/patches/server/0013-lithium-enum_values.patch b/patches/server/0013-lithium-enum_values.patch index 78cb7640..24366fa6 100644 --- a/patches/server/0013-lithium-enum_values.patch +++ b/patches/server/0013-lithium-enum_values.patch @@ -4,7 +4,7 @@ Date: Fri, 31 Jul 2020 21:44:22 -0500 Subject: [PATCH] lithium enum_values Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java index 5d3bb5f393a1e0e4a2e8b9a466530a91279697a9..7f084e7f11a829c10d113c7fb39eec0b8ad77080 100644 diff --git a/patches/server/0014-lithium-MixinGoalSelector.patch b/patches/server/0014-lithium-MixinGoalSelector.patch index 8967a12d..97a82412 100644 --- a/patches/server/0014-lithium-MixinGoalSelector.patch +++ b/patches/server/0014-lithium-MixinGoalSelector.patch @@ -6,7 +6,7 @@ Subject: [PATCH] lithium MixinGoalSelector Only replaces the set type, might want to also port the logic rewrite in the future Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java index 9cad895c7d008487ce885cbcc2c3966645df4c19..b63f274ec0afec96b4879f9ebaed72c416d1f9d2 100644 diff --git a/patches/server/0015-lithium-HashedList.patch b/patches/server/0015-lithium-HashedList.patch index e66348b5..c0c4a5bd 100644 --- a/patches/server/0015-lithium-HashedList.patch +++ b/patches/server/0015-lithium-HashedList.patch @@ -4,7 +4,7 @@ Date: Fri, 31 Jul 2020 21:46:32 -0500 Subject: [PATCH] lithium HashedList Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java new file mode 100644 diff --git a/patches/server/0023-lithium-DataTrackerMixin.patch b/patches/server/0023-lithium-DataTrackerMixin.patch index aae7e244..cb08d67f 100644 --- a/patches/server/0023-lithium-DataTrackerMixin.patch +++ b/patches/server/0023-lithium-DataTrackerMixin.patch @@ -4,7 +4,7 @@ Date: Tue, 4 Aug 2020 21:46:05 +0200 Subject: [PATCH] lithium DataTrackerMixin Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) Co-authored-by: tr7zw diff --git a/patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch b/patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch index 9e2e0d7a..3618261f 100644 --- a/patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch +++ b/patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium PerlinNoiseSamplerMixin This is a more optimized version of Lithium's PerlinNoiseSamplerMixin. Original code by JellySquid, licensed under LGPLv3 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/ (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) Co-authored-by: Bud Gidiere diff --git a/patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch b/patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch index 5f941236..ce7ac556 100644 --- a/patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch +++ b/patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch @@ -4,7 +4,7 @@ Date: Sat, 26 Sep 2020 15:45:09 -0500 Subject: [PATCH] lithium VoronoiBiomeAccessTypeMixin Original code by JellySquid, licensed under LGPLv3 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/ (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/GenLayerZoomVoronoi.java b/src/main/java/net/minecraft/server/GenLayerZoomVoronoi.java index 70ea171edc419f8614004b6e50fc34b8fd9b4a20..47415b738c83541f76d504ad4d5f619ccd023feb 100644 diff --git a/patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch b/patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch index ad4db7ad..c090f730 100644 --- a/patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch +++ b/patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium NoiseChunkGeneratorMixin Additional Optimizations By YatopiaMC, Original code by SuperCoder79, licensed under LGPLv3 -you can find the original code on https://github.com/jellysquid3/lithium-fabric/ (Yarn mappings) +you can find the original code on https://github.com/CaffeineMC/lithium-fabric/ (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java index 321ebe8891defb46f3ad3dfea37c9bb6e2025ad7..fa60285c0c48147ad09b9197bfe577f504dd34bd 100644 diff --git a/patches/server/0049-lithium-reduce-allocations.patch b/patches/server/0049-lithium-reduce-allocations.patch index 207c5a70..692b93aa 100644 --- a/patches/server/0049-lithium-reduce-allocations.patch +++ b/patches/server/0049-lithium-reduce-allocations.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium reduce allocations This patch reduces object allocations in several places. -Parts of this patch were created for the Lithium project by JellySquid and 2No2Name under the GNU LGPLv3 license. +Parts of this patch were created for the Lithium project by JellySquid and 2No2Name under the GNU LGPLv3 license. Portions of this patch that were sourced from Lithium were remapped from Yarn mappings by Mykyta Komarnytskyy . Co-authored-by: Mykyta Komarnytskyy diff --git a/patches/server/0060-Port-hydrogen.patch b/patches/server/0060-Port-hydrogen.patch index 5f41a490..913d3a0f 100644 --- a/patches/server/0060-Port-hydrogen.patch +++ b/patches/server/0060-Port-hydrogen.patch @@ -3,6 +3,8 @@ From: JellySquid Date: Wed, 20 Jan 2021 20:14:55 +0100 Subject: [PATCH] Port hydrogen +Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 +you can find the original code on https://github.com/CaffeineMC/hydrogen-fabric/ (Yarn mappings) diff --git a/src/main/java/me/jellysquid/mods/lithium/common/cache/StatePropertyTableCache.java b/src/main/java/me/jellysquid/mods/lithium/common/cache/StatePropertyTableCache.java new file mode 100644 diff --git a/patches/server/0062-lithium-cache-chunk-gen-sea-level.patch b/patches/server/0062-lithium-cache-chunk-gen-sea-level.patch index 54871796..d4c3e01c 100644 --- a/patches/server/0062-lithium-cache-chunk-gen-sea-level.patch +++ b/patches/server/0062-lithium-cache-chunk-gen-sea-level.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium: cache chunk gen sea level Chunk generator settings are passed to the noise chunk generator through a supplier, which retrieves a given chunk generator settings registry key from the registry. The problem arises as this setting is retrieved from the supplier to get the sea level, which is called every single time a block is placed by the generator, for a total of 65536 registry lookups per chunk. As you can imagine this isn't all that fast and removing it speeds up the chunk generation time by a moderate amount (13% of CPU time spent in populateNoise without the patch vs 10% with the patch). My solution to this was to stick the supplier into a Lazy<> so it's computed once and then cached, but I'm open to suggestions. (The sea level can't be computed ahead of time due to a quirk in the new registry system, which would have been the best option here.) -This code was originally made by SuperCoder7979 in a Pull Request to lithium (https://github.com/jellysquid3/lithium-fabric/pull/179) +This code was originally made by SuperCoder7979 in a Pull Request to lithium (https://github.com/CaffeineMC/lithium-fabric/pull/179) This code was orignally licensed under the LGPL-3.0 license. diff --git a/upstream/Purpur b/upstream/Purpur index 5cff60d5..7fc2d31b 160000 --- a/upstream/Purpur +++ b/upstream/Purpur @@ -1 +1 @@ -Subproject commit 5cff60d5c6a3563d0f8dd6f611ad1ade913bcc1c +Subproject commit 7fc2d31be761c91ee3cbbde0e2832834063f5899 diff --git a/upstream/Tuinity b/upstream/Tuinity index f8c0db48..502d57ba 160000 --- a/upstream/Tuinity +++ b/upstream/Tuinity @@ -1 +1 @@ -Subproject commit f8c0db48055c9374597c05cd8359db2147432216 +Subproject commit 502d57ba8376333163a56c5491a46e408178d575