13
0
geforkt von Mirrors/Paper
Commit graph

83 Commits

Autor SHA1 Nachricht Datum
Nassim Jahnke
b6be217e03 More more more more more more more more more more more more more work 2021-11-24 16:07:19 +01:00
Kyle Wood
52a49941da Verify and fix build-data adjustments for 1.18 reobf 2021-11-24 03:25:37 -06:00
Jake Potrebic
cc3b3eba50 a bunch more patches 2021-11-23 21:44:21 -08:00
Jason Penilla
2b25404eca Patches 2021-11-23 19:42:31 -08:00
Jake Potrebic
2b17f5cc15 and some more patches 2021-11-23 16:44:41 -08:00
Jason Penilla
44ee55cf7a Remove no longer needed mapping patches
Spigot uses mojang method names now
2021-11-23 15:09:11 -08:00
Jake Potrebic
ddaf1cb4e2 async chunk patch progress (#6930) 2021-11-23 12:34:20 -08:00
Nassim Jahnke
82f6e6bb0e More more more more more more work 2021-11-23 16:04:41 +01:00
Nassim Jahnke
d8709b6bf1 More more more more more work 2021-11-23 15:03:50 +01:00
Nassim Jahnke
91fcee0c04 More more more more work 2021-11-23 14:22:49 +01:00
Nassim Jahnke
979f2cdf25 More more more work 2021-11-23 13:15:10 +01:00
Jason Penilla
ed6d43ddb0 Prepare for updating server patches 2021-11-23 00:57:41 -08:00
Jason Penilla
fc721e4d3a comment out mappings and remove no longer needed patch 2021-11-21 21:39:19 -08:00
Jason Penilla
a9214f2d63 Update paperweight to 1.2.0 (#6901) 2021-11-16 21:00:14 -08:00
Jake Potrebic
023b612f62 cleanup: Add hand to bucket events patch (#6881) 2021-11-15 11:01:19 -08:00
Jake Potrebic
986f5e5d12 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
0f52610a18 Add isCollidable methods to various places (#6870) 2021-11-06 12:43:24 -07:00
Jake Potrebic
6197315429 Add API for checking if a zombie has the option to break doors (#6855) 2021-11-05 17:17:12 -07:00
Jake Potrebic
546ba82ea7 Added missing mappings (#6810) 2021-11-04 07:08:53 -07:00
Jason Penilla
ed5400a823 Update paperweight to 1.1.13 (#6866) 2021-11-03 17:54:11 -07:00
Jason Penilla
8723ed4810 AT & Mapping fixes (#6809) 2021-10-21 03:16:31 -05:00
Owen1212055
c033fef26d Add Horse Animation API (#5599) 2021-10-20 21:09:42 -04:00
BillyGalbreath
03f31b993b Add ItemFactory#getMonsterEgg API (#6772) 2021-10-20 14:35:52 -07:00
Jake Potrebic
637b466c2d Get entity default attributes (#6449) 2021-10-19 18:55:05 -07:00
Jake Potrebic
2943a22d37 Fix/improve the last upstream update (#6780) 2021-10-16 11:57:05 -07:00
Jakub Žáček
2708960eba Add methods to find targets for lightning strikes (#6712) 2021-10-08 12:00:03 +02:00
Jake Potrebic
3680f9addc Add missing team sidebar display slots (#6690) 2021-10-04 02:31:26 -07:00
Jason Penilla
a91e5803cd Update paperweight to 1.1.12 (#6653) 2021-10-02 20:42:30 -05:00
Jason Penilla
d3dab2f22c Remove method rename and fix reobf for Goal#getFlags (#6528) 2021-09-09 12:12:22 -05:00
Shane Freeder
92c68e2367 Fixup enderpearl patch 2021-09-07 22:33:28 +01:00
Spottedleaf
bc2890b955 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 Penilla
7a51a16318 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 17:20:24 -05:00
Jake Potrebic
112c19b45e Implement Translatable in appropriate places (#6248) 2021-08-13 21:11:12 -07:00
Jason Penilla
5ba8143d59 Add reobf mappings patch for MinecraftServer#getLootTables (#6368) 2021-08-09 17:05:12 -07:00
Jake Potrebic
7b87553d96 Updated Upstream (CraftBukkit) (#6260) 2021-07-23 19:33:05 -07:00
Jake Potrebic
012cb6b015 Fix various mob drops being captured as death drops (#5675) 2021-07-21 19:58:24 -07:00
Nassim Jahnke
985e42705e Fix PaperTickList (#6241)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-07-21 19:12:24 +02:00
Jake Potrebic
67e2594825 Fix command signs (#6139) 2021-07-11 11:06:49 -07:00
Nassim Jahnke
823ad58768 Fix MobEffectArgument#getEffect reobf 2021-07-07 15:42:08 +02:00
Nassim Jahnke
7037cd401f Update to Minecraft 1.17.1 (#6097) 2021-07-07 08:52:40 +02:00
Jason Penilla
cad0a49123 Fix incorrect variable usage in per-player mob spawning patch (#6077) 2021-07-04 09:30:59 -07:00
Jason Penilla
acf72e1186 Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079) 2021-07-04 03:19:48 -07:00
Shane Freeder
aa1d49efd6 [ci skip] revert dev-imports derp 2021-06-30 22:29:54 +01:00
Shane Freeder
0641643c4a Backport MC-229191 ore distribution changes 2021-06-30 22:11:40 +01:00
Jason Penilla
c8203638a0 Add reobf mappings patch for LevelStorageSource$LevelStorageAccess#getDataTag (#6043) 2021-06-29 16:56:26 -07:00
Jake Potrebic
cecb38e6ed Improve horrible CraftChunk#getEntities performance (#5999)
Thanks Spigot, very cool.
2021-06-28 05:53:28 -07:00
Jason Penilla
5298e2045a Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965) 2021-06-22 22:45:45 -07:00
Jake Potrebic
7c2140bc63 Fix NPE when setting cook multiplier (#5956) 2021-06-22 12:26:03 -07:00
Owen1212055
4a7d7decce Add more fox API (#5743) 2021-06-22 03:44:02 -04:00
Kyle Wood
2107b78f00 Update paperweight to 1.1.6 2021-06-20 16:22:20 -05:00