Commit Graph

736 Commits

Author SHA1 Message Date
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
Simon Gardling
f564431f5a maven test 2 2021-04-06 22:35:23 -04:00
Simon Gardling
141861daa3 maven test 2021-04-06 22:30:04 -04:00
Simon Gardling
104950c98c Revert "test"
This reverts commit 1e88afae7a.
2021-04-06 21:54:56 -04:00
Simon Gardling
1e88afae7a test 2021-04-06 21:54:44 -04:00
Simon Gardling
be67395994 update 2021-04-06 14:22:55 -04:00
Simon Gardling
2c205e034e on the latest version now 2021-04-06 14:04:37 -04:00
Simon Gardling
16ba48ea61
Use master branch in patch dirs (#450)
use `master` as a branch name instead of `Yatopia-api` or `Yatopia-server` in `Yatopia-API` and `Yatopia-Server` respectively.
2021-04-05 18:44:30 -04:00
Simon Gardling
679a88af3f
Upstream (#447)
* Updated Upstream and Sidestream(s) (Paper/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:
4b78c0b80 [CI-SKIP] [Auto] Rebuild Patches
2d9ff13eb forced whitelist: use configuable kick message (fixes #5417) (#5418)
000cec2ab bug #5432 - post modern event even if legacy event is cancelled
6c83bc6e5 Remove from Map by key
857852c28 Make sure to remove correct TE during TE tick
f7b4abb25 [Auto] Updated Upstream (Bukkit/CraftBukkit)

Airplane Changes:
9a4bd85 Remove Multithreaded Tracker
1068498 Updated Upstream (Tuinity)

Purpur Changes:
083a86e [ci-skip] Update for Toothpick changes
8b9b214 Updated Upstream (Paper & Tuinity)

Empirecraft Changes:
6b5cffc2 Updated Paper

* Updated Upstream and Sidestream(s) (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.

Airplane Changes:
3ed988c Use AIR library for configuration parsing

Purpur Changes:
9631959 Add 5 sec TPS to GUI (#260)
2a0a5e6 [ci-skip] Bump Toothpick Kotlin version
02b3444 Add back multithreaded entity tracker
43b4a2f Updated Upstream (Paper & Airplane)

* update gradle from 6.8.2 to 6.8.3

* fix build (hopefully)

* 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:
211f8e041 Prevent light queue overfill when no players are online

* well that was dumb

* FINALLY it works

* Updated Upstream and Sidestream(s) (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.

Empirecraft Changes:
018fcff7 Updated Paper
2021-04-03 15:49:43 -04:00
Simon Gardling
774d9325cf (hopefully) trigger codemc build 2021-04-01 12:34:12 -04:00
Simon Gardling
ac524e348f
Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Purpur/Empirecraft) (#443)
* 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:
0641de2d4 [CI-SKIP] Change some fields to textara (#5405)
98a34ea47 [CI-SKIP] 🚀 Upgrade to new form-based templates (#5278)
bca97a8f7 replace spaces in world key (touches #5397)
de94f6485 Refactor chat message composition (#5396)
e27f334bb [CI-SKIP] Fix makemcdevsrc.sh for nms relocations (#5389)
ae15e85da Updated Upstream (CraftBukkit)
26fe0ac5a Only set despawnTimer for Wandering Traders spawned by MobSpawnerTrader (#5391)
b748eb7b8 Fix VanillaMobGoalTest#testBukkitMap (#5390)
18dbbb578 [Auto] Updated Upstream (CraftBukkit)
fac9cc5d5 [CI-SKIP] Ignore .gitignore
087aa70e7 Deprecate ItemStack#setLore(List<String>) and ItemStack#getLore, add Component based alternatives
9889c651c apply fixup
c310f0a61 Updated Upstream (Bukkit/CraftBukkit)
f17560ab0 wtf is this t file -jmp
347f3a9b8 fix compile
700e9e6a5 rebase
cf4dc464a Revert de5f4e469...c270abe96
6870db613 script & POM fix
743c6533c Replace ** with * (BSD/macOS)
376d7b097 Don't remove the .java
fcb3fd42a Fix macOS/BSD support
8cfc05249 Link correctly
ba1031ca7 Rename work dir
c8d844ab7 Actually fix preloading this time
e62aa5e3e Fix class preloading
1c03cf898 It's mojang math, not minecraft math
1034873df Apply fixups
39b125771 Use revision file
956150da7 Welcome to 1.16.5-R0.2
ccb217c01 Change cache keys
0d217001c more work
f6d820f07 It compiles
0f78e9525 More work
1718f61bf Updated Upstream (CraftBukkit/Spigot)
b28d46114 Update scripts for NMS repackaging
d4532f7e7 bug #5373 - fix AsyncChatEvent not being posted when processing a legacy APCE continuation
522ae1c51 Replace all block states of a specified block (#5055)
1cda67118 [Auto] Updated Upstream (CraftBukkit)
8c74d3126 Updated Upstream (Bukkit) (#5359)
fd3c66a91 bug #5362 - correctly pass "render type" when registering a new scoreboard objective

Tuinity Changes:
9bdcb9b Delete work dir when running jar
6351d7c Updated Upstream (Paper)
932c199 Generate mc-dev correctly
bf3e737 Make packet limiter work from IDE
1686f38 Fix packet limiter config
f40f7b4 Update README.md styling (#264)
da1c3ac GH Actions Changes (#213)
5f325ec Updated Upstream (Paper)
0f83fe4 Updated Upstream (Paper)
44e8e5d Do not load extra radius of chunks when loading a single chunk
31f9cae Revert custom table implementation for blockstate states
9ac33d1 Be aware of entity teleports when chunk checking entities
18c7f3f Always set impulse for projectiles to true, even if hit event failed

Airplane Changes:
f94d399 Merge pull request #18 from notOM3GA/upstream/nms-repackage
0fc6226 Force build for Flare update
08439d6 Updated Upstream (Tuinity)
0f80443 Updated Upstream (Tuinity)
2f6cbdc More debug for plugins not shutting down tasks
12e1b61 Updated Upstream (Tuinity)
fc778d3 Update README.md
db6b0eb Merge pull request #16 from DeadSteve51/patch-2
b23bee3 Remove debug
8157e98 Config style, flare style, disable tracker by def
98d0b58 Updates to README

Purpur Changes:
75b07a0 Fix stack overflow on armorstand movement
f754a7b Sneak to bulk process composter
1362f49 Updated Upstream (Paper, Tuinity, & Airplane)
5bf8615 [ci-skip] Conflict on change for adventure deprecations
114b37b Add purpur.yml to Flare (#204)
c6dce38 forgot the crops
c004236 Configurable ravager griefable blocks list
766246a [ci-skip] remove duplicate patch
ac93477 Config to make Creepers explode on death (#201)
297181e Updated Upstream (Paper, Tuinity, & Airplane)
45b9a18 Config to disable Llama caravans (#203)
a99a83b Allow fully disabling farmland trampling
3aa4f68 Tick fluids config
0e34d59 Add missing imports :/
3dd9f46 Updated Upstream (Paper, Tuinity, & Airplane)

Empirecraft Changes:
1b579407 Improve importmcdev script and fix first server patch
f597a82e Update generatesources script
218f5298 Fix patches - imported files
847cf558 Updated Paper
d51410c3 Updated Paper
fb3301fd Fix bow entity ai speed/distance
dbde1dc4 Add isJoined boolean to fake players
a23317f7 Update Fake Player API - misc changes
a970b77f Updated Paper

* 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:
7259c32ba [CI-SKIP] [Auto] Rebuild Patches
0e06e912e Fix annotations so Inventory#getContents returns non-null array with nullable type (#5350)
b90b4f8ad Properly apply Sign#isEditable to TEs when calling BlockState#update

Airplane Changes:
87d4a17 Track queue debug command

Purpur Changes:
d44f93e Fix tpsbar with naughty plugins

* 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:
99f1ce6 Add enchantment target for bows and crossbows
af9181e Add configurable drowning settings (closes #221) (#222)
f72437b Remove mcdevimports.* (#228)
08de42d Add config for infinity on crossbows (#215)
5f76cb3 Add a config for villager trading (#210)
67ffa05 Add config for disabling skipping the night (#209)

* revert paper commit that made the build fail (CI still doesn't work)

* Update build.yml

* test2

* Update build.yml

* take7

* how often does md_5 change mappings?

this will come back to bite me in exactly 17 days

* Revert "how often does md_5 change mappings?"

This reverts commit 8b05c16d6c.

* Updated Upstream and Sidestream(s) (Paper/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:
6caa330c6 Add checkerframework nullness annotations to accepted list for AnnotationTest (#5409)

Purpur Changes:
96f5360 Config to allow for unsafe enchants (#235)
b6235af Rebase on latest Purpur (#230)
754948e Updated Upstream (Paper)
f55c0e9 Option to make doors require redstone (closes #171)
34d5818 Fix paper using wrong annotations
f31bcc6 Updated Upstream (Paper & Airplane)
55244dd Config to show Armor Stand arms on spawn (#231)
c726479 Config to disable hostile mob spawn on ice `:)` (closes #214) (#229)
26a0094 Break individual slabs when sneaking (closes #218)
c3de3ac Fix wart farmers plating vegetables on soul sand

* 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:
1b0d783 Updated Upstream (Paper)
2c16629 Fix NPE in NetworkManager#execute

Purpur Changes:
0d25d39 Add cache for slime max health (resolves #234)
39dd78a Fix #240 - Separate slab breaking triggers every single time
1ecb9ef Projectile offsets config (#237)
33ee1e7 Configurable sponge absorption (closes #232) (#236)
a0355eb Add Note Block to disabled block updates (#241)

* 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:
8b47131da Optimize short circuit evaluation of sign check (#5348)
1a2fd12a5 Drop carried item when player has disconnected (#5036) (#5166)
68af93524 Use PaperAdventure.PLAIN instead of PlainComponentSerializer.plain() for AdventureComponent#getString (#5414)

* 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:
94f025a Updated Upstream (Paper)
ab00f31 Do not load chunks around fake players
a9599d8 Fix incorrect parsing of positive target-send-rate
2a6cd81 Make sure to remove correct TE during TE tick

Purpur Changes:
9dfc780 Config for powered rail activation distance (#248)

Co-authored-by: duplexsystem <duplexsys@protonmail.com>
2021-03-28 09:50:47 -05:00
Simon Gardling
9168211946 rebuild (again) 2021-03-22 13:20:48 +00:00
Simon Gardling
b983c386b5 rebuild 2021-03-22 13:05:11 -04:00
Simon Gardling
d4ba77eb14
remove Custom-table-implementation-for-blockstate-state-loo.patch (#442) 2021-03-22 09:08:20 -04:00
Simon Gardling
fea0b562a5
use paperclip instead of yatoclip (#440)
* use paperclip instead of yatoclip

* update README.md
2021-03-16 17:25:29 -05:00
Simon Gardling
c4a68471e4
Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur) (#435)
* 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:
d80e43647 [CI-SKIP] Removal from the MIT list (#5345)

Tuinity Changes:
c303521 Change license from MIT to LGPLv3

Purpur Changes:
3044036 Re-enable timings by default
4f85cbe Include all Airplane patches
7b5feba [ci-skip] Tuinity license change
210ff8f [ci-skip] revert last commit. wasnt what i thought it was :3
47e8965 [ci-skip] Add maven repositories for Adventure API
3930ac4 It's muffin time!
e535225 Updated Upstream (Paper & Tuinity)

* whoops

* this actually fixes it (I was being stupid)

* [CI-SKIP] fix akarin link in Licensing/LICENSE.md

* Updated Upstream and Sidestream(s) (Paper/Airplane/Akarin/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:
39c487b37 Add per-command perms for paper command
cdbf2578c Add Item Rarity API (#5352)

Airplane Changes:
5df9825 Remove iterators from inventory contains
18d2be1 Merge pull request #14 from violetwtf/patch-1
f716d4c Merge pull request #13 from violetwtf/master
128cbe5 Reduce entity chunk ticking checks from 3 to 1
03ac093 Skip copying unloading tile entities
97dd027 Smaller pool size for tracking
9e9f57b Only set up Flare if token is available
580f380 Updated Upstream (Tuinity)
97df206 Update README to reflect support changes
cf161dd Change blog URL to more helpful one

Akarin Changes:
6be3d57 Update Jenkinsfile
3aa2e99 Merge pull request #198 from HookWoods/ver/1.16.5
c548038 try to fix velocity repo
5b03eb1 Update patches to 1.16.5

Empirecraft Changes:
81545aaf Updated Paper

Airplane Changes:
82253fd Early return optimization for target finding
9572643 Cache entityhuman display name

* Updated Upstream and Sidestream(s) (Tuinity/Purpur/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.

Tuinity Changes:
aea6b83 Merge dev/playerchunkloading
722c7ca Use hash table for maintaing changed block set
98ae59d Custom table implementation for blockstate state lookups
8b8704f Oprimise map impl for tracked players
ea71d6b Optimise snow & ice in chunk ticking
9871d4c Remove chunk lookup & lambda allocation from counting mobs
5a4a35f Add patreon
7d93d96 Refactor data management for region manager

Purpur Changes:
37591fe Add config to use no-tick vd for tracker (#195)

Airplane Changes:
cc00c69 Updated Upstream (Tuinity)
2021-03-14 14:20:20 -05:00