Commit Graph

661 Commits

Author SHA1 Message Date
Ivan Pekov
6559aa88e5
Merge branch 'ver/1.16.5' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2021-01-21 18:20:21 +02:00
Zoe
985b5655f5
Use modified toothpick for our build & patch system.
This has been in work for a bunch of time. Zoe ( duplexsystem or budgidiere, whatever ) has put a ton of work into this. 
We now have a bugfree build system that works flawlessly. 

Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
Co-authored-by: Simon Gardling <titaniumtown@gmail.com>
Co-authored-by: toinouH <toinouh2003@gmail.com>

P.s the one who merged this is ivan and not bud.
2021-01-21 12:58:52 +02:00
Ivan Pekov
ced85132f5
Replace all references to codemc.org with codemc.io
this should fix the build problems @ codemc
2021-01-21 10:17:19 +02:00
Simon Gardling
19b1495d69
Add config option for logging login location (#346) 2021-01-21 07:47:05 +02:00
Ivan Pekov
e1249c4648
Updated Upstream and Sidestream(s) (Tuinity/Purpur/AirplaneLite)
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:
4bcbfd7 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.5
e14829a Updated Upstream (Paper)

Purpur Changes:
cd18335 Update Toothpick

AirplaneLite Changes:
c496d1c Update Downloads URL
683041b Updated Upstream (Tuinity)
2021-01-20 19:15:58 +02:00
Ivan Pekov
0c43fe2949
Updated Upstream and Sidestream(s) (Tuinity/EMC/Origami/Purpur/AirplaneLite)
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:
c04b005 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.5
1d169e7 Updated Upstream (Paper)

EMC Changes:
a8914cb8 Remove the ProjectileHitBlockEvent
b8f864b5 Updated Paper
42cd3269 Remove FlowerPotPlantEvent and undeprecate FlowerPotRemoveEvent
64b3edf0 Remove the UUID key for setSpawnedEntity
938c6f1b Convert spawn egg entity tag attributes on creature spawn
4cc80284 Disable entityTag conversion since data version isn't accessible in scope
478d83fe Updated Paper
1e409abf Updated Paper

Origami Changes:
ab42df9 Update Paper

Purpur Changes:
7e8bf66 Updated Upstream (Paper & Tuinity)

AirplaneLite Changes:
3200f2a Add new webhook for notifications
fe01371 Up MC version
c585ff5 Updated Upstream (Tuinity)
2021-01-18 18:40:21 +02:00
Zoe
e48038077b
[CI-SKIP] Fix GH Actions 2021-01-16 23:35:01 -06:00
Ivan Pekov
e8b98faf4c
Merge branch 'ver/1.16.5' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2021-01-16 09:19:13 +02:00
Ivan Pekov
f8c5c21e38
[CI-SKIP] Add 1.16.5 branches to build.yml 2021-01-16 08:42:04 +02:00
Ivan Pekov
0fd5cd2d23
Update to 1.16.5 2021-01-16 08:39:47 +02:00
Ivan Pekov
61cc1b76b1
[CI-SKIP] A way to sponsor our project
Paypal donations are gonna be split.
buymeacoffee directly supports me.
2021-01-15 18:01:03 +02:00
Ivan Pekov
99e3c5ddd8
Updated Upstream and Sidestream(s) (Tuinity/EMC/Origami/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:
f4f7929 Updated Upstream (Paper)

EMC Changes:
bdbacfb3 Updated Paper
a59be75b Convert item name/lore at time of creation properly

Origami Changes:
eb7662a Fix legacy code being accessible when disabling legacy support

Purpur Changes:
7356e48 Fix stuck in portals
7f4c8f8 Updated Upstream (Paper)
2021-01-15 16:20:46 +02:00
Ivan Pekov
86c42a4fe1
Updated Upstream and Sidestream(s) (Tuinity/EMC/Origami/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:
53d9870 Updated Upstream (Paper)

EMC Changes:
541b7328 Updated Paper

Origami Changes:
14a141e Update Paper

Purpur Changes:
17e9e39 Fix short enderman height - EntityTypes now loads before configs
8bfb9f5 Updated Upstream (Paper)
885092f Updated Upstream (Paper)
e126e38 Fix villager boat exploit
2021-01-13 08:17:16 +02:00
Ivan Pekov
60fd6b7aa5
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:
683b913 Updated Upstream (Paper)

Purpur Changes:
475b232 Updated Upstream (Paper)
2021-01-11 11:33:17 +02:00
Ivan Pekov
43e33eb332
Updated Upstream and Sidestream(s) (Tuinity/Origami/Purpur/AirplaneLite)
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:
e76c58e Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
8954b61 Updated Upstream (Paper)

Origami Changes:
2cff647 Update Paper

Purpur Changes:
4a9c016 [ci-skip] Don't cancel TPSBar task if it wasn't started
c32e46e Movement options for armour stands (#140)
9370140 Updated Upstream (Paper)
f74bcbd [ci-skip] Update license info in readme
299b43a [ci-skip] Rebuild patches
03365bb Farmland trampling changes (#138)
984a268 Add StructureGenerateEvent (#137)
15d23a1 Add EntityTeleportHinderedEvent (#136)
8795c74 [ci-skip] Update Gradle to 6.8
e9be2a2 [ci-skip] change image link to purpur site
d09cf68 [ci-skip] Stop patching symptoms. Patch the root cause
dd65bd1 Fix typo
7a6e6ec Updated Upstream (Paper)
bf7e290 Hide server-ip from timings
be50f97 move timings config to the right place (#130)
f1390cd Ignore blocks above Note Blocks (#135)
c50344d Resolves #132 Add mobGriefing bypass to everything else
bba9cff [ci-skip] Update README.md

AirplaneLite Changes:
36cc1d3 Updated Upstream (Tuinity)
bc0fef0 Don't spawn lightning on chunk load
15c06b8 Fix other comments
47f98d6 License information
4705af8 Fix comments
432cf4b Optimize random calls in chunk ticking
2021-01-10 14:31:15 +02:00
Ivan Pekov
ce245c5be0
Faster distance method
colors are still bork :/
2021-01-07 18:40:45 +02:00
Ivan Pekov
db228ac1b7
Rebuild patches 2021-01-07 17:56:38 +02:00
Ivan Pekov
87420d4569
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2021-01-07 17:53:28 +02:00
Ivan Pekov
3770a43472
Updated Upstream and Sidestream(s) (Tuinity/Purpur/AirplaneLite)
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:
33b3f86 Updated Upstream (Paper)
4743c34 Updated Upstream (Paper)

Purpur Changes:
5c0dbf1 [ci-skip] Easier way to remove tuinity's revert of MC-4
424fcf1 Updated Upstream (Paper & Tuinity)
b3644cc Fix rotating UP/DOWN CW and CCW
fbb74cd Updated Upstream (Paper)

AirplaneLite Changes:
5e8ebc0 Updated Upstream (Tuinity)
2021-01-07 17:09:35 +02:00
Ivan Pekov
074471c3de
Do not initiate trackedPlayers with ObjectOpenHashSet
Potential fix of #331
Whether or not cursors are present on a map - the game forces the server to track players if the map is rendered.
This change wasn't liked by the maps, so - revert it for now.
I'll probably find a way to optimise this later...
2021-01-06 20:03:47 +02:00
Ivan Pekov
2b156e3c9c
Updated Upstream and Sidestream(s) (Tuinity/Origami/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:
abeafb0 Updated Upstream (Paper)

Origami Changes:
e204bb8 Update Paper

Purpur Changes:
c7b279f Updated Upstream (Paper & Tuinity)
2021-01-05 19:21:38 +02:00
Ivan Pekov
548b666d62
Some entity optimisations
Optimised halloween checker and some smol optimisations.
2021-01-04 20:45:19 +02:00
Ivan Pekov
63ce6fbe16
PaperPR - Fix username connecting with no texture being overwritten by usercache 2021-01-04 10:51:42 +02:00
Ivan Pekov
ea14d2c947
Updated Upstream and Sidestream(s) (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.

Tuinity Changes:
076174a Updated Upstream (Paper)
2021-01-04 10:38:27 +02:00
SoSeDiK
9cd8a35964
Update NBT-API (#329) 2021-01-03 13:45:56 +02:00
Ivan Pekov
adb131f051
Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur/AirplaneLite)
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:
2325c36 Updated Upstream (Paper)

EMC Changes:
a841b5a5 Fix more lore/item name issues (fixes witch gem issue)
1abb3fae Ensure server conversions on ExactChoice ingredients
f2f9d2b0 Forgot to commit paper ref
388620d5 Updated Paper
7a0ae67b Add a null check for UUID to prevent npe later
9de409e0 Updated Paper
0d09eb9a Add new Empire Server API for managing fake players for the tablist

Purpur Changes:
da95725 Updated Upstream (Tuinity)
7194a16 Updated Upstream (Paper)
77373ea Updated Upstream (Tuinity)
0bae78d Drop async advancements patch for now

AirplaneLite Changes:
7b4acbe h != k
a07e80c Whoops, missed paperclip change
845c191 Add license to patch files
fa671b7 Allow gradle wrapper in gitignore
04fc820 Rework strip raytracing patch
f48f6b2 Updated Upstream (Tuinity)
ec7c6df Fix encoding
9326301 Update upstream, fix utf8
20b8c79 Allow gradle wrapper in gitignore
6cd80e9 Updated Upstream (Tuinity)
2021-01-03 13:41:36 +02:00
Ivan Pekov
011dd344e4
Add a special case for floodgate and offline uuids
floodgate spoofs uuids, but plugins such as luckperms get the uuid that the server uses, causing problems
if this option is configured properly, such things won't happen
2020-12-29 08:52:57 +02:00
Ivan Pekov
58e66daeb4
Updated Upstream and Sidestream(s) (Tuinity/Origami/Purpur/AirplaneLite)
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:
a405b1b Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
f06591a Updated Upstream (Paper)
48d3556 Prevent light queue overfill when no players are online

Origami Changes:
78f4af0 Require Java 11
b70595f Fix patch rebuilding for MojangAPI module
34170a7 Update Paper

Purpur Changes:
3d455ff Updated Upstream (Paper & Tuinity)
7152b72 [ci-skip] Use shadowJar output as input for paperclip
822a35a [ci-skip] Publish shadowJar as server artifact
f142481 Resolves #125 - Full netherite armor grants fire resistance
5e269e1 Updated Upstream (Paper)

AirplaneLite Changes:
9326301 Update upstream, fix utf8
2020-12-28 11:34:56 +02:00
Ivan Pekov
f1ed22d699
In its best "broken" state
color lighting still isn't right. I've returned the getDistance calls to the double one, as it is more acruate.
there is some improvement from changing the getDistance calls tho.
2020-12-27 10:57:55 +02:00
Ivan Pekov
f5db3842fc
Smol fixups 2020-12-27 10:39:59 +02:00
Ivan Pekov
fe305faa92
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-27 08:48:18 +02:00
Ivan Pekov
aaeb472be2
Drop this shit
I don't have any more nerves to fix this
2020-12-27 08:44:05 +02:00
Ivan Pekov
02d2ee9fcb
More changes
fixed build but wasn't able to fix the colors problem :/
looks like the problem is not the color comparison code anymore, but the way doubleColors is initialized
it works for MapTest but doesn't want to work properly for that array :/
2020-12-26 21:57:15 +02:00
Ivan Pekov
cd4b222dcc
Current progress 2020-12-26 12:18:16 +02:00
Ivan Pekov
1890cf9a82
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-26 11:59:49 +02:00
Ivan Pekov
aad302fa99
Copy the passengers list in entityJoinedWorld too 2020-12-24 10:57:06 +02:00
Ivan Pekov
ef7a12601f
Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur/AirplaneLite)
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:
86b20d4 Updated Upstream (Paper)
afd0643 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
d1db107 Updated Upstream (Paper)

EMC Changes:
d32f7b26 Updated Paper
0650e984 Only retrack passengers if there are passengers in them

Purpur Changes:
5758335 Configurable spawn reinforcements attribute
8849c20 Fix afk broadcast stripped colors
fe73b19 Updated Upstream (Paper)
f3dccd1 [ci-skip] Specify UTF-8 for Javadoc and JavaCompile
7ad2c5d [ci-skip] More attributes work
19ec1c3 [ci-skip] Uh.. I dont even know..
1cb7e4e Add PlayerBookTooLargeEvent
4e8a150 Updated Upstream (Paper)
8cabaae Updated Upstream (Paper & Tuinity)

AirplaneLite Changes:
20b8c79 Allow gradle wrapper in gitignore
6cd80e9 Updated Upstream (Tuinity)
2020-12-24 09:14:21 +02:00
Ivan Pekov
0a4af12efb
Actually register the TPSBar command
This manouver's gonna cost us 51 light years
2020-12-23 10:35:14 +02:00
Ivan Pekov
27a7dc2193
Don't unnecessarily copy the passenger list 2020-12-23 10:01:47 +02:00
Ivan Pekov
5c8274bd2f
Port requested patches from Purpur
Ported: TPSBar, custom growth rates and configurable lava speed
2020-12-23 09:46:56 +02:00
Ivan Pekov
89229b4966
GH-322: Return end gateways do not teleport players back to the main end island
Fixes #322
Instead using the idea suggested, I dropped the patch and reimplemented some of the smol stuff in a new one.
2020-12-23 08:50:22 +02:00
Ivan Pekov
b185779850
Merge branch 'patch-mappalette' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-22 16:19:37 +02:00
Ivan Pekov
633625dd42
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-22 16:19:07 +02:00
Ivan Pekov
4da7b3aefc
Updated Upstream and Sidestream(s) (Tuinity/EMC/Origami/Purpur/AirplaneLite)
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:
3e77330 Updated Upstream (Paper)

EMC Changes:
e45a78e4 Update the API as well - setTargetRange to Double where null is default FOLLOW_RANGE
9fc6891d Default target range to the follow range
a1e2e2a3 Fix an issue with players in vehicles in vehicles desyncing
b6e2f202 Add a Dead vehicle reason to VehicleExitEvent
72b0da43 Use the correct entity local variable
ad32d0d6 Fix bug with entity passengers not executing entity tasks
194aaafb Updated Paper
cb3a7bb7 Always convert Lore/Name of an item to ensure consistency
6c63538d Revert "Updated Paper"
8837d5a9 Limit fortress spawns to the nether
005cdda9 Updated Paper
1476d693 Fix Lore comparisons to use legacy format
588f30f9 Quick fix the rcon log issue for now
475e626a Fix World Meta loading
3ad5f8a7 Remove RCON Thread Logs
7f3c4a25 Fix dismounting from vehicle when teleporting cross dimension
595bd307 Prevent NPE for PathfinderGoalMeleeAttack
0a64d9e9 Fix EntityDismountEvent reason
c25ef322 Updated Paper

Origami Changes:
36c0e05 Fix wrong circular dependency error if plugin depends on own provides
655fa5f Add option to disable legacy plugin support

Purpur Changes:
79d304f Updated Upstream (Paper)
bef678f [ci-skip] Simpler method of merging metadata files
3b18ff8 Updated Upstream (Paper)
25c7772 Apply the AppendingTransformer for `META-INF/services/java.sql.Driver`
faf0db9 Bump config version to 10
3d1926e More base attribute stuff
43d6dab Updated Upstream (Paper)
2fd92fe [ci-skip] Setup repo for api publishing
26b0736 Updated Upstream (Paper)
e704540 [ci-skip] Fix the remaining javadoc warnings
a541703 [ci-skip] Fix import mc-dev task
64f5f9d Fix dependency relocations
d7f1884 [ci-skip] Skip compiling tests as well as running them when using the `-Pfast` flag
3e08321 [ci-skip] Fix javadoc warnings (missing @param and @return)
1bfe697 [ci-skip] Remove paper's unsafe util
63b647c [ci-skip] Make it easier to fork Purpur using our scripts
c453170 Fix relocations
7e331c2 Fix #118 Phantom fire time not working
844337c Fix lag from villager lobotomize check
2ec0dba Updated Upstream (Paper)
69c6484 Build using Toothpick scripts (#122)

AirplaneLite Changes:
ff087b7 Changes from Purpur
7263c2f Fix maven subproject URL
819c731 Switch to Purpur's Toothpick
2020-12-22 16:01:31 +02:00
epserv
28fd5ee66c Final changes 2020-12-21 23:53:11 +05:00
Ivan Pekov
a08d6de865
Remove unnecessary diff and patch 2020-12-17 20:26:06 +02:00
Ivan Pekov
b5b9906d0e
Rebuild patches to retain order 2020-12-17 10:48:07 +02:00
Ivan Pekov
1b2561e886
Merge branch 'patch-mappalette' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-17 10:33:51 +02:00
Ivan Pekov
0235954074
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-17 10:33:34 +02:00
Ivan Pekov
2b78178637
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:
69e6a4c Updated Upstream (Paper)

Purpur Changes:
391f9ad Updated Upstream (Paper)
2020-12-17 09:48:17 +02:00