Commit Graph

1146 Commits

Author SHA1 Message Date
konwboy
222c03aa67 Fix block connections causing issues with TNT 2020-05-05 19:49:59 +02:00
Myles
d5ff2b5b63
Merge pull request #1735 from KennyTV/abstraction
Add fire connection handler
2020-05-02 15:35:38 +01:00
Gerrygames
93d21efd3d fix enchantments in enchanting table for 1.16 2020-04-29 21:10:05 +02:00
KennyTV
19201134a8
20w18a 2020-04-29 18:09:57 +02:00
KennyTV
da2f153a43
Share JsonParser instance 2020-04-27 14:41:57 +02:00
KennyTV
24ebb77860
Directly add dependent futures to the list instead of waiting for the extra boolean 2020-04-24 13:48:22 +02:00
KennyTV
e4bac5f81a
Improve shutdown of executor loader and mappings cache
Previously, the shutdown check would only happen once all futures were removed, as in a player joined that had to check the remaining protocols.
Now, the check will be done regularly once the plugin has fully been enabled and has the option to delay the shutdown until set on again (i.e. with ViaBackwards)
2020-04-24 13:27:29 +02:00
KennyTV
4b9a15b003
Some javadoc changes 2020-04-24 11:39:11 +02:00
KennyTV
32826467d3
Wrap reflectiveoperationexception in concurrentlist clone 2020-04-23 21:42:08 +02:00
KennyTV
886ac734f9
Add null check to channel close 2020-04-23 21:09:41 +02: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
KennyTV
578c661730
Check if player is handled by Via on disconnect 2020-04-22 22:11:01 +02:00
KennyTV
a82bbc4e66
Replace keyset map lookups with value iterator 2020-04-22 21:47:14 +02:00
KennyTV
867cd4ee39
Move heightmap code above block entity check 2020-04-22 21:46:14 +02:00
Myles
f7b841faf3
Merge pull request #1742 from Gerrygames/abstraction
convert height maps, fix 1.16 chunk reading
2020-04-22 20:44:47 +01:00
Gerrygames
b80902ec10 convert height maps, fix 1.16 chunk reading 2020-04-22 21:42:11 +02:00
Myles
90386cd0de
Merge pull request #1741 from Gerrygames/abstraction
20w17a
2020-04-22 18:15:02 +01:00
Gerrygames
e22bba0360 20w17a, update entity types renamed in 1.13 2020-04-22 19:04:53 +02:00
Myles
2734b18d07 Block connections true by default
While we didn't have this enabled when it launched, most of the bugs are gone and the number of people using this option is pretty high.
2020-04-19 18:59:38 +01:00
KennyTV
3a5a47aaa2
Add fire connection handler 2020-04-19 15:57:59 +02:00
KennyTV
c956f23def
Add safety checks to skullowner conversion 2020-04-17 21:02:51 +02:00
KennyTV
0f90efa05f
Add subplatform versions to dumps 2020-04-17 20:52:55 +02:00
KennyTV
83a6346a8d
Add git commit hash to dumps 2020-04-16 21:39:28 +02:00
Myles
d9291e6457
Merge pull request #1719 from creeper123123321/portedplayerschange
Remove portedPlayers field, let platform handle players
2020-04-15 23:11:09 +01:00
KennyTV
b03dfa9951
20w16a 2020-04-15 17:53:02 +02: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
Myles
47e50d035f
Merge pull request #1724 from KennyTV/abstraction
Fix 1.15 EntityToggleGlideEvent cancelling on Bukkit
2020-04-14 17:58:14 +01:00
Myles
5af9f025d8
Merge pull request #1379 from creeper123123321/1_8inconsistencyfix
Fix inconsistent types in block placement
2020-04-14 17:43:20 +01:00
KennyTV
8f08a32c5a
Bai bai to more lombok usage once more 2020-04-13 20:58:24 +02:00
creeper123123321
a91c72fb44
position fix 2020-04-13 14:42:48 -03:00
creeper123123321
99abe3994c
use short 2020-04-13 14:33:00 -03:00
creeper123123321
a0e3d70a3f
unsigned byte 2020-04-13 14:01:28 -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
creeper123123321
f8def524aa Run Velocity server change logic on event loop 2020-04-12 14:50:54 -03:00
KennyTV
721808d71d 20w15a 2020-04-08 16:15:53 +02:00
Myles
3c9c61056d
Merge pull request #1689 from KennyTV/abstraction
Asynchronously load mapping data
2020-04-05 21:54:04 +01:00
KennyTV
df702736bf Readd block entity wrapping 2020-04-04 00:37:06 +02:00
KennyTV
3737242226 Cleanup chunk types 2020-04-04 00:32:00 +02:00
KennyTV
ebff5e2f4d Adapt tagdata loading 2020-04-03 19:57:07 +02:00
KennyTV
081781f223 Some cleanup 2020-04-03 19:32:31 +02:00
KennyTV
c570f4a972 Minor change 2020-04-03 19:32:31 +02:00
KennyTV
563c5f830d Don't expose executor and future map 2020-04-03 19:32:30 +02:00
KennyTV
248fd92f6e Use CompletableFuture.runAsync 2020-04-03 19:32:30 +02:00
KennyTV
757654aa9d Minor changes 2020-04-03 19:32:30 +02:00
KennyTV
e658304405 Asynchronously load mappings (until needed), create optional mappings cache for VB 2020-04-03 19:32:30 +02:00
KennyTV
b5e5118450 Minor protocol cleanup
Removed unneeded integer boxing and empty method implementations of the user init
2020-04-03 19:32:30 +02:00
KennyTV
95db675de5 Add missing tags for client sending, cleanup 2020-04-03 17:29:40 +02:00
KennyTV
cae6addf26 Fill beacon tag in case it's fully used by the client in the future 2020-04-03 16:47:38 +02:00
KennyTV
ed26971724 Fix beacon item payment 2020-04-03 13:41:53 +02:00
KennyTV
7cdcdfa3c9 Minor cleanup to tagrewriter 2020-04-03 11:29:59 +02:00
KennyTV
8314f6c1db Send empty non_flammable_wood itemtag as well 2020-04-03 00:03:21 +02:00
KennyTV
297fe0a538 Send empty non_flammable_wood tag 2020-04-02 23:58:06 +02:00
KennyTV
b6592b38ad Fix zombie id 2020-04-02 23:06:05 +02:00
KennyTV
b1d6a49a82 Fix entity remap 2020-04-02 21:42:21 +02:00
KennyTV
0fcba4f4ec Minor changes 2020-04-02 21:09:48 +02:00
KennyTV
0ee6369884 20w14a, entity name fixes, abstract tag rewriter 2020-04-02 21:03:05 +02:00
KennyTV
b941a6a422 20w13b 2020-03-26 15:39:34 +01:00
KennyTV
90f363a2be Use correct parent for hoglin and strider 2020-03-25 19:58:38 +01:00
KennyTV
875b85b0fc 20w13a 2020-03-25 19:42:06 +01:00
Gerrygames
6b7f00ef76 fix skull items 2020-03-21 13:51:14 +01:00
KennyTV
20ce8cc288 Fix block entity uuid nbt, fix particles 2020-03-20 19:20:48 +01:00
KennyTV
6eaeb5a201 Fix login packet reading on 1.16 servers 2020-03-18 20:31:43 +01:00
Myles
f245bb8263
Merge pull request #1679 from KennyTV/abstraction
20w12a
2020-03-18 18:26:34 +00:00
KennyTV
f746fda5a8 Unroll uuid reading/writing 2020-03-18 19:21:48 +01:00
KennyTV
a7ab4153ef 20w12a 2020-03-18 19:15:58 +01:00
KennyTV
5057ac3d3d Remove null check for channel in UserConnection again 2020-03-14 16:36:04 +01:00
KennyTV
7887e10bb6 20w11a 2020-03-11 22:14:08 +01:00
KennyTV
dd73ba4f72 Remove some lombok usage from the api package 2020-03-10 13:22:22 +01:00
KennyTV
2bf69c2df2 20w10a 2020-03-04 18:07:49 +01:00
KennyTV
97db997473 Fix typo 2020-02-26 18:51:27 +01:00
KennyTV
efbc246a72 20w09a 2020-02-26 18:50:30 +01:00
KennyTV
df7ef32677 20w08a 2020-02-19 18:49:17 +01:00
KennyTV
1a4945eecd Merge branch 'master' into abstraction 2020-02-19 15:23:39 +01:00
Myles
e3e88d449d
Merge pull request #1646 from Jo0001/patch-1
Add link to krusics "Blocked Version Generator"
2020-02-17 10:01:42 +00:00
Myles
529f9a0e01
Fix double space and use a 2020-02-17 10:01:28 +00:00
KennyTV
c2d8b43eab Update hoglin, add piglin entity type 2020-02-14 15:56:55 +01:00
KennyTV
6d823263ac 20w07a 2020-02-14 15:48:12 +01:00
KennyTV
5c54e8a08d Merge branch 'master' into abstraction 2020-02-10 15:55:09 +01:00
KennyTV
7e164b40c7 Add vines blockconnection to prevent unwanted climbing
Fixes #1640
2020-02-10 14:50:22 +01:00
KennyTV
681a0dc0e4 Remove deprecated api, remove a bit of magic 2020-02-10 10:05:56 +01:00
KennyTV
3f5500c637 Remove a bit of magic, use finals 2020-02-09 13:06:23 +01:00
KennyTV
c4b447f7b6 Handle items in cooldown packet 2020-02-08 21:33:44 +01:00
KennyTV
177b0fbf33 Fix particle mapping 2020-02-06 12:37:57 +01:00
KennyTV
2184ef19ca 20w06a, more cleanup 2020-02-05 20:09:06 +01:00
KennyTV
c33611d2d3 Cleanup 1.11 entityidrewriter 2020-02-04 15:33:36 +01:00
Jo0001
bf15415185
Add link to krusics "Blocked Version Generator" 2020-02-01 20:26:03 +01:00
KennyTV
7f6c429a55 Minor blockconnection cleanup, reduce map lookups 2020-01-28 13:31:36 +01:00
KennyTV
116706c09f Option to (not) remap infested blocks to their normal variants
Fixes #1642
2020-01-28 12:36:27 +01:00
KennyTV
598b51a4bf Do not unnecessarily register tasks/listeners 2020-01-22 14:55:39 +01:00
KennyTV
b06b9c69ca Do not unnecessarily register tasks/listeners 2020-01-22 14:14:43 +01:00
KennyTV
704f946cf7 Merge remote-tracking branch 'origin/master' into abstraction
# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
2020-01-21 16:07:42 +01:00
KennyTV
f9d10a9571 1.15.2 support 2020-01-21 16:05:26 +01:00
KennyTV
379c5791e6 Merge branch 'master' into dev 2020-01-20 22:15:41 +01:00
KennyTV
8569f47627 Merge branch 'dev' into abstraction 2020-01-19 19:09:57 +01:00
Gerrygames
4cf09f2e34 1.15-pre2 2020-01-16 15:58:35 +01:00
KennyTV
5d1b8dbb85 Put translation values into correct map 2020-01-16 10:39:31 +01:00
KennyTV
605b217ba4 Convert (general) 1.12.2->1.13 statistics 2020-01-15 21:51:33 +01:00
KennyTV
814bd9d85e Merge remote-tracking branch 'origin/master' into abstraction 2020-01-15 19:13:33 +01:00
KennyTV
7f0af23f96 Fix 1.11 evocation id
Fixes #1629
2020-01-15 18:53:26 +01: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
KennyTV
538b467fa6 Fix heightmaps 2020-01-14 19:18:02 +01:00
Gerrygames
c704813a6c 1.15.2-pre1 2020-01-14 17:51:39 +01:00
Myles
86af7f054a
Merge pull request #1601 from KennyTV/abstraction
Cleanup some block rewrite methods
2020-01-06 14:56:17 +00:00
KennyTV
3384b6bc17 Only load mappings file from dir if manually copied 2020-01-06 10:52:42 +01:00
KennyTV
4bdb566fb5 Kept the wrong defaults 2020-01-05 21:23:40 +01:00
KennyTV
5ad62a03ed Make plugin channel mappings modifiable 2020-01-05 21:21:58 +01:00
KennyTV
5d974858fe Some more cleanup 2019-12-20 17:53:14 +01:00
KennyTV
fddbeda81e Back to snapshot 2019-12-20 16:29:10 +01:00
KennyTV
1c1ec10a0a Common methods for block rewriting 2019-12-17 18:29:38 +01:00
Myles
cd9566fbc8 1.15.1 support 2019-12-17 15:28:43 +00:00
KennyTV
5a1dadf476 1.15.1 2019-12-17 14:54:51 +01:00
Myles
6eabb17f67 Merge from master 2019-12-15 09:16:53 +00:00
Myles
4f72edeaee Merge branch 'master' into dev 2019-12-15 09:02:48 +00:00
Robin Brämer
f35b931004
fix typo 2019-12-14 22:01:50 +01:00
KennyTV
9c8a8e2e9c Fix book edit 2019-12-14 16:22:24 +01:00
Myles
d5907711e1
Merge pull request #1576 from astei/remove-unneeded-indirection
Remove unneeded indirection
2019-12-13 08:30:22 +00:00
Andrew Steinborn
437463f1b4 Revert "Remove indirection in byte array writing"
This reverts commit ba08c3ad2f.

