Commit Graph

746 Commits

Author SHA1 Message Date
Simon Gardling
3b5b5d0443 more stuff 2021-05-07 15:30:47 -04:00
Simon Gardling
59217ffdae update 2021-05-07 14:23:23 -04:00
Simon Gardling
014dba9f27 use gradle 7 for mapper tool 2021-05-07 13:47:53 -04:00
Simon Gardling
77d6f4f386 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into dev/mapping-tool 2021-05-07 13:17:58 -04:00
snoopdoooggyttv
c371143a0d
Fix Log4j warning (#482)
Co-authored-by: snoopdooogyttv <snoopdoooggyttv@users.noreply.github.com>
2021-05-05 23:42:03 -04:00
Simon Gardling
fdc476a8ab force build 2021-05-05 11:15:04 -04:00
Simon Gardling
7833379e6f drop lazydfu 2021-05-03 15:29:11 -04:00
Simon Gardling
00e3f0c2f0 [ci-skip] rebuild 2021-05-03 14:40:00 -04:00
Simon Gardling
15bf90300d fix tuinity upstream 2021-05-03 14:37:44 -04:00
Simon Gardling
3a5423ad96 re-write applyPatches in kotlin 2021-05-01 00:42:57 -04:00
Simon Gardling
822fa2adae use bash instead of sh 2021-04-30 23:56:47 -04:00
Simon Gardling
c140a169d7 move everything mapping related to a seperate folder 2021-04-30 23:42:15 -04:00
Simon Gardling
c43b088c81 initial work 2021-04-30 21:12:38 -04:00
Simon Gardling
8d157f9be6 Jenkinsfile: don't delete decomp 2021-04-30 13:54:17 -04:00
Simon Gardling
0f2c8e806a
Updated Upstream and Sidestream(s) (Paper/Purpur) (#478)
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:
bc7ea673a Add internal channel initialization listeners (#5557)
b28ad17ac Check for world change in MoveEvent API methods
3095c7592 [Auto] Updated Upstream (CraftBukkit)
f56989c97 Add RespawnFlags to PlayerRespawnEvent (#5533)
7579c2667 Add more API to PlayerMoveEvent (#5553)
ef60c01c4 [Auto] Updated Upstream (CraftBukkit)
0256dbea3 [Auto] Updated Upstream (Bukkit/CraftBukkit)
91ef74029 Updated Upstream (Spigot) (#5550)
fdf2a59d5 Updated Upstream (Bukkit/CraftBukkit) (#5549)

Purpur Changes:
97185df [CI-SKIP] Update mcdevimports documentation
1099c24 Config for wither explosion radius (closes #265)
c5c9527 Configurable damage settings for magma blocks (adds #247)
1389b02 Updated Upstream (Paper)  (#300)
79c82d2 Configuration to change the maximum number of bees in a hive (#301)
9fd776e Add configurable minecart speed and move controllable minecart options
2021-04-30 13:16:37 -04:00
Simon Gardling
8d5cd6980d Jenkinsfile: add discord webhook
also specify jdk version where needed
2021-04-28 13:31:50 -04:00
Simon Gardling
61f261ee2a
Updated Upstream and Sidestream(s) (Paper/Airplane/Purpur/Empirecraft/Origami) (#474)
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:
b8020379c Extract Adventure Version into a variable, add reminder to update the linked JD on the homepage (#5422)
809466f2e Fix anchor respawn acting as a bed respawn when using the end portal (#5540)
d219fd642 [Auto] Updated Upstream (Bukkit/CraftBukkit)
db464b099 Implement methods to convert between Component and Brigadier's Message (#5542)
4047cffca Add PlayerBedFailEnterEvent (#4935)
70d697e6e Update Paperpclip
5ed771591 [CI-SKIP] Remove bad null annotation (#5538)
454a4c78e More World API (#3850)
869e02304 Add PlayerDeepSleepEvent (#5525)
fb56fc35e fix non-dummy objectives not updating
dc859a61f [CI-SKIP] [Auto] Rebuild Patches
7d1689f1a  Add missing checkReachable check for shulker boxes (#5453)
ba8eb3d4b Add missing Javadoc for COLORABLE MaterialTag (#5376)
db801cbf3 Fix PlayerItemHeldEvent firing twice (#5534)
14de2b795 fix PigZombieAngerEvent cancellation (fixes #5319) (v2) (#5329)
86d684ad1 Add get-set drop chance to EntityEquipment (#5528)
33fb8cf63 Add consumeFuel to FurnaceBurnEvent (#5532)
9957f4630 Fix duplicating /give items on item drop cancel (#5536)
d94882043 Fix legacyComposer not using AsyncChatEvent messages (#5509)
053bd82cc Don't print spawn load time when not loading spawn (#5467)
a6d78caae Add isDeeplySleeping to HumanEntity (#5470)
711b7a80b Expose more Adventure serializers through PaperComponents (#5443)
3f63bde0c Set Area Effect Cloud Rotation (#5462)
3523f0fda Remove useless check on player interact cancellation (#5448)
6574d1aa8 fix #5526 - use correct type when sending message to clients
dbfa833ec don't throw when loading TE with invalid keys
a9525a6f7 Do not schedule poi task for each block write on chunk gen

Airplane Changes:
f5fb024 Temporarily revert patch
3c728a7 Oops, these 2 too
37a93e5 Your daily dose of 1-3% optimization patches
bbd689a Remove useless check
d8bdbc5 Reduce allocations for fire spreading
41051fd Redo reduction of entity chunk ticking check patch
31272d8 Flare Update
8f32713 Remove criterion patch
0fed2df Various patches that need to be reorganized later
f78856b Updated Upstream (Tuinity)
f7d6382 Flare Update
71d0799 Update gradle configuration
0f79774 Updated Upstream (Tuinity)

Purpur Changes:
3dce975 Updated Upstream (Paper & Airplane) (#298)
eb07368 Run GitHub Actions for pull requests
e97d062 Updated Upstream (Paper, Tuinity, & Airplane)

Empirecraft Changes:
2a021ede Updated Paper
e963bb2c Add Paper MojangAPI to pom
6f5bf24e Updated Paper

Origami Changes:
73ecdf1 Update Paper
73a3735 Item and exp merge improvements
2021-04-27 12:40:55 -04:00
Simon Gardling
ef9ed2f890 [ci-skip] fix .gitattributes 2021-04-27 12:23:08 -04:00
Simon Gardling
cd11b56a72 [ci-skip] re-add java 15 to github actions 2021-04-27 12:17:26 -04:00
tofikarz
9dd5b27488 [ci-skip] Updated Gradle to 7.0 (#453)
* Gradle 7.0

* Build JDK 16

* [CI-SKIP] rebase

* Speed-Up build times

Makes kotlin tasks run in parallel and adds back configure on demand

* Updated to the final release of gradle 7.0

* Gradle Distribution SHA 256 Sum

* Validate Gradle Wrapper

* merged the two jobs

* better name for validation

* setup-java@v2

* fix?

* specify arch

* Setup JAVA_HOME and PATH

* revert

* Use the same jdk as @v1

* use setup-java@v1

too much errors

* require Gradle Wrapper Validation to run build

* setup-java@v2

* Regenerate cache

maybe fix some issues

* Auto set MC version of paperclip in GitHub Actions

* Added .gitattributes

Should fix issues with line endings

* Update .gitattributes

* Updated shadow jar plugin

* fix
2021-04-27 11:57:16 -04:00
Simon Gardling
7cf4be9f2f revert lithium-AI.patch (more investigation needed) 2021-04-22 11:50:26 -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
b1b3f8a3bc fix lithium-entity to work with tic-tacs unblocking 2021-04-21 12:12:08 -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
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
1ba5a2b52c [ci-skip] remove .github/workflows/upstream.yml_off 2021-04-13 11:37:30 -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
f585f04cfd fix jenkins for other branches 2021-04-12 12:46:48 -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
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