Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-02 08:39:59 +01:00
Code Issues Projects Releases Wiki Activity
2,788 Commits 9 Branches 107 Tags 28 MiB
2588c6ecc8
Commit Graph

392 Commits

Author SHA1 Message Date
KennyTV
f9d10a9571 1.15.2 support 2020-01-21 16:05:26 +01:00
Gerrygames
4cf09f2e34 1.15-pre2 2020-01-16 15:58:35 +01:00
Myles
ab384df279 Merge branch 'master' into abstraction 2020-01-14 19:14:42 +00:00
Myles
9a0cc02b86 Merge branch 'master' into dev 2020-01-14 19:14:38 +00:00
Myles
5fb86d8df3 *sobs* 2020-01-14 19:14:18 +00:00
Myles
c64c27331a Merge branch 'master' into dev 2020-01-14 19:12:55 +00: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
Gerrygames
c704813a6c 1.15.2-pre1 2020-01-14 17:51:39 +01:00
KennyTV
5ad62a03ed Make plugin channel mappings modifiable 2020-01-05 21:21:58 +01:00
KennyTV
fddbeda81e Back to snapshot 2019-12-20 16:29:10 +01:00
KennyTV
5a1dadf476 1.15.1 2019-12-17 14:54:51 +01:00
creeper123123321
d6b52bcc54 Merge remote-tracking branch 'upstream/abstraction' into primitive_types 2019-12-12 15:23:32 -03:00
KennyTV
be4d071250 1.15.1-pre1 2019-12-12 16:32:53 +01:00
Myles
c1b11a55d5 Back to SNAPSHOT 2019-12-11 11:16:05 +00:00
Myles
a21a2079c6 2.2.1 2019-12-11 11:12:22 +00:00
Myles
68ac978d45 Back to SNAPSHOT 2019-12-10 15:34:42 +00:00
Myles
c85d4224ad 1.15 protocol + 2.2.0 2019-12-10 15:29:26 +00:00
Gerrygames
ea045e6c34 1.15-pre7 2019-12-09 13:48:06 +01:00
KennyTV
90e1d7236e 1.15-pre6 2019-12-07 10:05:29 +01:00
Gerrygames
a68fca9dda 1.15-pre5 2019-12-05 15:03:45 +01:00
Gerrygames
762151f067 1.15-rep4 2019-12-03 14:22:54 +01:00
KennyTV
5c7520f552 1.15-pre3 2019-11-28 20:10:19 +01:00
KennyTV
08e145f831 1.15-pre2 2019-11-25 19:37:02 +01:00
creeper123123321
1e8d04a07d remove deprecated methods and constructor on item and position, inline some uses of position 2019-11-24 17:55:46 -03:00
KennyTV
907516eb71 Hold config values in fields 2019-11-22 22:00:41 +01:00
creeper123123321
062d3759be Use primitive types in Position and BlockFace, remove world block connections on Sponge, clean code in 1.8 entity tracker, add constructor for cloning Item and Position 2019-11-22 15:13:41 -03:00
Gerrygames
582e4a11d4 1.15 pre1 2019-11-21 18:34:29 +01:00
creeper123123321
385a483a29 19w46b 2019-11-15 11:19:31 -03:00
Gerrygames
c3fa950a9f 19w46a 2019-11-13 17:27:51 +01:00
KennyTV
b3dc05e5ce 19w45b 2019-11-08 14:26:20 +01:00
Gerrygames
d16a760466 19w45a 2019-11-07 18:42:05 +01:00
creeper123123321
fd065fb7c5
merge dev 2019-10-30 14:24:22 -03:00
Gerrygames
12279731ad 19w44a 2019-10-30 17:14:00 +01:00
KennyTV
3257c79e69 Major version bump to 3.0.0-SNAPSHOT 2019-10-24 21:58:22 +02:00
Gerrygames
bd805bfdc4 19w42a 2019-10-16 18:07:58 +02:00
Gerrygames
3ffc55b539 19w41a 2019-10-09 18:06:37 +02: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
KennyTV
79a2304728 19w40a 2019-10-02 16:19:56 +02:00
KennyTV
42a7b5a1b2 Merge upstream/dev into abstraction 2019-10-02 09:50:51 +02:00
KennyTV
7ba2630dd2 Finish merge 2019-10-02 09:37:18 +02:00
KennyTV
bbeabd20b8 Merge remote-tracking branch 'upstream/master' into abstraction 
# 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/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
#	common/src/main/resources/assets/viaversion/config.yml
#	velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
 2019-10-02 09:31:42 +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