Breaks the API that ViaRewind and ViaBackwards depend on.
2019-12-12 20:45:03 -05: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
Andrew Steinborn
ba08c3ad2f Remove indirection in byte array writing
This saves us from the cost of (un)boxing bytes on the fly.
2019-12-12 00:02:09 -05:00
Andrew Steinborn
220c45b800 Remove indirection in StringType decoding 2019-12-11 23:55:44 -05:00
Andrew Steinborn
a42e724f50 Remove unneeded indirection in NBTType
ByteBufInputStream implements DataInput, ByteBufOutputStream implements DataOutput. Use them to exploit native Netty ByteBuf calls where possible.
2019-12-11 23:51:39 -05:00
KennyTV
1002ca4016 Fix biomedata on some custom Spigot versions 2019-12-11 20:36:49 +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
KennyTV
b7b8bdc841 Ignore unneeded sound warnings 2019-12-11 12:07:22 +01:00
KennyTV
5f46dcbab0 Merge remote-tracking branch 'upstream/master' into abstraction
# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
2019-12-11 09:53:09 +01:00
KennyTV
dfbe2e9739 Fix acknowledge digging
Fixes #1564
2019-12-11 09:30:51 +01:00
Gerrygames
84624a4884 fix entity metadata in spawn packet being ignored 2019-12-11 02:10:16 +01:00
Myles
68ac978d45 Back to SNAPSHOT 2019-12-10 15:34:42 +00:00
Myles
8136eb15e1 Merge 1.15 support 2019-12-10 15:31:07 +00:00
Myles
c85d4224ad 1.15 protocol + 2.2.0 2019-12-10 15:29:26 +00:00
KennyTV
9dae40f455 Fix trade list 2019-12-09 19:30:09 +01:00
Gerrygames
44a3108982 fix wrong import - #1560 2019-12-09 19:24:18 +01:00
Gerrygames
ea045e6c34 1.15-pre7 2019-12-09 13:48:06 +01:00
Gerrygames
9174ad854c Merge branch 'dev' into abstraction
# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
2019-12-09 11:52:23 +01:00
Gerrygames
cfe073cd20 fix 1.15 entity type ids 2019-12-09 11:34:00 +01:00
Myles
459871257e
Merge pull request #1528 from KennyTV/abstraction
Hold config values in fields, add extra mappings constructor, other fixes
2019-12-08 23:08:52 +00:00
Myles
4bb4b96a10
Merge pull request #1548 from KennyTV/dev
Convert biome data to 1.15 format
2019-12-07 10:35:44 +00:00
KennyTV
68a18df969 Take biome data from same indexes as Mojang ("middle" of 4x4x4 areas) 2019-12-07 11:31:00 +01:00
KennyTV
90e1d7236e 1.15-pre6 2019-12-07 10:05:29 +01:00
KennyTV
decb20d2d1 Convert biome data to 1.15 format 2019-12-07 10:02:11 +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
2c95229cfc Fix blaze remap and entity destroy in 1.15
Fixes #1542
2019-11-30 19:22:36 +01:00
KennyTV
5c7520f552 1.15-pre3 2019-11-28 20:10:19 +01:00