Commit Graph

1574 Commits

Author SHA1 Message Date
Nassim Jahnke
d9307dad0c
Merge remote-tracking branch 'origin/master' into dev 2021-11-03 10:53:16 +01:00
RK_01
752735159c
Fixed credits screen not showing on 1.8 servers (#2724) 2021-11-02 19:01:29 +01:00
Nassim Jahnke
95493f3bbe
Minor optimization 2021-10-29 17:47:38 +02:00
Nassim Jahnke
a8c6f6b783
21w43a 2021-10-27 18:43:09 +02:00
Nassim Jahnke
516f746061
Handle barrier/light particles in entity meta 2021-10-25 09:52:54 +02:00
Nassim Jahnke
d8d65ea989
Merge remote-tracking branch 'origin/master' into dev 2021-10-23 09:58:22 +02:00
Nassim Jahnke
d80735e248
Read player digging action as var int
Does not matter for small numbers, but properly reflects Vanilla's reading/writing type
2021-10-23 09:58:11 +02:00
Redned
ff5ad2385c
Fix recipe book glitch on <1.16.2 servers (#2715) 2021-10-23 09:30:03 +02:00
Nassim Jahnke
2f28b25af3
Add block marker id to ParticleMappings 2021-10-20 18:51:53 +02:00
Nassim Jahnke
02bf9501a9
Handle item and particle meta 2021-10-20 18:48:07 +02:00
Nassim Jahnke
a6292988d5
21w42a
Screw entity meta particles
2021-10-20 17:58:50 +02:00
Nassim Jahnke
431f773b77
Merge remote-tracking branch 'origin/master' into dev 2021-10-20 13:52:34 +02:00
Nassim Jahnke
bd2bd1cf32
Cancel global entity packet if not lightning 2021-10-20 13:51:49 +02:00
Nassim Jahnke
f5d92bf74f
Merge remote-tracking branch 'origin/master' into dev 2021-10-19 09:16:06 +02:00
Nassim Jahnke
dbe8b6551a
Readd flare
Issues were addressed in 2.0.0
2021-10-19 09:10:17 +02:00
Nassim Jahnke
027e132749
Merge remote-tracking branch 'origin/master' into dev 2021-10-16 13:26:06 +02:00
Nassim Jahnke
7e3a157fcf
Revert flare usage for now
Caused some issues I have no time to investigate at the moment, but worrying enough to warrant a temporary removal
Closes ViaVersion/ViaBackwards#402
2021-10-16 13:25:56 +02:00
Nassim Jahnke
03f929163c
Merge remote-tracking branch 'origin/master' into dev 2021-10-11 21:04:29 +02:00
_tomcraft
3f229c4cb9
Minor improvements (#2709) 2021-10-11 21:00:32 +02:00
Gero
b2e0fdeaf8
Don't cancel chunks with missing light data (#2711) 2021-10-09 14:08:07 +02:00
Nassim Jahnke
0b541befbc
Merge remote-tracking branch 'origin/master' into dev 2021-10-08 17:29:16 +02:00
Nassim Jahnke
fd9346d4da
Use validated channel in getNewPluginChannelId
Fixes #2707
2021-10-08 17:29:05 +02:00
Nassim Jahnke
e744214ad6
Fix biome palette writing
Co-authored-by: Gerrygames <gecam59@gmail.com>
2021-10-08 13:17:07 +02:00
Nassim Jahnke
3feff8e751
Fix remove in ChunkLightStorage 2021-10-08 10:05:50 +02:00
Nassim Jahnke
a2acd261d8
Merge remote-tracking branch 'origin/master' into dev 2021-10-08 09:37:32 +02:00
Nassim Jahnke
36b8884d92
Fix leftover FU load factors 2021-10-08 09:37:04 +02:00
Nassim Jahnke
c15d7b8882
Don't forget id comments 2021-10-07 16:46:10 +02:00
Nassim Jahnke
9f33a09e87
21w40a 2021-10-07 16:44:43 +02:00
Nassim Jahnke
cc78180a6c
Merge remote-tracking branch 'origin/master' into dev 2021-10-07 12:27:21 +02:00
Connor Hartley
e5338688bb
Replace use of concurrenthashmap in entity tracker and block storage (#2705) 2021-10-07 12:26:14 +02:00
Nassim Jahnke
b19ec959b3
Merge remote-tracking branch 'origin/master' into dev 2021-10-05 14:21:31 +02:00
MrMicky
8b4a57985b
Remove usage of sun.misc.Unsafe in BungeeViaInjector (#2698) 2021-10-05 14:20:18 +02:00
Nassim Jahnke
1bc4fc211d
Merge remote-tracking branch 'origin/master' into dev 2021-10-03 20:15:19 +02:00
creeper123123321
0f5fa620d1
Translatable ender dragon/wither text (#2702) 2021-10-03 16:23:41 +02:00
Gero
a0f26f1ca3
Fix channel name validation in 1.13 to 1.12.2 protocol (#2701)
Closes #2187
2021-10-03 12:12:49 +02:00
MrMicky
e64a0fb62e
Prevent kick when signing empty book (#2700) 2021-10-03 10:11:34 +02:00
Nassim Jahnke
2afa3fd9de
Merge remote-tracking branch 'origin/master' into dev 2021-10-01 22:46:37 +02:00
Myles
0bcaf3e422
Merge pull request #2695 from ViaVersion/legacy-injector-cleanup
Cleanup Bukkit/Sponge injectors
2021-10-01 15:38:03 +01:00
Nassim Jahnke
6e5992c168
Add docs to abstract LegacyViaInjector methods 2021-10-01 16:33:18 +02:00
Gero
02122f8ce6 Fix #2532 2021-10-01 15:35:04 +02:00
_tomcraft
39f7f70a32
Cancel arm animation if in an open inventory for 1.16+ (#2687) 2021-10-01 12:38:49 +02:00
Nassim Jahnke
427b0a68d0
Cleanup Bukkit/Sponge injectors 2021-10-01 12:17:55 +02:00
Nassim Jahnke
763a88fe97
Merge remote-tracking branch 'origin/master' into dev 2021-09-22 11:16:35 +02:00
Nassim Jahnke
12e2be40e8
Remove some old todos, don't send empty 1.14->1.15 meta packet 2021-09-22 11:15:36 +02:00
Nassim Jahnke
22379eda6f
Add todo 2021-09-22 10:16:42 +02:00
Nassim Jahnke
4485af577d
Merge remote-tracking branch 'origin/master' into dev 2021-09-21 11:02:40 +02:00
Nassim Jahnke
0fcfd78b62
Add more user friendly 'block-versions' option 2021-09-20 15:15:25 +02:00
Nassim Jahnke
4940ed66c1
Don't warn on superfluous bytes
Should be looked into, but not now™️
2021-09-16 18:17:44 +02:00
Nassim Jahnke
73093c0ff2
Read/write palette based on block/biome size variables 2021-09-16 18:12:33 +02:00
Nassim Jahnke
c5e27b89af
Don't read remaining bytes in 1.18 chunk type 2021-09-16 17:01:58 +02:00
Nassim Jahnke
5a90c8374c
Fix named sound packets and old block entities 2021-09-16 15:41:14 +02:00
Nassim Jahnke
9ffa737a4d
Implement BlockEntity sectionX/Z methods 2021-09-16 14:19:45 +02:00
Nassim Jahnke
c565f2c9c7
Cleanup Palette interface and read/write 2021-09-16 13:03:31 +02:00
Nassim Jahnke
eaa18f569a
Write linear palette as map palette for now 2021-09-16 12:17:21 +02:00
Nassim Jahnke
bfe6389377
Write biomes to palette 2021-09-16 11:35:05 +02:00
Nassim Jahnke
f72412484a
Map block entity ids, only biomes and something else left 2021-09-16 00:26:23 +02:00
Nassim Jahnke
b4301adb3b
WIP 21w37a 2021-09-15 23:00:14 +02:00
Levertion
d67269c9fe
Add support for setting a custom world name (#2672) 2021-09-15 10:52:11 +02:00
Nassim Jahnke
c264e639d6
Clear entity data on world change in world tracker 2021-09-14 17:35:27 +02:00
Nassim Jahnke
32a84f24ef
Nicer getters in Pair and Triple 2021-09-14 11:13:39 +02:00
Nassim Jahnke
f4f7215a6a
Fix disabled packet limiter check 2021-09-02 17:33:09 +02:00
Nassim Jahnke
a0b19872f8
Disable VV packet limiter on 1.17.1+ Paper 2021-09-01 15:25:24 +02:00
Nassim Jahnke
f2147179c2
Small fixes, add majorVersion method, nicer getter names in some classes
None of the deprecated methods will be removed anytime soon.
2021-08-28 22:15:28 +02:00
RK_01
e7a0b4cf04
Improve 1.8 -> 1.9 chunk translation and fix #2065 (#2669) 2021-08-28 10:02:27 +02:00
Nassim Jahnke
533572e8cd
Add CREATE_FOG BossFlag 2021-08-27 19:29:07 +02:00
creeper123123321
257eea5b04
try to fix GoLilyPad servers (#2667)
Closes ViaVersion/ViaFabric#21
2021-08-25 14:55:43 +02:00
kennytv
7ffcff7a7b
Fix 1.15->1.16 wolf anger 2021-08-14 10:37:21 +02:00
kennytv
9ee548b967
Fix 1.17 clients writing empty books
Fixes #2658
2021-08-11 15:11:56 +02:00
kennytv
2094397bca
Allow bypassing of packet type restriction in Protocol, amend packet creator 2021-08-01 12:05:04 +02:00
kennytv
b81109f512
Semi force packet types in PacketWrapper at creation and transformation 2021-07-31 15:08:45 +02:00
kennytv
874dbafe26
More packet sending API
Allows for easy packet sending from a specific version to or from any client version supported by Via.
For example, you can send packets in the 1.17.1 format to both client and server, and it will be transformed accordingly if executed on another server version or sent to a different client version.
2021-07-30 12:26:15 +02:00
kennytv
46ca469a4a
Add author tag to constructed book nbt
Fixes #2640
2021-07-27 11:58:24 +02:00
creeper123123321
9874a9053a
it's 2021 and we should use UTF 8 (#2633) 2021-07-23 21:31:25 +02:00
kennytv
db87774426
Fix ProtocolSupport compat on 1.17
Fixes #2632

Thank you md_5, very cool
2021-07-23 10:15:59 +02:00
KennyTV
b4f8024eef
Fix 1.15->1.16 and 1.16.1->1.16.2 dropped items
Fixes #2610
2021-07-07 10:06:15 +02:00
KennyTV
4f7e655613
1.17.1-rc1 2021-07-01 19:58:34 +02:00
KennyTV
c2172821fd
Merge remote-tracking branch 'origin/master' into dev 2021-06-29 18:12:36 +02:00
KennyTV
24393d4ef4
1.17.1-pre2 2021-06-29 18:11:51 +02:00
KennyTV
622ea91648
Ignore bad 1.8 wither meta
Fixes #2570
2021-06-22 11:28:09 +02:00
KennyTV
aed1a63a77
Merge remote-tracking branch 'origin/master' into dev 2021-06-21 14:58:38 +02:00
LemonCaramel
14cd568e46
Add Resource pack prompt message option (1.17+) (#2544) 2021-06-21 14:55:49 +02:00
KennyTV
44d836e2e7
Clear entity trackers on server switch
Fixes #5930
2021-06-21 14:33:23 +02:00
_tomcraft
f9af6947f7
Improve arm-swing cancel by resetting cursor item (#2528) 2021-06-20 22:50:37 +02:00
KennyTV
860aca974b
Read unsigned byte in set slot 2021-06-20 16:16:08 +02:00
KennyTV
6a66d7653f
Fix writable book id 2021-06-20 16:16:07 +02:00
KennyTV
d32a4541a9
1.17.1-pre1 2021-06-20 16:16:07 +02:00
KennyTV
26719169ee
Fix 1.8 special inventory tracking 2021-06-20 16:15:48 +02:00
KennyTV
eae145543e
Fix 1.8 set slot write type
Fixes #2558
2021-06-19 15:35:43 +02:00
KennyTV
48f1300908
Read set slot inv id as unsigned byte for consistency 2021-06-18 16:59:34 +02:00
KennyTV
5cdaabeaec
Handle particle id change in 1.16 metadata
Fixes #2551
2021-06-17 11:55:22 +02:00
KennyTV
7f385d4762
Create concurrent hashmap with weak values with Guava
This could use Guava's Cache, but that's just the MapMaker but more
2021-06-15 09:59:23 +02:00
KennyTV
389c5adaa3
Half revert back to storing uuids in CommonBoss
Fixes #2547
2021-06-14 22:47:13 +02:00
Jo0001
317af7ebc5
Use the correct content-type header (#2527) 2021-06-10 22:15:14 +02:00
KennyTV
206368b777
Fix 1.12->1.13 entity tracking
Fixes #2526
2021-06-10 22:10:22 +02:00
KennyTV
b940ecab9c
Fix meta warning 2021-06-10 08:42:52 +02:00
KennyTV
15cbc96697
Shorten metadata error message 2021-06-09 18:59:48 +02:00
KennyTV
593aa7564a
Put the other filled 1.17 tags into the diff file 2021-06-07 09:58:52 +02:00
KennyTV
24efb48004
Add method to load extra tags from diff files 2021-06-06 17:17:51 +02:00
KennyTV
38b3f40f7d
Add Java version warning
We will update the required Java version at some point, the only question is when.
2021-06-06 11:55:40 +02:00
KennyTV
d89f916546
Cleanup 1.17 entity rewriter, fix DataItem amount check 2021-06-06 10:08:15 +02:00
KennyTV
2b8c5082ed
Make Item an interface, more OOP for the ItemRewriter 2021-06-04 12:15:14 +02:00
KennyTV
fc1450fe38
Slightly more OOP, move registerPackets out of Protocol constructor
registerPackets being called within the constructor made it impossible to create instance objects then used in registerPackets (vs. having to then create the objects in registerPackets).
2021-06-03 17:28:02 +02:00
KennyTV
b2855c2cd4
F 2021-06-02 23:22:09 +02:00
KennyTV
fec777b349
Don't wrap direct type mappers 2021-06-02 23:22:00 +02:00
KennyTV
7b1f9c199a
Produce less overhead in packet handler registering
Instead of creating a void type reader for every single PacketHandler registered, this just directly uses the consumer-like PacketHandler.

The distinction between ValueCreator and the normal PacketHandler was unnecessary given you could also just read something in a ValueCreator instance, effectively just being a consumer of a PacketWrapper instance.
2021-06-02 22:00:20 +02:00
KennyTV
a8b3444ff5
1.17-pre4 2021-06-02 18:44:47 +02:00
KennyTV
6839334c1a
Fix confirmation id encoding, remove old send methods 2021-06-02 12:44:49 +02:00
KennyTV
d7e3aa7143
Whoops 2021-06-01 23:28:32 +02:00
KennyTV
48436e7caf
Go through the rest of the send usages 2021-06-01 23:27:33 +02:00
KennyTV
eaa58affd1
Minor changes 2021-06-01 22:52:05 +02:00
KennyTV
57cf1803f3
Fix 1.9 block entity data send 2021-06-01 19:36:25 +02:00
KennyTV
104fa4e29f
Optimize protocol path finding
Not perfect, but better. This prevents the path checks from exponentially increasing (if it weren't for the maxProtocolPathSize fail safe).

By default, a path will never go to a protocol version that puts it farther from the desired server protocol version, even if a path existed.
Otherwise as well as previously, *all* possible paths will be checked until a fitting one is found.

Negative examples if the new boolean is set to true:
    A possible path from 3 to 5 in order of 3->10->5 will be dismissed.
    A possible path from 5 to 3 in order of 5->0->3 will be dismissed.

Negative examples if set to false:
    While searching for a path from 3 to 5, 3->2->1 could be checked first before 3->4->5 is found.
    While searching for a path from 5 to 3, 5->6->7 could be checked first before 5->4->3 is found.

Assuming custom platforms like Bedrock protocol use the normal registering methods, they will have to change the boolean to false to revert to previous behavior (tho still somewhat better optimized).
2021-06-01 18:54:36 +02:00
KennyTV
37fd69fa86
Make packet send methods use the current thread by default
Defaulting to submitting to the netty event loop caused issues more often than not - this also removes the `currentThread` flag and instead provides new scheduleSend methods so it is always obvious whether the packet is sent immediately.
2021-06-01 10:13:49 +02:00
KennyTV
3fb125592b
Send entity destroy on current thread 2021-05-31 20:45:56 +02:00
KennyTV
7925fd2d8f
Fix shulker meta handling 2021-05-31 20:17:43 +02:00
KennyTV
d5cac99b5f
Reorder Type instances 2021-05-31 11:51:21 +02:00
KennyTV
3618914ce9
Add method to get Protocol by supported versions, some cleanup 2021-05-29 22:21:29 +02:00
KennyTV
ff140c421a
Add/change comments 2021-05-29 11:50:07 +02:00
RK_01
016b8f1dbc
Correct ClientboundPackets1_9_3 packetid comments (#2503) 2021-05-29 09:34:24 +02:00
KennyTV
0d31054903
Fix view distance update packet in 1.13->1.14
The client world is initialized during the join packet, but the view distance packet was created during/before the join handling.
Fixes #2502
2021-05-28 10:02:26 +02:00
RK_01
4ef862e06d
Correct packet id comment (#2501) 2021-05-27 15:42:51 +02:00
KennyTV
53642e9a3c
1.17-pre1 2021-05-27 15:36:53 +02:00
KennyTV
fd9dab8aa1
Replace inventory ack by using 1.17 ping packets 2021-05-26 21:36:20 +02:00
KennyTV
703978e227
Don't require UserConnection holding class in stored objects 2021-05-26 21:35:28 +02:00
KennyTV
2d0a597f74
Make Metadata fully type safe, remove "Discontinued" meta types
The Discontinued entry was a special edge case that could lead to a Metadata type returning null. Instead, just directly use null in the 1.8->1.9 code where it is checked against. Also renamed the Meta1_17Types entries to be in uppercase and properly represent their value type.
2021-05-26 16:36:47 +02:00
KennyTV
bc89f57088
Slightly improve metadata iteration, remove redundant MetaHandlerEvent index
Lazily create the event if needed and share it with other filters when handling a metadata entry. Lastly, only add the additionally created meta once after the filter list, not once per filter.
2021-05-26 09:00:49 +02:00
KennyTV
57769c5671
Make metadata (almost) fail-safe
This could mean life and death, see
`new Metadata(17, MetaType1_14.Float, event.meta()).value()`
vs.
`new Metadata(17, MetaType1_14.Float, event.meta().value())`
2021-05-25 16:27:55 +02:00
LemonCaramel
a6b4b16fd3
Add Missing Translation Mapping (#2484) 2021-05-25 16:27:19 +02:00
KennyTV
3a1e364d4a
Refactor entity tracking and meta handling
This essentially merges the two approaches to the metadata handling from ViaVersion and ViaBackwards and improves on both designs.

ViaVersion did not track every single entity, but only those needed (at least in theory) and can work with untracked entities' metadata. It had a very simple method overridden by metadata rewriter implementations, directly operating on the full metadata list and manually handling meta index changes as well as item/block/particle id changes.

ViaBackwards on the other hand had to track *every single* entity and threw warnings otherwise - while less prone to errors due to giving obvious warnings in the console, it unnecessarily tracks a lot of entities, and those warnings also annoys users when encountering virtual entity plugins (operating asynchronously and sending update packets while already untracked or not yet tracked). Dedicated MetaHandlers made id changes and filtering a lot easier to read and write. However, the actual metadata list handling and its distribution to handlers was not very well implemented and required a lot of list copying and creation as well as exception throws to cancel individual metadata entries.

This version has MetaFilters built with a Builder containing multiple helper functions, and the entity tracking is properly given its own map, hashed by a Protocol's class, to be easily and generically accessible from anywhere with only a Protocol class from the UserConnection, along with more optimized metadata list iteration. The entity tracking is largely unchanged, keeping ViaVersion's approach to not having to track *all* entities (and being able to handle null types in meta handlers).

All of this is by no means absolutely perfect, but is much less prone to errors than both previous systems and takes a lot less effort to actually write. A last possible change would be to use a primitive int to object map that is built to be concurrency save for the EntityTracker, tho that would have to be chosen carefully.
2021-05-25 15:37:07 +02:00
KennyTV
2d2a5fa79c
Fill "needs tool" tags
Fixes #2493
2021-05-24 09:21:32 +02:00
RK_01
605331963d
Fix typo in DumpSubCmd (#2492) 2021-05-23 19:42:01 +02:00
KennyTV
ab1cc791b7
Fix enchantment parsing or lvl integers 2021-05-21 09:17:40 +02:00
KennyTV
cf2adab728
Make ChunkSection an interface, don't allocate light arrays if not needed 2021-05-20 18:32:28 +02:00
KennyTV
04fedd2892
Add comments 2021-05-20 16:56:39 +02:00
KennyTV
c172091944
21w20a 2021-05-19 18:54:38 +02:00
KennyTV
5fa2c788e0
Add missing mineable tag entries
Fixes #2481
2021-05-18 17:07:57 +02:00
KennyTV
01d79e2681
Fix non-full chunk sending to 1.17 clients 2021-05-17 17:31:42 +02:00
KennyTV
576682ef9f
Handle invalid uuid int array
Closes #2475
2021-05-15 16:42:38 +02:00
KennyTV
4f9f3254be
Fix PS compatibility on Java 16 2021-05-15 09:28:18 +02:00
KennyTV
1538ff5201
Expand unsupported software checks 2021-05-14 16:59:12 +02:00
creeper123123321
f17fb833a0
add internal getInputBuffer() (#2472) 2021-05-14 11:19:02 +02:00
KennyTV
84c064fc11
Fix legacy hover deserialization, add snapshot suffix to version 2021-05-14 10:59:43 +02:00
KennyTV
2588c6ecc8
21w19a (probably) 2021-05-12 15:19:33 +02:00
KennyTV
2df57bc37c
Fix 1.14->1.15 meta ordering issue
Closes #2467
2021-05-10 13:27:12 +02:00
KennyTV
cb7a7254a6
Make UnsupportedSoftware hold a list of class names 2021-05-08 10:05:43 +02:00
KennyTV
af0cf1d3f2
Rename PacketType methods
Just in case a packet with some magic id is going to be added, since the enum ordinal and name methods cannot be overridden
2021-05-02 11:14:38 +02:00
KennyTV
d183d76c47
Remove platform bulk chunk transformers 2021-05-02 10:12:37 +02:00
KennyTV
44e928d53c
Update copyright scopes 2021-04-30 19:05:07 +02:00
KennyTV
ab93e0877c
Rename platform task implementations 2021-04-29 17:46:29 +02:00
KennyTV
96b5051c75
Use primitive long in task methods 2021-04-29 17:31:16 +02:00