Commit Graph

244 Commits

Author SHA1 Message Date
KennyTV
204a81b0ea
Add 1.17 to legacy api package ProtocolVersion 2021-06-10 10:50:07 +02:00
KennyTV
48436e7caf
Go through the rest of the send usages 2021-06-01 23:27:33 +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
703978e227
Don't require UserConnection holding class in stored objects 2021-05-26 21:35:28 +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
Juan Cruz Linsalata
096415cf8e
Don't inject if inactive (#2461) 2021-05-02 15:52: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
KennyTV
cad358322d
Rename outgoing->clientbound, incoming->serverbound
Via can both be used on servers and clients, making a direction like "incoming" ambiguous
2021-04-28 16:30:34 +02:00
KennyTV
a2b3906c9e
Move bossbar to new legacy package, since it only works on <1.9
The newly created LegacyViaAPI is safe to use, but should hold methods that cannot be universally used on every version
2021-04-28 11:10:16 +02:00
KennyTV
cadb5ec64c
Rename abstract Protocol to AbstractProtocol
This prevents confusion around the previously equally named interface and abstract class
2021-04-27 18:21:51 +02:00
KennyTV
f1c8d271b1
Reformat imports
The package rename wasn't done through refactoring but through simple replaces to not make git choke on diffs
2021-04-27 13:42:36 +02:00
KennyTV
318c49cf30
More interfaces, keep ProtocolRegistry.SERVER_PROTOCOL legacy api 2021-04-27 13:25:18 +02:00
KennyTV
d4bc31d11e
Always create ProtocolInfo, store mappings as int[] 2021-04-27 10:29:30 +02:00
KennyTV
30d122e7fa
Create some fancy interfaces 2021-04-26 23:01:55 +02:00
KennyTV
49d386063d
Add ProtocolVersion to legacy api 2021-04-26 21:45:27 +02:00
KennyTV
deec4b521e
Move some packages and classes around 2021-04-26 21:27:59 +02:00
KennyTV
a25a5634de
Change package/imports in classes and build configs 2021-04-26 20:52:34 +02:00
KennyTV
a3b1ce817e
Repackage to com.viaversion
This process will be split into multiple commits for git not to choke on.
2021-04-26 20:46:30 +02:00
Juan Cruz Linsalata
f18e2b3875
Cancel Bungee packet encoding when closed (#2448) 2021-04-24 18:30:08 +02:00
KennyTV
d40ce9fc4a
Minor optimizations in pipeline filling 2021-04-21 11:58:19 +02:00
Mariell Hoversholm
2c884dc241
Feat (Bungee): Use only unsafe field modifications (#2440) 2021-04-17 09:59:24 +02:00
KennyTV
d0882cf02c
Update GsonUtil, more javadoc 2021-04-16 23:05:31 +02:00
Mariell Hoversholm
458279d111
Fix (Bungee): Java 16 compatibility (#2433)
This has been tested on the following:
 - AdoptOpenJDK Java 1.8.0_282
 - GraalVM CE 21.0.0 OpenJDK 11.0.10
 - AdoptOpenJDK Java 15.0.2
 - AdoptOpenJDK Java 16 (also tested with BungeeCord b1556)
 - Amazon Corretto OpenJDK 16.0.0.36.1

... with Waterfall b406 on Linux 5.10.28.
2021-04-13 11:42:32 +02:00
KennyTV
7300a69817
Use Paper method to get server protocol version if possible 2021-04-12 20:11:13 +02:00
KennyTV
070c7f5808
Move to checker qual nullability annotations 2021-04-02 14:15:30 +02:00
KennyTV
a63f2ab6fe
Improve server version API 2021-03-26 12:51:38 +01:00
KennyTV
d918fd27b6
Reduce boxing in protocol path getting
More of its implementation should probably be cleaned up later
2021-03-25 22:34:30 +01:00
KennyTV
63356207a3
ProtocolRegistry -> ProtocolManager interface 2021-03-24 15:30:03 +01:00
KennyTV
0ab2c626aa
Split parts of common into api; We are now GPL, api is MIT
This does not affect any previous states of this project; only future modifications as well as the project as a whole will be under the GNU General Public License from now on. The newly introduced api directory, partly split from common, is an exception to this, still being licensed under the MIT license.

See the README for details.
2021-03-24 14:02:37 +01:00
KennyTV
c0dabfe097
*cries in elephant* 2021-02-25 09:18:51 +01:00
KennyTV
4cc8a3f092
Return -1 in getPlayerVersion if the player is not connected 2021-01-17 13:59:26 +01:00
terrarier2111
6a12f8139c
Added missing import 2020-11-21 19:26:10 +01:00
terrarier2111
0b256d15b2
Created a local variable for ProxiedPlayers 2020-11-15 21:15:42 +01:00
creeper123123321
4813cc3077
inject into velocity backend (currently broken)
Add client-side mode for UserConnection

remove unused code

fix duplicate method on rebase
2020-10-28 19:51:01 +01:00
KennyTV
7d96efc645
Minor ProtocolVersion refactor 2020-10-16 18:21:45 +02:00
KennyTV
0015682fe4
Add warning on startup for 1.8 users 2020-10-12 09:51:33 +02:00
terrarier2111
9a6b0664e3
Update BungeePlugin.java (#2080) 2020-09-12 17:43:09 +02:00
KennyTV
3ba2191829
Fix late Bungee connection cancelling 2020-06-30 13:51:06 +02:00
KennyTV
029f399a14
Rename ViaCodecException to CancelCodecException 2020-06-10 08:58:40 +02:00
KennyTV
7588609c56
Fix cancelexception printing 2020-06-09 21:29:19 +02:00
KennyTV
aa59ed112a
Fixup docs, remove ConcurrentList 2020-06-09 17:53:31 +02:00
KennyTV
529da10615
Move ProtocolInfo into its own field 2020-06-07 12:19:36 +02:00
creeper123123321
a8a1e9448e
Netty handler tidy 2020-06-07 10:41:29 +02:00
Myles
a60340f330 Workaround for missing Protocol1_9to1_8 2020-05-30 21:31:28 +01:00
KennyTV
762c66ff42
Farewell, lombok! 2020-04-23 21:07:12 +02:00
KennyTV
53b8c2328e
Uncache UserConnection on channel close, fix memory leak 2020-04-23 20:24:16 +02:00
Myles
f82b52b017 Fix disconnect / sendMessage on Bungee 2020-04-20 09:56:34 +01:00
creeper123123321
dd5cbb0e4c Merge branch 'abstraction' of https://github.com/ViaVersion/ViaVersion into portedplayerschange 2020-04-15 11:39:13 -03:00
creeper123123321
17881b342a javadoc, remove ViaAPIs getPortedPlayers, fix ViaManager.getPortedPlayers name, rename to ViaAPI#isInjected 2020-04-15 11:35:09 -03:00
KennyTV
8f08a32c5a
Bai bai to more lombok usage once more 2020-04-13 20:58:24 +02:00
creeper123123321
ee7eaecdb3 move field 2020-04-13 08:51:04 -03:00
creeper123123321
a105c5cb11 Make getPortedPlayers() private, update bungee-api, remove some lombok usage, create ViaConnectionManager 2020-04-12 16:47:32 -03:00
creeper123123321
ca78bf9851 Remove portedPlayers field, let platform handle players 2020-04-12 15:37:08 -03:00
KennyTV
081781f223 Some cleanup 2020-04-03 19:32:31 +02:00
KennyTV
e658304405 Asynchronously load mappings (until needed), create optional mappings cache for VB 2020-04-03 19:32:30 +02:00
KennyTV
dd73ba4f72 Remove some lombok usage from the api package 2020-03-10 13:22:22 +01:00
KennyTV
b06b9c69ca Do not unnecessarily register tasks/listeners 2020-01-22 14:14:43 +01:00
Myles
cd2ca76236 Merge branch 'master' into abstraction 2020-01-14 19:12:42 +00:00
Myles
9598e0e4f8 Update authors 2020-01-14 19:12:24 +00:00
KennyTV
280b6fae2a Merge master 2019-12-21 19:49:18 +01:00
KennyTV
5cb5992d44 Fix Bungee injection on Java 12+
Fixes #1512
2019-12-20 16:35:10 +01:00
KennyTV
21cad97f3f Some fixes, move blockconnection method to bukkit config 2019-11-25 18:34:55 +01:00
KennyTV
907516eb71 Hold config values in fields 2019-11-22 22:00:41 +01:00
KennyTV
a9c49d948a Merge remote-tracking branch 'upstream/master' into dev
# Conflicts:
#	bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java
#	bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java
#	common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java
#	common/src/main/resources/assets/viaversion/config.yml
#	sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
#	velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
2019-10-02 16:21:37 +02:00
Lukas
7e008226ec Fix 1.14+ walk animation (#1469)
* Do not send NaN health metadata to 1.14+ clients
* Added config option 'fix-1_14-health-nan'
2019-10-01 09:04:58 +01:00
Nassim
9408946b36 Merge master into abstraction (#1457) 2019-09-19 10:22:06 +01:00
bundabrg
c7050565b8 If Bungeecord ServerConnectEvent is cancelled then ignore the event (#1450) 2019-09-11 13:51:00 +01:00
Nassim
5eb3771704 Fix no light for non full blocks (#1414) 2019-09-09 13:02:30 +01:00
Gerrygames
23eadaeaee 19w36a (#1435) 2019-09-04 16:49:27 +01:00
KennyTV
c4b23b8c87 Merge remote-tracking branch 'upstream/master' into abstraction 2019-08-23 21:20:13 +02:00
creeper123123321
28e8339a32 Warn about outdated BungeeCord versions (#1405) 2019-07-29 11:21:31 +01:00
KennyTV
eb9520cdc3 Reduce duplicated code in config classes 2019-05-15 12:22:56 +02:00
Gerrygames
6911d061a7 abstract EntityTracker 2019-05-08 12:14:41 +02:00
creeper123123321
87eceb5264
Use cached cancel exception when not in debug mode 2019-04-27 13:34:35 -03:00
Myles
b4418c02ca Fix Entity Tracker on Bungee being incorrect after server switch #1215 2019-04-23 21:29:51 +01:00
Myles
7b1eefb115 Avoid relocation issues on BungeeCord 2019-04-23 17:22:57 +01:00
Myles
11ce8524ac Merge with master 2019-04-23 15:40:47 +01:00
Myles
4a8534c164 Refactor class names for protocols
The inconsistency was too much for me.
2019-04-23 15:34:17 +01:00
KennyTV
e38bdffc84 Hitbox fix options 2019-04-22 14:38:22 +02:00
Myles
421a5e8141 Merge branch 'master' into dev 2019-04-06 13:31:44 +01:00
Myles
9fe19e763a Update GitHub + chat links 2019-04-06 13:31:33 +01:00
Myles
aecf9fb9b1
Merge pull request #1236 from ViaVersion/master
merge master into dev
2019-03-30 18:23:09 +00:00
creeper123123321
4e28a10aaa
ignore non-identifier format on plugin messages 2019-03-18 15:11:35 -03:00
Myles
49205f0361 Merge branch 'master' into dev 2019-03-18 11:30:19 +00:00
Myles
47819180c4 Rework previous commit + Introduce injection information to dump 2019-03-18 11:30:02 +00:00
Myles
be3fa19c0a Consistency: itruncate1_14Books -> isTruncate1_14Books 2019-03-17 16:11:36 +00:00
Myles
32a2734082 Merge branch 'master' into dev 2019-03-17 16:10:38 +00:00
creeper123123321
12b45d95e0
Trying to fix main hand on bungee, handle left handed on 1.8 using 0x80 2019-03-05 19:47:58 -03:00
Myles
ad1cd2c993
Merge pull request #1208 from KennyTV/dev
Add option to truncate edited books with more than 50 pages on 1.14
2019-03-04 09:34:41 +00:00
KennyTV
9d0331e190 Add option to truncate edited books with more than 50 pages 2019-03-04 10:14:52 +01:00
Myles
b9a2279966
Merge pull request #1206 from ViaVersion/master
merge master into dev
2019-03-03 13:29:00 +00:00
creeper123123321
f46a2bb618
Bungee auto-team, bump BungeeCord version, workaround for block connections 2019-02-24 15:02:09 -03:00
Myles
fd8879b46d Merge branch 'master' into dev 2019-02-23 22:34:16 +00:00
creeper123123321
d962ef09ff
workaround packet order for team packets 2019-02-23 13:44:41 -03:00
creeper123123321
0613886659
Fix memory leak 2019-02-23 10:12:25 -03:00
Myles
1be617c110 Merge branch 'master' into dev 2019-02-10 16:45:34 +00:00
creeper123123321
bce3593110
Tab delaying
(cherry picked from commit 386de52b9db1454e0fcec56ef9bfcd2c3a0f8d4a)
2019-02-06 18:53:24 -02:00
Myles
c5ba5b4647 Ensure pipeline parts exist before injecting #1168 2019-01-20 16:47:50 +00:00
creeper123123321
7e8bd606fe
remove commented code 2019-01-18 14:34:51 -02:00