Commit Graph

5895 Commits

Author SHA1 Message Date
Kyle Wood c8ecb664c6
Remove now unnecessary scripts and update upstreamMerge.sh 2021-06-15 01:42:57 -05:00
Kyle Wood 34269f8a39
Run Gradle tasks in parallel by default 2021-06-15 01:29:55 -05:00
Kyle Wood 15741a08f3
Update paperweight to 1.0.1 2021-06-15 01:19:26 -05:00
Kyle Wood bbb8816211
Update to paperweight 1.0.0, with automatic library imports 2021-06-15 00:56:07 -05:00
Jason Penilla f267238e0e
reorder patches after merge 2021-06-14 22:49:09 -07:00
Omer Uddin b26ba5bc8a
port some patches (#5837) 2021-06-14 22:44:37 -07:00
Jake Potrebic 8755b391fb
Add back stream patch (#5838) 2021-06-14 22:38:36 -07:00
Jason Penilla a5251b4375
update Fix incorrect status dataconverter for pre 1.13 chunks 2021-06-14 22:12:50 -07:00
Jason Penilla 5a86fba668
final patches from remapped and unmapped
keep in mind many patches in the removed folder still need to be updated
2021-06-14 21:56:30 -07:00
Kyle Wood da99f8648f
Fix mappings patches for Hopper getLevel issue 2021-06-14 23:39:41 -05:00
Kyle Wood 5b49459c64
Gradle & Paperclip updates 2021-06-14 23:17:16 -05:00
Jason Penilla f5f80a4aed
fixes 2021-06-14 21:16:18 -07:00
Jason Penilla f6636fca9e
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
ebb0e28d #631: Add Villager#shakeHead
751469c6 #629: Add LivingEntity#isClimbing

CraftBukkit Changes:
622cf611 SPIGOT-6555: Cannot access shield BlockStateMeta
8b2e78ec SPIGOT-6542: Fix counting players with fauxSleeping = true
f66c437a SPIGOT-6561: Add events for dripleaf tilting
6ed40004 SPIGOT-6560: Crash when falling stalactite hits player
72a2901b SPIGOT-6557: PlayerEditBookEvent#setNewBookMeta does not update meta
a07e783a #865: Implement Villager#shakeHead
3252ff18 #863: Add LivingEntity#isClimbing
77058c79 SPIGOT-6554: Worlds created with the bukkit ChunkGenerator cannot save
2021-06-14 21:02:21 -07:00
Jason Penilla 7929fdabaf
update mappings files 2021-06-14 21:02:20 -07:00
Jason Penilla 7271649af2
patches 2021-06-14 21:02:20 -07:00
Jason Penilla 2ac6b12fc8
Update editorconfig 2021-06-14 21:02:20 -07:00
Kyle Wood cf885102cd
Fix AT format issue 2021-06-14 22:58:14 -05:00
Jake Potrebic d3424f4a8a
tons of patches (#5835) 2021-06-14 22:59:31 -04:00
Omer Uddin 38e4dc3050
Organize removed patches (#5836) 2021-06-14 19:54:17 -07:00
mechoriet 24b7da65ee
Re-add Chunk Priority/Urgency System (#5829) 2021-06-14 22:41:12 -04:00
Jason Penilla 0c732e2ef5
Put pom in correct location for Paperclip install to maven local feature 2021-06-14 18:56:02 -07:00
Jake Potrebic 09ead8b043 more patches 2021-06-14 23:42:23 +02:00
MiniDigger b2a63428c8 continue to load paperclip from jfrog for now 2021-06-14 22:29:55 +02:00
MiniDigger 23a9df76fd add access transforming capabilities 2021-06-14 22:15:38 +02:00
Jake Potrebic f777faa8c1 more patches & fixes to existing patches 2021-06-14 21:18:49 +02:00
Jake Potrebic 5dce4d9178 more patches 2021-06-14 21:18:49 +02:00
MiniDigger f72886c9a6 run CI with --stacktrace 2021-06-14 21:12:21 +02:00
MiniDigger ae5af5afcc resolve paperweight from paper repo 2021-06-14 21:02:30 +02:00
Jake Potrebic 8cf470d6b1 more patches 2021-06-14 19:02:40 +02:00
Jake Potrebic 18a839d265 fix no grav bee patch for world height changes 2021-06-14 19:02:40 +02:00
Aurora 53081c6e5f
even more compile fixes 2021-06-14 17:17:08 +02:00
Aurora b87c54f843
fix compile issues 2021-06-14 17:10:25 +02:00
Aurora 21effd6c48
even moar workkkkk 2021-06-14 17:02:03 +02:00
Josh Roy 3721b1466f need to look at this later, fails rn 2021-06-14 06:47:04 -07:00
Josh Roy cfb17666ff even MOAR progress 2021-06-14 06:45:16 -07:00
Aurora 42091ba5f0 Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 14:04:57 +02:00
Aurora 8ca5a642ef
more work work work 2021-06-14 14:04:35 +02:00
Jason Penilla b7cdb5d6c4
fix issue in hopper patch 2021-06-14 03:18:42 -07:00
Aurora d2cb88db9c Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 12:13:18 +02:00
Aurora ba3ce754a9
more work uwu 2021-06-14 12:13:08 +02:00
Jason Penilla eddf0f40dc
decomp fixes 2021-06-14 02:15:37 -07:00
Jason Penilla f7bc641230
Add missing getLevel implementation to Hopper Minecart, add mapping to fix reobf 2021-06-14 02:06:46 -07:00
Jake Potrebic 7fe98bd520
more patches (#5827)
* more patches

* even moar patches
2021-06-14 10:37:14 +02:00
Jake Potrebic 405ab6388e add entity debug info patch back 2021-06-14 09:38:41 +02:00
Jake Potrebic 4b2f4cbebb Add back incremental chunk saving patch 2021-06-14 09:30:41 +02:00
Jason Penilla 956fcad4ea
Fix mojangapi build 2021-06-13 23:56:15 -07:00
Jason Penilla 45c6df9648
patches 2021-06-13 23:45:29 -07:00
Jason Penilla ba374d2485
reorder 2021-06-13 22:42:29 -07:00
mechoriet dcbb16316d
ReAdded PreCreatureSpawnEvent from removed (#5814) 2021-06-13 22:40:21 -07:00
Jake Potrebic 9c95d0481d
Re-add xp orb merging patches (#5823) 2021-06-13 22:37:57 -07:00