Commit Graph

751 Commits

Author SHA1 Message Date
Simon Gardling 8e6a62ab90 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-22 17:07:43 -04:00
Simon Gardling 7cf4be9f2f revert lithium-AI.patch (more investigation needed) 2021-04-22 11:50:26 -04:00
Simon Gardling 42907013b7 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-21 17:37:20 -04:00
Simon Gardling c1a03b89af
Upstream (#469)
* Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Purpur/Empirecraft)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
fbae9dbe0 [Auto] Updated Upstream (Bukkit/CraftBukkit)
ac4a33aab [Auto] Updated Upstream (Bukkit)
c1e07158b [Auto] Updated Upstream (Bukkit/CraftBukkit)
5e4b88e95 Fix dangling sout
23afda179 basic hostname validation
0fb8bdf0e Updated Upstream (Bukkit/CraftBukkit) (#5508)
88ab784da [Auto] Updated Upstream (CraftBukkit)
ca7111d5f Fix PlayerItemConsumeEvent cancelling (fixes #4682) (#5383)
06fb560dc Add support for tab completing and highlighting console input from the Brigadier command tree (#5437)
0a9b89c7a Fix occasional light gen issues for neighbor blocks (#5500)
a08be1ec7 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
7d36676 Fix light source locking
f1ec0c2 Add concurrency check to ProtoChunk light sources
159d146 Improvements to chunk loader system

Airplane Changes:
3b3cde7 Correctly use DEAR values, fix config reloading
dd60919 Updated Upstream (Tuinity)

Purpur Changes:
5674cdc Updated Upstream (Paper)

Empirecraft Changes:
efda8c5b Updated Paper

* Updated Upstream and Sidestream(s) (Paper/Tuinity)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
39bf5b525 Update teams known as code owners

Tuinity Changes:
b12d0cc Replace ticket level propagator
42df8e1 Correctly handle recursion for chunkholder updates
73eb2a8 Do not copy visible chunks
8a4f3be Do not schedule poi task for each block write on chunk gen

* Multithreaded Entity Tracker fixup
2021-04-21 17:26:49 -04:00
Simon Gardling 939f275446
lithium AI fixup: use vanilla method for getClosestEntity (#470)
Fixes #467
2021-04-21 15:35:13 -04:00
Simon Gardling d479b55a39 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-21 12:29:01 -04:00
Simon Gardling b1b3f8a3bc fix lithium-entity to work with tic-tacs unblocking 2021-04-21 12:12:08 -04:00
Simon Gardling de73ba1797 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-21 11:47:13 -04:00
foss-mc f43855078b
fix typo in Upstream.kt (#465)
* fix typo in Upstream.kt

* lowercase api
2021-04-19 11:42:41 -04:00
Simon Gardling d99cf54b0c
Merge Staging (#458)
* on the latest version now

* MEGA port PR (#459)

* add all of the patches

* cleanup patches

* update README.md and LICENSE.md

* forgot about tic-tacs!

* ...and AI-Improvements

* give JellySquid credit for lithium-gen.patch

* drop AI-improvements

* rebuild

* [CI-SKIP] co-author Hugo for some patches
2021-04-17 20:13:30 -04:00
snoopdoooggyttv 08b5fda04e
[ci-skip] Other typo fix (#463) 2021-04-16 15:09:41 -04:00
snoopdoooggyttv 8fa0233d4b
[CI-SKIP] Fix typo! (#462) 2021-04-16 14:43:28 -04:00
Simon Gardling 824dab7b70 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-15 14:57:12 -04:00
Simon Gardling 22fae2c050 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-04-15 14:46:50 -04:00
Simon Gardling cc91a8080f
Upstream (#461)
* Updated Upstream and Sidestream(s) (Paper)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
8a29f5894 [Auto] Updated Upstream (Bukkit/CraftBukkit)
8756d232c Expose server protocol version (#5416)

* Updated Upstream and Sidestream(s) (Tuinity/Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
32b4d52 Updated Upstream (Paper)
ac5adca Make sure lit is set for pre 1.14 chunks

Purpur Changes:
24d9e61 Piglin portal spawn modifier
5866f36 Fix #263 - NPE on TPSBar when player disconnects
7f7f024 Updated Upstream (Paper, Tuinity, & Airplane)

* bump kotlin-stdlib

* Updated Upstream and Sidestream(s) (Paper/Airplane/Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
606cdac60 Update the view distance before scheduling chunk loads (#5269)

Airplane Changes:
0789789 Updated Upstream (Tuinity)
c1e4d71 Fluid cache patch

Purpur Changes:
04f73c5 Fix error when using non living entity on monster egg
76c35fc Fix #287 - TPSBarTask NPE (again)

* Updated Upstream and Sidestream(s) (Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Purpur Changes:
2e62618 Fix #280 - Ridables do not reset idle timer
2021-04-15 14:46:34 -04:00
Simon Gardling e750b07647 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-13 13:53:30 -04:00
Simon Gardling 1bbceb8ad3 rebuild 2021-04-13 13:18:45 -04:00
Simon Gardling 1136c0423b drop AI-improvements 2021-04-13 13:14:59 -04:00
Simon Gardling 3c54591bd2 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-04-13 11:57:52 -04:00
Simon Gardling 1ba5a2b52c [ci-skip] remove .github/workflows/upstream.yml_off 2021-04-13 11:37:30 -04:00
Simon Gardling 63713d312c re-add lithium-skip-ticking-block-entities-that-are-doing-n.patch 2021-04-13 11:28:35 -04:00
Simon Gardling e57142a973 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-13 11:25:53 -04:00
Simon Gardling 0fcae7c462 give JellySquid credit for lithium-gen.patch 2021-04-13 11:23:30 -04:00
Simon Gardling c42517c83d ...and AI-Improvements 2021-04-13 11:09:24 -04:00
Simon Gardling 81fa176ebe forgot about tic-tacs! 2021-04-13 11:06:49 -04:00
Simon Gardling 55111134b6 update README.md and LICENSE.md 2021-04-13 10:59:43 -04:00
Simon Gardling 3ebe72ca61 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-12 14:01:51 -04:00
Simon Gardling 4b58475168 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-04-12 13:44:54 -04:00
Simon Gardling 76a75f866b
upstream (#455)
* Updated Upstream and Sidestream(s) (Paper)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
d15161114 [Auto] Updated Upstream (Spigot)
e8889e96a [Auto] Updated Upstream (CraftBukkit)
3bc888ba6 [Auto] Updated Upstream (CraftBukkit)

* Updated Upstream and Sidestream(s) (Paper)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
3fea87edb [Auto] Updated Upstream (CraftBukkit)
a111b1365 Send post ChatEvent messages as MessageType.CHAT

* Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
3db3aaf39 [Auto] Updated Upstream (CraftBukkit)
c953e51dd [Auto] Updated Upstream (CraftBukkit/Spigot)
dc529c7a9 Fix PlayerEditBookEvent (#5463)

Tuinity Changes:
a0aa5ab Do not load 1 radius neighbours for lighting
5ccfa52 Fix terrible patch times
af53d70 Stop large move vectors in player packet handling from killing the server
6e56ee7 Fix OBFHELPER for flushHeader in RegionFile
995d05c Do not update TE's in generating chunks

Purpur Changes:
2e66f83 [ci-skip] Fix typo
6cbe4fc Change Logo Tuinity to Purpur
5e89d23 Updated Upstream (Paper & Airplane)

* Updated Upstream and Sidestream(s) (Paper)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
304a216ba [CI-SKIP] Ignore gitignore when adding files in automation
d8e384a16 [CI-SKIP] Drop `Allow PlayerEditBookEvent to fire for off hand` (#5471)

* fix kotlin-stdlib dependency

* update dependencies

* how did that happen...

* Updated Upstream and Sidestream(s) (Paper)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
de138fac4 [Auto] Updated Upstream (Bukkit)

* Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
4492bc4cc remove l4j class no longer in existence from preload list
be1370517 Updated Upstream (CraftBukkit) (#5484)
d560151ec Bump mysql-connector-java to 8.0.23 (Fixes #5473) (#5474)
61f400f11 Update log4j to 2.11.2 for JDK 9+ compat (#5400)
a98196585 Updated Upstream (Bukkit/CraftBukkit)

Tuinity Changes:
d5261ad Do not load chunks for getCubes by default
da9cf98 Don't read neighbour chunk data off disk when converting chunks

Airplane Changes:
8de8e82 Updated Upstream (Tuinity)
2021-04-12 13:27:14 -04:00
Simon Gardling 133e09ced4
MEGA port PR (#459)
* add all of the patches

* cleanup patches
2021-04-12 13:03:59 -04:00
Simon Gardling b158a87699 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-04-12 12:47:01 -04:00
Simon Gardling f585f04cfd fix jenkins for other branches 2021-04-12 12:46:48 -04:00
Simon Gardling 8527a0c459 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-04-12 12:13:38 -04:00
Simon Gardling e7dfd4d75e Jenkinsfile fix 4 2021-04-12 11:58:23 -04:00
Simon Gardling ff504832ac Jenkinsfile fix 3 2021-04-12 11:39:49 -04:00
Simon Gardling b7646294ed Jenkinsfile fix 2 2021-04-12 11:37:38 -04:00
Simon Gardling 6ca97c200d
Jenkinsfile Fix 2021-04-12 11:36:35 -04:00
tofikarz 920fdd1703
Changes to Jenkinsfile (#451)
* Maybe this works?

Changed/Added:

+ Archive artifacts in its own build stage?
+ Gradlew clean
+ Delete the work dir in Paper
+ Always clean Ws after build?

* chmod dir???

i don't see this necessary but maybe?

* do not clean when build publish?

* Remove jenkins workspace?

Maybe this fixes somethings?

* turned off git gc

Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com>
2021-04-12 11:34:11 -04:00
Simon Gardling 6fdd4e2092 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen 2021-04-08 13:39:25 -04:00
Simon Gardling b2d81c179c Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-04-08 13:39:10 -04:00
Simon Gardling 923775033a github actions on more branches 2021-04-08 13:38:18 -04:00
Simon Gardling c809d822e3 remove old branches from workflow 2021-04-08 13:22:29 -04:00
Simon Gardling a56fe2b4cc Revert "update logic to find maven"
This reverts commit cfffd9d050.
2021-04-08 13:19:53 -04:00
Simon Gardling 536f09e69f Revert "Create clean_build.yml"
This reverts commit 5f87d326fd.
2021-04-08 13:19:46 -04:00
Simon Gardling cfffd9d050 update logic to find maven 2021-04-08 13:18:31 -04:00
Simon Gardling 5f87d326fd
Create clean_build.yml 2021-04-07 16:24:56 -04:00
Simon Gardling 6ee4e105d7 maybe this will work? 2021-04-06 23:23:14 -04:00
Simon Gardling c4b8af3dc4 please work... 2021-04-06 23:16:51 -04:00
Simon Gardling 803b6a4dce revert changes (well that didn't work) 2021-04-06 22:47:52 -04:00
Simon Gardling 5e3f7d43c0 maven test 3 2021-04-06 22:39:35 -04:00