Commit Graph

126 Commits

Author SHA1 Message Date
Nassim Jahnke
105034367d More more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
6f3591fd6d More more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
d7cdc72bdf More more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
e9954ed32a More more more work 2021-11-30 19:26:33 +01:00
Jason Penilla
a8ef7aa56f Prepare for updating server patches 2021-11-30 19:26:33 +01:00
Jason Penilla
4316c604fb comment out mappings and remove no longer needed patch 2021-11-30 19:26:33 +01:00
Jason
f3830bc214
Update paperweight to 1.2.0 (#6901) 2021-11-16 21:00:14 -08:00
Jake Potrebic
555f99d390
cleanup: Add hand to bucket events patch (#6881) 2021-11-15 20:01:19 +01:00
Jake Potrebic
a923e332ee
Make despawn distance configs per-category, improve per category spawn limit config (#6717)
Also adds per-world spawn limit config in paper.yml for `underground_water_creature`, and migrates existing spawn limit config options to their Mojang names.
2021-11-08 23:59:15 -08:00
Jake Potrebic
5af80b0ab8
Add isCollidable methods to various places (#6870) 2021-11-06 12:43:24 -07:00
Jake Potrebic
22b02387c3
Add API for checking if a zombie has the option to break doors (#6855) 2021-11-05 17:17:12 -07:00
Jake Potrebic
09d50a9277
Added missing mappings (#6810) 2021-11-04 07:08:53 -07:00
Jason
d9e2817ffd
Update paperweight to 1.1.13 (#6866) 2021-11-03 17:54:11 -07:00
Jason
7a0886180f
AT & Mapping fixes (#6809) 2021-10-21 01:16:31 -07:00
Owen1212055
f47aeafe00
Add Horse Animation API (#5599) 2021-10-20 18:09:42 -07:00
BillyGalbreath
9d570042ed
Add ItemFactory#getMonsterEgg API (#6772) 2021-10-20 14:35:52 -07:00
Jake Potrebic
0a6103597b
Get entity default attributes (#6449) 2021-10-19 18:55:05 -07:00
Jake Potrebic
a55617d9ce
Fix/improve the last upstream update (#6780) 2021-10-16 19:57:05 +01:00
Jakub Žáček
b470400d5c
Add methods to find targets for lightning strikes (#6712) 2021-10-08 03:00:03 -07:00
Jake Potrebic
90f717fa5a
Add missing team sidebar display slots (#6690) 2021-10-04 10:31:26 +01:00
Jason
e39159134f
Update paperweight to 1.1.12 (#6653) 2021-10-02 18:42:30 -07:00
Jason
8a2b23a6a4
Remove method rename and fix reobf for Goal#getFlags (#6528) 2021-09-09 10:12:22 -07:00
Shane Freeder
295703efb6 Fixup enderpearl patch 2021-09-07 22:33:28 +01:00
Spottedleaf
7d10cdea03
Merge tuinity (#6413)
This PR contains all of Tuinity's patches. Very notable ones are:

- Highly optimised collisions
- Optimised entity lookups by bounding box (Mojang made regressions in 1.17, this brings it back to 1.16)
- Starlight https://github.com/PaperMC/Starlight
- Rewritten dataconverter system https://github.com/PaperMC/DataConverter
- Random block ticking optimisation (wrongly dropped from Paper 1.17)
- Chunk ticking optimisations
- Anything else I've forgotten in the 60 or so patches

If you are a previous Tuinity user, your config will not migrate. You must do it yourself. The config options have simply been moved into paper.yml, so it will be an easy migration. However, please note that the chunk loading options in tuinity.yml are NOT compatible with the options in paper.yml. 

* Port tuinity, initial patchset

* Update gradle to 7.2

jmp said it fixes rebuildpatches not working for me. it fucking better

* Completely clean apply

* Remove tuinity config, add per player api patch

* Remove paper reobf mappings patch

* Properly update gradlew

* Force clean rebuild

* Mark fixups

Comments and ATs still need to be done

* grep -r "Tuinity"

* Fixup

* Ensure gameprofile lastaccess is written only under the state lock

* update URL for dataconverter

* Only clean rebuild tuinity patches

might fix merge conflicts

* Use UTF-8 for gradlew

* Clean rb patches again

* Convert block ids used as item ids

Neither the converters of pre 1.13 nor DFU handled these cases,
as by the time they were written the game at the time didn't
consider these ids valid - they would be air. Because of this,
some worlds have logspam since only DataConverter (not DFU or
legacy converters) will warn when an invalid id has been
seen.

While quite a few do need to now be considered as air, quite a lot
do not. So it makes sense to add conversion for these items, instead
of simply suppressing or ignoring the logs. I've now added id -> string conversion
for all block ids that could be used as items that existed in the game
before 1.7.10 (I have no interest in tracking down the
exact version block ids stopped working) that were on
https://minecraft-ids.grahamedgecombe.com/

Items that did not directly convert to new items will
be instead converted to air: stems, wheat crops, piston head,
tripwire wire block

* Fix LightPopulated parsing in V1466

The DFU code was checking if the number existed, not if it
didn't exist. I misread the original code.

* Always parse protochunk light sources unless it is marked as non-lit

Chunks not marked as lit will always go through the light engine,
so they should always have their block sources parsed.

* Update custom names to JSON for players

Missed this fix from CB, as it was inside
the DataFixers class.

I decided to double check all of the CB changes again:

DataFixers.java was the only area I missed, as I had inspected all
datafixer diffs and implemented them all into DataConverter. I also
checked Bootstrap.java again, and re-evaluated their changes. I had
previously done this, but determined that they were all bad.

The changes to make standing_sign block map to oak_sign block in
V1450 is bad, because that's not the item id V1450 accepts. Only
in 1.14 did oak_sign even exist, and as expected there is a converter
to rename all existing sign items/blocks.

The fix to register the portal block under id 1440 is useless, as
the flattenning logic will default to the lowest registered id - which
is the exact blockstate that CB registers into 1440. So it just
doesn't do anything.

The extra item ids in the id -> string converter are already added,
but I found this from EMC originally.

The change for the spawn egg id 23 -> Arrow is just wrong,
that id DOES correspond to TippedArrow, NOT Arrow. As
expected, the spawn egg already has a dedicated mapping for
Arrow, which is id 10 - which was Arrow's entity id.

I also ported a fix for the cooked_fished id update. This doesn't
really matter since there is already a dataconverter to fix this,
but the game didn't accept cooked_fished at the time. So I see
no harm.

* Review all converters and walkers

- Refactor V99 to have helper methods for defining entity/tile
  entity types
- Automatically namespace all ids that should be namespaced.
  While vanilla never saved non-namespaced data for things that
  are namespaced, plugins/users might have.
- Synchronised the identity ensure map in HelperBlockFlatteningV1450
- Code style consistency
- Add missing log warning in V102 for ITEM_NAME type conversion
- Use getBoolean instead of getByte
- Use ConverterAbstractEntityRename for V143 TippedArrow -> Arrow
  rename, as it will affect ENTITY_NAME type
- Always set isVillager to false in V502 for Zombie
- Register V808's converter under subversion 1 like DFU
- Register a breakpoint for V1.17.1. In the future, all final
  versions of major releases will have a breakpoint so that
  the work required to determine if a converter needs a breakpoint
  is minimal
- Validate that a dataconverter is only registered for a version
  that is registered
- ConverterFlattenTileEntity is actually ConverterFlattenEntity
  It even registered the converters under TILE_ENTITY, instead of
  ENTITY.
- Fix id comparison in V1492 STRUCTURE_FEATURE renamer
- Use ConverterAbstractStatsRename for V1510 stats renamer
  At the time I had written that class, the abstract renamer didn't
  exist.
- Ensure OwnerUUID is at least set to empty string in
  V1904 if the ocelot is converted to a cat (this is
  likely so that it retains a collar)
- Use generic read/write for Records in V1946
  Records is actually a list, not a map. So reading map was
  invalid.

* Always set light to zero when propagating decrease

This fixes an almost infinite loop where light values
would be spam queued on a very small subset on blocks.

This also likely fixes the memory issues people were
seeing.

* re-organize patches

* Apply and fix conflicts

* Revert some patches

getChunkAt retains chunks so that plugins don't spam loads
revert mc-4 fix will remain unless issues pop up

* Shuffle iterated chunks if per player is not enabled

Can help with some mob spawning stacking up at locations

* Make per player default, migrate all configs

* Adjust comments in fixups

* Rework config for player chunk loader

Old config is not compatible. Move all configs to be
under `settings` in paper.yml

The player chunk loader has been modified to
less aggressively load chunks, but to send
chunks at higher rates compared to tuinity. There are
new config entries to tune this behavior.

* Add back old constructor to CompressionEncoder/Decoder (fixes
 Tuinity #358)

* Raise chunk loading default limits

* Reduce worldgen thread workers for lower core count cpus

* Raise limits for chunk loading config

Also place it under `chunk-loading`

* Disable max chunk send rate by default

* Fix conflicts and rebuild patches

* Drop default send rate again

Appears to be still causing problems for no known reason

* Raise chunk send limits to 100 per player

While a low limit fixes ping issues for some people, most people
do not suffer from this issue and thus should not suffer from
an extremely slow load-in rate.

* Rebase part 1

Autosquash the fixups

* Move not implemented up

* Fixup mc-dev fixes

Missed this one

* Rebase per player viewdistance api into the original api patch

* Remove old light engine patch part 1

The prioritisation must be kept from it, so that part
has been rebased into the priority patch.
Part 2 will deal with rebasing all of the patches _after_

* Rebase remaining patches for old light patch removal

* Remove other mid tick patch

* Remove Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch

Replaced by `Do not copy visible chunks`

* Revert AT for Vec3i setX/Y/Z

The class is immutable. set should not be exposed

* Remove old IntegerUtil class

* Replace old CraftChunk#getEntities patch

* Remove import for SWMRNibbleArray in ChunkAccess

* Finished merge checklist

* Remove ensureTickThread impl in urgency patch

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-31 04:02:11 -07:00
Jason
3773df24ce
Vanilla command permission fixes (fixes #6085) (#6490)
Fixes permission checks for vanilla commands which don't have a
requirement, as well as for namespaced vanilla commands.
2021-08-25 15:20:24 -07:00
Jake Potrebic
c2f47a76ae
Implement Translatable in appropriate places (#6248) 2021-08-13 21:11:12 -07:00
Jason
399710ff79
Add reobf mappings patch for MinecraftServer#getLootTables (#6368) 2021-08-09 17:05:12 -07:00
Jake Potrebic
9b828509cd
Updated Upstream (CraftBukkit) (#6260) 2021-07-24 03:33:05 +01:00
Jake Potrebic
2961b2adab
Fix various mob drops being captured as death drops (#5675) 2021-07-22 02:58:24 +00:00
Nassim Jahnke
2780e94901
Fix PaperTickList (#6241)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-07-21 19:12:24 +02:00
Jake Potrebic
70ea1b2e2b
Fix command signs (#6139) 2021-07-11 18:06:49 +00:00
KennyTV
dafc06460e Fix MobEffectArgument#getEffect reobf 2021-07-07 15:54:43 +02:00
Nassim Jahnke
56fd1a2f84
Update to Minecraft 1.17.1 (#6097) 2021-07-07 06:52:40 +00:00
Jason
cc063e1f09
Fix incorrect variable usage in per-player mob spawning patch (#6077) 2021-07-04 17:30:59 +01:00
Jason
02fbcbcc0d
Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079) 2021-07-04 03:19:48 -07:00
Shane Freeder
fc4be62055
[ci skip] revert dev-imports derp 2021-06-30 22:29:54 +01:00
Shane Freeder
3ddc424b89
Backport MC-229191 ore distribution changes 2021-06-30 22:11:40 +01:00
Jason
31d8fd53aa
Add reobf mappings patch for LevelStorageSource$LevelStorageAccess#getDataTag (#6043) 2021-06-29 16:56:26 -07:00
Jake Potrebic
e895403a10
Improve horrible CraftChunk#getEntities performance (#5999)
Thanks Spigot, very cool.
2021-06-28 12:53:28 +00:00
Jason
a7cddc4153
Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965) 2021-06-22 22:45:45 -07:00
Jake Potrebic
28aacb44dd
Fix NPE when setting cook multiplier (#5956) 2021-06-22 19:26:03 +00:00
Owen1212055
aed4433aca
Add more fox API (#5743) 2021-06-22 07:44:02 +00:00
Kyle Wood
e31ad11127
Update paperweight to 1.1.6 2021-06-20 16:22:20 -05:00
MiniDigger
ed5100faf1 add some more reobf mappings to fix tardis and terraform 2021-06-20 11:50:36 +02:00
Kyle Wood
558be4bbc5
Add comment describing why reobf patch exists 2021-06-20 03:19:51 -05:00
Kyle Wood
ea0336dff5
Bump paperweight to 1.1.5 with support for patching reobf mappings 2021-06-20 02:47:14 -05:00
Kyle Wood
72955ad6c3
Merge library and mcdev imports files, bump paperweight 2021-06-20 01:59:07 -05:00
Jake Potrebic
c9cdc05ff1
remove more obfhelpers 2021-06-17 15:47:52 -07:00
MiniDigger
13e04200c7 death to more obfhelpers 2021-06-17 22:20:03 +02:00
Jake Potrebic
d04c22dddf
missing ats and mappings 2021-06-17 10:47:34 -07:00
Jason Penilla
691cdf6f9e
Update incremental chunk saving 2021-06-17 01:37:27 -07:00
Kyle Wood
f87d5ab52b
Bump paperweight to 1.1.0
This paperweight update uses Hypo to cleanup and fix reobf mappings
based on the completed jar, which removes a lot of issues we were
previously having around weird CraftBukkit edge cases and synthetic
issues (as always). It's not yet perfect (PaperMC/paperweight#18) but
it's much better than it was.
2021-06-17 01:51:18 -05:00
Kyle Wood
b9402f84a9
Minor patch cleanup 2021-06-16 20:43:30 -05:00
Jake Potrebic
cd8f24d472
remove some more obf helpers 2021-06-16 14:22:39 -07:00
KennyTV
9e1255cff9
Port chunk priority urgency patch 2021-06-16 12:32:08 +02:00
Jake Potrebic
6f064f928e
add more patches back 2021-06-15 21:53:50 -07:00
MiniDigger
f79ab295a5 one missed AT 2021-06-16 00:59:41 +02:00
MiniDigger
3fb6b93f96 AT bullshit 2021-06-16 00:24:12 +02:00
MiniDigger
90546c7c50 start adding in ATs 2021-06-15 21:44:37 +02:00
Kyle Wood
bbb8816211
Update to paperweight 1.0.0, with automatic library imports 2021-06-15 00:56:07 -05:00
Kyle Wood
da99f8648f
Fix mappings patches for Hopper getLevel issue 2021-06-14 23:39:41 -05:00
Jason Penilla
7929fdabaf
update mappings files 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
Jake Potrebic
09ead8b043 more patches 2021-06-14 23:42:23 +02:00
MiniDigger
23a9df76fd add access transforming capabilities 2021-06-14 22:15:38 +02: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
a968aefd32 more patches 2021-06-12 23:32:23 +02:00
MiniDigger
4e99c4e598 add mcdev imports file 2021-06-12 11:23:51 +02:00
MiniDigger
864ef24fc0 fix profile cache mappings
let me be OP god dammit!
2021-06-12 09:30:37 +02:00
MiniDigger
a22a0e56ef few fixes to make it actually run 2021-06-12 02:22:53 +02:00
Kyle Wood
7ea73d48d4
fix: Update paperweight mcdev and fix CraftBukkit patch 2021-06-11 15:18:19 -05:00
Mariell Hoversholm
eccd156d12
fix: map parent method where CB does not
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 21:08:51 +02:00
Mariell Hoversholm
1eedd5991a
Remap POM changes patch
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:31:17 +02:00
Kyle Wood
604ebc2cac
Update paperweight & build config for Spigot changes 2021-06-11 06:34:57 -05:00
MiniDigger
211b20ffa5 Did anyone say gradle? and paperweight? potentially even mojmap?! 2021-06-11 09:45:34 +02:00