Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-06-25 06:05:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen

Browse Source
This commit is contained in:
Simon Gardling 2021-04-21 11:46:05 -04:00
commit de73ba1797
9 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PATCHES.md
View File

@ -432,7 +432,7 @@ # Patches
| server | dont load chunks for physics | Aikar | |
| server | fixup! Threaded WorldGen | ishland | |
| server | fixup! Threaded WorldGen | ishland | |
| server | lithium AI | JellySquid | |
| server | lithium AI | JellySquid | Hugo Planque |
| server | lithium DataTrackerMixin | JellySquid | tr7zw |
| server | lithium HashedList | JellySquid | |
| server | lithium MixinBox | JellySquid | |
@ -442,12 +442,12 @@ # Patches
| server | lithium NoiseChunkGeneratorMixin | JellySquid | |
| server | lithium PerlinNoiseSamplerMixin | JellySquid | Bud Gidiere |
| server | lithium VoronoiBiomeAccessTypeMixin | JellySquid | |
| server | lithium block | JellySquid | |
| server | lithium entity | JellySquid | |
| server | lithium block | JellySquid | Hugo Planque |
| server | lithium entity | JellySquid | Hugo Planque |
| server | lithium enum_values | JellySquid | |
| server | lithium gen | JellySquid | |
| server | lithium gen | JellySquid | Hugo Planque |
| server | lithium reduce allocations | JellySquid | Mykyta Komarnytskyy |
| server | lithium shape | JellySquid | |
| server | lithium shape | JellySquid | Hugo Planque |
| server | lithium: cache chunk gen sea level | SuperCoder7979 | |
| server | lithium: optimize `BlockPos.iterateOutwards` by caching | 2No2Name | |
| server | lithium: skip ticking block entities that are doing nothing | 2No2Name | |

4
README.md
View File

@ -109,7 +109,7 @@ ## Why aren't there many API additions?
(Modified from [starlis/empirecraft](https://github.com/starlis/empirecraft/))
<p>
APIs are tough to design. In projects such as Bukkit, Spigot, Sponge, Paper, etc once an API is commited, it's almost forever. You can't go breaking it without solid justification. This is the politics game.
APIs are tough to design. In projects such as Bukkit, Spigot, Sponge, Paper, etc once an API is committed, it's almost forever. You can't go breaking it without solid justification. This is the politics game.
With that in mind, much thought has to be given to the API in now and future use cases and applications to ensure it can be extended without breaking.
@ -124,7 +124,7 @@ ## License
## Security
Security information can be found found [here](/SECURITY.md).
Security information can be found [here](/SECURITY.md).
## Statistics
[![bStats Graph Data](https://bstats.org/signatures/server-implementation/Yatopia.svg)](https://bstats.org/plugin/server-implementation/Yatopia)

4
buildSrc/src/main/kotlin/Upstream.kt
View File

@ -15,7 +15,7 @@ open class Upstream(in_name: String, in_useBlackList: Boolean, in_list: String,
var serverList = list.stream().filter { patch -> patch.startsWith("server/") }
?.sorted()?.map { patch -> patch.substring(7, patch.length) }?.collect(Collectors.toList())
var apiList = list.stream().filter { patch -> patch.startsWith("API/") }
var apiList = list.stream().filter { patch -> patch.startsWith("api/") }
?.sorted()?.map { patch -> patch.substring(4, patch.length) }?.collect(Collectors.toList())
@ -85,4 +85,4 @@ open class Upstream(in_name: String, in_useBlackList: Boolean, in_list: String,
}
return filesList
}
}
}

1
patches/server/0065-lithium-AI.patch
View File

@ -3,6 +3,7 @@ From: JellySquid <jellysquid+atwork@protonmail.com>
Date: Sun, 24 Jan 2021 12:17:19 +0100
Subject: [PATCH] lithium AI
Co-authored-by: Hugo Planque <hookwood01@gmail.com>
diff --git a/src/main/java/me/jellysquid/mods/lithium/common/ai/pathing/PathNodeCache.java b/src/main/java/me/jellysquid/mods/lithium/common/ai/pathing/PathNodeCache.java
new file mode 100644

1
patches/server/0066-lithium-block.patch
View File

@ -3,6 +3,7 @@ From: JellySquid <jellysquid+atwork@protonmail.com>
Date: Sun, 24 Jan 2021 16:57:03 +0100
Subject: [PATCH] lithium block
Co-authored-by: Hugo Planque <hookwood01@gmail.com>
diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/tuples/FinalObject.java b/src/main/java/me/jellysquid/mods/lithium/common/util/tuples/FinalObject.java
new file mode 100644

1
patches/server/0067-lithium-entity.patch
View File

@ -3,6 +3,7 @@ From: JellySquid <jellysquid+atwork@protonmail.com>
Date: Sun, 24 Jan 2021 22:55:55 +0100
Subject: [PATCH] lithium entity
Co-authored-by: Hugo Planque <hookwood01@gmail.com>
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 4cae70c41bbd977b6a5661e43a5ddd3694e89580..b62e60b0575d8195a7506ff22c7b1c542a9ca382 100644

1
patches/server/0068-lithium-gen.patch
View File

@ -3,6 +3,7 @@ From: JellySquid <jellysquid+atwork@protonmail.com>
Date: Sun, 24 Jan 2021 23:42:56 +0100
Subject: [PATCH] lithium gen
Co-authored-by: Hugo Planque <hookwood01@gmail.com>
diff --git a/src/main/java/net/minecraft/world/level/newbiome/area/AreaLazy.java b/src/main/java/net/minecraft/world/level/newbiome/area/AreaLazy.java
index 69a021b84cd3f6e2a397a03cfbb562a94f72aace..9a897ad2b53e281cf165106d03737d2ec517eb29 100644

1
patches/server/0069-lithium-shape.patch
View File

@ -3,6 +3,7 @@ From: JellySquid <jellysquid+atwork@protonmail.com>
Date: Wed, 27 Jan 2021 21:05:05 +0100
Subject: [PATCH] lithium shape
Co-authored-by: Hugo Planque <hookwood01@gmail.com>
diff --git a/src/main/java/me/jellysquid/mods/lithium/common/block/LithiumEntityShapeContext.java b/src/main/java/me/jellysquid/mods/lithium/common/block/LithiumEntityShapeContext.java
new file mode 100644

2
upstreamConfig/0005-Empirecraft.properties
View File

@ -1,4 +1,4 @@
name=Empirecraft
useBlackList=false
list=API/Add-ChatColor.getById.patch,server/Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch,server/Fix-Bukkit.createInventory-with-type-LECTERN.patch,server/dont-load-chunks-for-physics.patch
list=api/Add-ChatColor.getById.patch,server/Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch,server/Fix-Bukkit.createInventory-with-type-LECTERN.patch,server/dont-load-chunks-for-physics.patch
branch=origin/master