Skip to content
This repository has been archived by the owner on Jun 19, 2021. It is now read-only.

Merge Staging #458

Merged
merged 16 commits into from
Apr 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Licensing/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ 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 "LazyDFU" are licensed under MIT found [here](https://github.com/astei/lazydfu/blob/master/LICENSE).<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.
11 changes: 11 additions & 0 deletions PATCHES.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ 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 | |
Expand Down Expand Up @@ -332,6 +333,8 @@ 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 | 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 | |
Expand Down Expand Up @@ -422,6 +425,7 @@ This is an overview over all patches that are currently used.
| server | Zombie horse naturally spawn | William Blake Galbreath | |
| server | add config for logging login location | Simon Gardling | |
| server | dont load chunks for physics | Aikar | |
| server | lithium AI | JellySquid | |
| server | lithium DataTrackerMixin | JellySquid | tr7zw |
| server | lithium HashedList | JellySquid | |
| server | lithium MixinBox | JellySquid | |
Expand All @@ -430,6 +434,13 @@ This is an overview over all patches that are currently used.
| server | lithium NoiseChunkGeneratorMixin | JellySquid | |
| server | lithium PerlinNoiseSamplerMixin | JellySquid | Bud Gidiere |
| server | lithium VoronoiBiomeAccessTypeMixin | JellySquid | |
| server | lithium block | JellySquid | |
| server | lithium entity | JellySquid | |
| server | lithium enum_values | JellySquid | |
| server | lithium gen | JellySquid | |
| server | lithium reduce allocations | JellySquid | Mykyta Komarnytskyy |
| server | lithium shape | JellySquid | |
| server | lithium: cache chunk gen sea level | SuperCoder7979 | |
| server | lithium: optimize &#96;BlockPos.iterateOutwards&#96; by caching | 2No2Name | |
| server | lithium: skip ticking block entities that are doing nothing | 2No2Name | |
| server | tic-tacs: unblocking | Gegy | |
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ 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)
* [LazyDFU](https://github.com/astei/lazydfu)
* [Tic-Tacs](https://github.com/Gegy/tic-tacs)


## Try it out
Expand Down
21 changes: 19 additions & 2 deletions buildSrc/src/main/kotlin/MCDevImports.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
Loading