Gerrygames
dce64a0b34 19w39a (#1465) 2019-09-27 16:17:40 +01:00
Nassim
cad6e7604d Merge dev, update 1.15 to abstraction, reduce helper mapping (#1456) 2019-09-19 09:27:48 +01:00
Gerrygames
e452289603 19w38b, fix bell remap (#1455) 
* 19w38a, fix bell remap

* 19w38b
 2019-09-18 17:32:13 +01:00
Gerrygames
c1cce6be9a 19w37a (#1451) 
* 19w36a

* 19w37a
 2019-09-11 16:09:44 +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
ea25b559ed 19w35a (mappings for 34a still missing) 2019-08-28 19:28:23 +02:00
KennyTV
c4b23b8c87 Merge remote-tracking branch 'upstream/master' into abstraction 2019-08-23 21:20:13 +02:00
KennyTV
6f19d2d6d1 Start working on 19w34a 2019-08-23 21:15:38 +02:00
creeper123123321
aaba566b1e change version to 2.1.4-SNAPSHOT 2019-07-20 09:08:13 -03:00
KennyTV
abb09153f0 1.14.4 2019-07-18 16:40:34 +02:00
KennyTV
bc09187dc1 1.14.4-pre6 support 2019-07-15 14:58:55 +02:00
KennyTV
2024614b68 1.14.4-pre1 support 2019-07-03 19:36:30 +02:00
Myles
10984cbeb7 Merge branch 'master' into abstraction 2019-06-24 16:24:42 +01:00
Myles
bae0cd5e3e Back to snapshot 2019-06-24 16:23:35 +01:00
Myles
e4750249e9 1.14.3 support 2019-06-24 16:14:31 +01:00
Myles
c0e56c7c19 1.14.3 Pre-4 support 2019-06-19 23:11:54 +01:00
KennyTV
1c9309ac98 1.14.3 pre-3 2019-06-14 11:17:38 +02:00
KennyTV
97a8f41e12 1.14.3 pre-2 2019-06-07 12:36:37 +02:00
KennyTV
5ad9d51fb0 Set version to 2.1.2 2019-06-03 21:59:19 +02:00
KennyTV
a8d13fadb3 1.14.3 pre-1 2019-06-03 20:21:33 +02:00
Myles
744fa25349 Fix several NPE cases, apply final to relevant fields, remove unused code 
The suggested changes were found with FindBugs, some of these bugs may be rare cases.
 2019-05-27 17:50:08 +01:00
Myles
3027490256 Merge branch 'master' into abstraction 2019-05-27 17:29:04 +01:00
Myles
89dfcaf626 Back to SNAPSHOT 2019-05-27 13:37:16 +01:00
Gerrygames
e8f4f7049b 1.14.2 2019-05-27 14:23:00 +02:00
Gerrygames
eb9e48ecdc 1.14.2-pre4 2019-05-24 18:25:55 +02:00
KennyTV
b2c1c24902 1.14.2-pre3 2019-05-22 16:54:25 +02:00
KennyTV
d7aa23681b 1.14.2-pre2 2019-05-17 15:15:21 +02:00
Gerrygames
a075e31a4e 1.14.2-pre1 2019-05-16 19:21:26 +02:00
KennyTV
eb9520cdc3 Reduce duplicated code in config classes 2019-05-15 12:22:56 +02:00
KennyTV
cbb0f87676 Remove overriding properties 2019-05-15 11:59:40 +02:00
Gerrygames
f25442337d Merge remote-tracking branch 'Myles/master' into abstraction_1.14.1 2019-05-14 10:15:58 +02:00
Myles
56a34ec2f8 Update to 2.1.0 2019-05-13 13:15:14 +01:00
Gerrygames
77d572190e 1.14.1 2019-05-13 14:00:37 +02:00
Gerrygames
56b48a803a 1.14.1-pre2 2019-05-09 18:32:53 +02:00
Gerrygames
1fe3c337e1 1.14-pre2 2019-05-09 17:26:56 +02:00
Gerrygames
6911d061a7 abstract EntityTracker 2019-05-08 12:14:41 +02:00
Gerrygames
3b932bd6b3 1.14.1 pre1 2019-05-07 18:19:34 +02:00
creeper123123321
87eceb5264
Use cached cancel exception when not in debug mode 2019-04-27 13:34:35 -03:00
Myles
0be8a56ba3 Back to snapshot 2019-04-24 19:57:19 +01:00
Myles
0b4d49d760 2.0.1 2019-04-24 19:52:39 +01:00
Myles
d50ceaa172 Back to snapshot 2019-04-23 16:33:07 +01:00
Myles
34b0db57ae Get ready.... 2019-04-23 16:16:49 +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
Myles
d3662d226b Merge branch 'master' into dev 2019-04-22 18:56:29 +01:00
Myles
d699000dc3 Default to 'packet' blockconnection method 2019-04-22 18:56:05 +01:00
KennyTV
e38bdffc84 Hitbox fix options 2019-04-22 14:38:22 +02:00
Gerrygames
f64d5446a4 1.14 Pre-Release 5 2019-04-18 14:18:48 +02:00
Gerrygames
8c27ead19e 1.14 Pre-Release 3 2019-04-16 16:22:58 +02:00
Gerrygames
ea5ab1c2f5 1.14 Pre-Release 2 2019-04-13 11:45:22 +02:00
Gerrygames
afe767c6db 1.14 Pre-Release 1 2019-04-10 17:28:12 +02:00
Gerrygames
8231b3aebe 19w14b 2019-04-05 18:48:38 +02:00
Gerrygames
3ef8aa9e7f 19w14a 2019-04-03 19:39:39 +02:00
creeper123123321
475fb97730
19w13b and workaround for chunks not loading near to world border on 1.13.2 on join 2019-03-30 09:26:31 -03:00
Gerrygames
65f60098c8 19w13a 2019-03-27 19:08:53 +01:00
Gerrygames
56b5986fc5 19w12b 2019-03-21 17:04:33 +01:00
Gerrygames
e0b88b750d 19w12a 2019-03-20 14:27:28 +01: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
Gerrygames
f9d957a827 19w11a 2019-03-13 17:53:17 +01: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
KennyTV
9d0331e190 Add option to truncate edited books with more than 50 pages 2019-03-04 10:14:52 +01:00
Myles
a4de84b6da
Merge pull request #1204 from Gerrygames/1.14 
19w09a
 2019-02-27 16:40:07 +00:00
Gerrygames
31550bd010 19w09a 2019-02-27 17:03:38 +01:00
Myles
fd8879b46d Merge branch 'master' into dev 2019-02-23 22:34:16 +00:00
creeper123123321
0613886659
Fix memory leak 2019-02-23 10:12:25 -03:00
Gerrygames
1921b46a66 19w08b 2019-02-21 17:21:57 +01:00
Gerrygames
3de06c269d 19w08a 2019-02-20 18:01:21 +01:00
Gerrygames
d1007bbb38 19w07a 2019-02-13 17:50:07 +01: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
Gerrygames
8c543ee97f 19w06a 2019-02-06 17:56:19 +01:00
Gerrygames
91d9f99c70 19w05a 2019-01-30 17:16:06 +01:00
creeper123123321
25d1b08a6f
19w04b 2019-01-25 14:28:24 -02:00
Gerrygames
44330c98b7 19w04a 2019-01-24 16:58:37 +01:00
Gerrygames
bea5d39ed5 19w03c 2019-01-18 17:17:54 +01:00
Gerrygames
7102214c9e 19w03a 2019-01-16 18:44:37 +01:00
Myles
77a57d2243 Merge branch 'master' into dev 2019-01-12 17:42:47 +00:00
KennyTV
20654b0a77 Add convenience config options 
Add option to send all flowerparts for 1.13+ as stems if a block is above
Add option to send 1-layer snow as 2-layers for 1.13+ to fix collision
 2019-01-09 21:48:04 +01:00
Gerrygames
bea74661d1 19w02a 2019-01-09 18:26:08 +01:00
Gerrygames
284a462936 18w50a 2018-12-12 20:48:52 +01:00
Gerrygames
134987cb20 18w49a 2018-12-06 09:32:53 +01:00
Myles
7e8e3fef61 Merge branch 'master' into dev 2018-12-05 19:10:52 +00:00
Myles
c1147cb9f7 Formatting 2018-12-05 19:08:55 +00:00
Myles
8965b22f6d Merge branch 'master' into dev 2018-12-02 12:38:10 +00:00
Gerrygames
8aa7b749ca 18w48a 2018-11-29 16:31:39 +01:00
Marco Neuhaus
fc8b55dce7 fix spelling mistake 2018-11-24 18:42:00 +01:00
Gerrygames
079cd7210b 18w47a 2018-11-21 17:20:26 +01:00
Gerrygames
9a13eb36b3 Serverside block-connections! 2018-11-17 15:45:37 +01:00
Myles
9ba5cc1f98 Merge branch 'master' into dev 2018-11-17 14:11:04 +00:00
Myles
ab1c44c4fb Propose 2.0.0 snapshot as this version contains several API breaking changes 2018-11-17 13:13:55 +00:00
Myles
8549c22567 Change the name of the config class to be more consistent 2018-11-17 13:12:19 +00:00
Gerrygames
c5969c303e 18w46a 2018-11-15 15:44:50 +01:00
creeper123123321
4c07b6d28d
Squash Velocity platform commits 
incomplete velocity code

untested velocity version detector

update velocity module version

Injecting, but not working

facepalm

Fix handler type

Should work now

will it work now?

it works!!!

fix npe in command tab completion

Do not forward command to server

implement server changing with different versions
thanks @Leymooo

Fix memory leaks

maybe cleaner code?

trying to port mainhandpatch, added todo

fix version

Use separated protocol version, add todo

Trying to mitigate UserConnection#toServer concurrent issue

port elytrapatch

it works but horribly and needs a modification in velocity

replace with a semaphore and EventLoop#submit

Lock for incoming packets

fix version

remove some TODOs

Listen to DisconnectEvent

Relocate snakeyaml
 2018-11-12 15:05:48 -02:00
Gerrygames
9fac4f9de4 18w45a 2018-11-08 13:43:38 +01:00
Gerrygames
c58b28fd00 18w44a 2018-10-31 18:51:54 +01:00
Myles
d1b22b0f82 Update version 2018-10-27 12:30:39 +01:00
Myles
0fb08be6e9 Tidy up code to make it consistent 2018-10-27 12:25:42 +01:00
Myles
58efd6158f Back to SNAPSHOT 2018-10-22 17:45:17 +01:00
Myles
99bd1a52fb 1.13.2 update 2018-10-22 17:42:53 +01:00
KennyTV
a206fd7541 Remove unncessary doubled map check 2018-09-30 16:07:08 +02:00
Myles
77472cb9f4 Back to snapshot 2018-09-24 11:39:14 +01:00
Myles
5372d4b8e7 1.5.2 release 2018-09-24 11:33:20 +01:00
Myles
9f6766fb82 Back to 1.5.2-SNAPSHOT 2018-09-23 19:28:07 +01:00