Commit Graph

789 Commits

Author SHA1 Message Date
Myles
ca863ba8c6
Merge pull request #1207 from KennyTV/dev
Fix book opening
2019-03-03 13:29:29 +00:00
Myles
b9a2279966
Merge pull request #1206 from ViaVersion/master
merge master into dev
2019-03-03 13:29:00 +00:00
KennyTV
9a91250af7 Fix books 2019-03-03 13:40:17 +01:00
creeper123123321
6b313cb65e
Fix 1.9 chunk missing blocks, update travis badge url 2019-03-02 17:07:23 -03: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
creeper123123321
8283816418
Fix team remove 2019-02-24 15:53:43 -03:00
creeper123123321
44be8b3791
unnecessary cancel when auto-team is disabled 2019-02-24 15:07:34 -03:00
creeper123123321
f46a2bb618
Bungee auto-team, bump BungeeCord version, workaround for block connections 2019-02-24 15:02:09 -03:00
creeper123123321
96366aae42
Fix NPE when block connection is disabled 2019-02-23 20:12:49 -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
75d7ffb447
Should be 15 2019-02-23 09:30:07 -03:00
creeper123123321
0b5c173945
Send multi block change on chunk updates, use separate for loops 2019-02-23 09:01:40 -03:00
Gerrygames
1921b46a66 19w08b 2019-02-21 17:21:57 +01:00
Gerrygames
bccf90b093 fix horse armor 2019-02-20 21:02:09 +01:00
Gerrygames
deebc83f1e still send animation 2019-02-20 20:36:45 +01:00
Gerrygames
a319df630d fix use/leave bed 2019-02-20 20:28:14 +01:00
Gerrygames
ab5eb2c7ef 19w08a metadata changes 2019-02-20 20:12:20 +01:00
Gerrygames
3de06c269d 19w08a 2019-02-20 18:01:21 +01:00
creeper123123321
11b25151f7
Remove uuid tracking 2019-02-13 17:00:01 -02:00
creeper123123321
35bb80d67a
firework boost, set metatype to the newer class 2019-02-13 16:42:59 -02:00
creeper123123321
7859f5ebd6
Cleanup ConnectionData#update and fix doors 2019-02-13 16:03:22 -02:00
Gerrygames
d1007bbb38 19w07a 2019-02-13 17:50:07 +01:00
creeper123123321
891f8b143f
Shift 4 bits to left in chunk unloading 2019-02-11 17:01:27 -02:00
creeper123123321
7856716a3a
Warn instead of blowing up everything 2019-02-11 16:48:26 -02:00
creeper123123321
4eb4b2c37f
Use ByteBuf#order, more sanity check on block entity handler 2019-02-10 16:05:32 -02:00
Myles
1be617c110 Merge branch 'master' into dev 2019-02-10 16:45:34 +00:00
Myles
f1743e5912
Merge pull request #1186 from creeper123123321/tabdelay
Tab delaying
2019-02-10 16:42:05 +00:00
creeper123123321
ae3434cb89
Fix duplicate packet registering 2019-02-10 14:05:58 -02:00
creeper123123321
63b743f85b
Use only one task for tab completing 2019-02-07 14:07:30 -02:00
KennyTV
d9c25b1acc Merge master 2019-02-06 22:14:00 +01:00
Myles
6c18fdb175
Merge pull request #1156 from creeper123123321/master
trying to optimize block connection storage
2019-02-06 21:08:26 +00:00
Myles
cd009388a4
Merge pull request #1187 from creeper123123321/snowygrass
Connect grass block to snow
2019-02-06 21:08:07 +00:00
creeper123123321
d66c2f2f5d
Connect grass block to snow
(cherry picked from commit 69b0d43c9825d896374fc26246410530c5b7495f)
2019-02-06 18:55:17 -02:00
creeper123123321
bce3593110
Tab delaying
(cherry picked from commit 386de52b9db1454e0fcec56ef9bfcd2c3a0f8d4a)
2019-02-06 18:53:24 -02:00
creeper123123321
9a92d180d0
Fix typo 2019-02-06 18:51:04 -02:00
creeper123123321
a203c17e06
Fix reddust, particle metadata rewriting, translations 2019-02-06 18:50:31 -02:00
Gerrygames
8c543ee97f 19w06a 2019-02-06 17:56:19 +01:00
KennyTV
bafa6edd28 Fix some stair and lever connections 2019-02-03 00:22:49 +01:00
Gerrygames
a27e439c99 remove 1.14 object type (Mojang removed objcet trype in 19w05a)
fix entity type remaps
2019-01-30 17:48:11 +01:00
Gerrygames
91d9f99c70 19w05a 2019-01-30 17:16:06 +01:00
creeper123123321
e9198e7946
Arrow and firework metadata rewriting, remap ocelot to cat for now 2019-01-25 15:37:44 -02:00
creeper123123321
25d1b08a6f
19w04b 2019-01-25 14:28:24 -02:00
creeper123123321
50395da626
Fix item deserializing 2019-01-25 10:01:24 -02:00
Gerrygames
44330c98b7 19w04a 2019-01-24 16:58:37 +01:00
Gerrygames
b7f72bf55d 19w04a 2019-01-24 16:56:59 +01:00
creeper123123321
f6d7976eff
Use old ids and byte[] + NibbleArray for block connections 2019-01-21 12:58:05 -02:00
creeper123123321
f45a727396
remove short array used for checking if array is empty 2019-01-21 12:58:05 -02:00
creeper123123321
d5f65eceb0
don't create chunksection on remove 2019-01-21 12:58:05 -02:00
creeper123123321
2285c453da
fixed encodeblockpos, use map<long, short[]> 2019-01-21 12:58:04 -02:00
creeper123123321
193084927b
store constructor 2019-01-21 12:58:04 -02:00
creeper123123321
1325d53950
Don't use netty collections 2019-01-21 12:58:04 -02:00
creeper123123321
fa1b56a7cf
use short 2019-01-21 12:58:04 -02:00
creeper123123321
de11f1f90b
trying to optimize blockconnectionstorage 2019-01-21 12:57:56 -02:00
KennyTV
8e47497edb Use keyset instead of entryset 2019-01-20 15:03:47 +01:00
KennyTV
7f7dcffdf0 Forgot to assign a value 2019-01-19 19:59:17 +01:00
KennyTV
9d8a2a9680 Don't cycle through mappings in every connection handler 2019-01-19 19:19:24 +01:00
KennyTV
880df7a482 Remove unmapped blockconnection data 2019-01-19 19:17:55 +01:00
Gerrygames
17c5849f33 fix powered levers 2019-01-18 18:45:05 +01:00
Gerrygames
ff0ec98a27 fix the fix for stone slab mapping 2019-01-18 17:29:48 +01:00
Gerrygames
553e56fe4c fix stone slab mapping 2019-01-18 17:18:17 +01:00
Gerrygames
bea5d39ed5 19w03c 2019-01-18 17:17:54 +01:00
Gerrygames
f6932e09f7 fix lever mapping 2019-01-18 14:07:27 +01:00
Gerrygames
605e63e1df fix fence connections to stairs, remove waterlogged blocks from stair data 2019-01-17 12:22:36 +01:00
Gerrygames
7102214c9e 19w03a 2019-01-16 18:44:37 +01:00
Myles
e60447ecd2
Merge pull request #1154 from creeper123123321/dev
not tested villager metadata rewriting
2019-01-15 17:32:11 +00: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
creeper123123321
8d77891f76
not tested villager metadata rewriting 2019-01-09 17:26:06 -02:00
Gerrygames
bea74661d1 19w02a 2019-01-09 18:26:08 +01:00
Myles
6b7bf843a1 Merge branch 'master' into dev 2019-01-09 16:30:29 +00:00
Myles
200ccfd092 Use HTTPS for update checking 2019-01-09 16:29:10 +00:00
creeper123123321
933e8cbaed
set auto-team to false on join packet 2019-01-08 20:49:17 -02:00
creeper123123321
daac2baf8e
Resend viaversion team when removed from the current team 2019-01-08 20:47:08 -02:00
creeper123123321
cd7774f056
Use ProtocolInfo#getServerProtocolVersion for block connection, use bungee and velocity version if not ported 2019-01-08 13:58:24 -02:00
creeper123123321
1f72ddb8a1
Fix lore 2019-01-06 17:27:41 -02:00
creeper123123321
c88655a2a0
fix player digging 2019-01-06 09:08:29 -02:00
creeper123123321
a27efd94c8
oops 2019-01-06 08:43:25 -02:00
creeper123123321
9a26ac380a
send signs tags 2019-01-06 08:28:08 -02:00
Gerrygames
7f5073476c fix book signing and opening in 18w50a 2018-12-15 20:57:17 +01:00
creeper123123321
c21003e1b7
CanPlaceOn, CanDestroy 2018-12-15 09:13:19 -02:00
Gerrygames
284a462936 18w50a 2018-12-12 20:48:52 +01:00
creeper123123321
eaa8e05373
Fix mappings, fixing shift click on furnaces 2018-12-10 17:23:29 -02:00
creeper123123321
0c5f5c6e3f
remove debug 2018-12-10 12:56:45 -02:00
creeper123123321
7c6118bd6f
facepalm 2018-12-10 12:54:06 -02:00
creeper123123321
7fe99c98f0
clicking in recipe doesn't work 2018-12-10 12:54:06 -02:00
creeper123123321
d6c4c18d35
still not working 2018-12-10 12:54:06 -02:00
creeper123123321
649676e811
trying recipes, currently not working 2018-12-10 12:54:05 -02:00
Myles
98c0985657 Merge branch 'master' into dev 2018-12-07 21:15:49 +00:00
creeper123123321
ba7817170b
Fix chunk writing 2018-12-07 19:10:40 -02:00
Gerrygames
134987cb20 18w49a 2018-12-06 09:32:53 +01:00
Myles
7b880ae967 Fix type being byte instead of int 2018-12-05 19:13:26 +00: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
54b35ef075 Merge branch 'master' into dev 2018-12-05 19:02:50 +00:00
creeper123123321
c5c7d36bd1
Change Chunk#getBiomeData() to int[] 2018-12-05 16:52:53 -02:00
Gerrygames
000fff210a fix BlockConnectionStorage not being initialized 2018-12-03 09:21:07 +01: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
b60c56f464 Tripwire connections 2018-11-19 09:28:37 +01:00
Gerrygames
eb1571d3e4 init ConnectionData 2018-11-17 16:10:13 +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
2778ec0d9d
Merge pull request #1060 from creeper123123321/dev
Change item id to int, fix valid string being considered as invalid + tests
2018-11-17 13:48:31 +00:00
Myles
20b0954f8c Missed one - oops 2018-11-17 13:47:58 +00:00
Myles
69aa7be6c5 Refactor tests to be one general test per method and include plugin 2018-11-17 13:46:32 +00:00
Myles
73dccbaf24 Merge branch 'pr/1045' 2018-11-17 13:15:20 +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
Marco Neuhaus
34c701e039 fix chunk unload packet 2018-11-17 13:46:53 +01:00
Gerrygames
cf0bd6f021 Use List and Map, fixes duplicate block ids in palette causing issues 2018-11-17 13:38:48 +01:00
Gerrygames
3b14dd3b04 Use methods for palette rewriting, fix "value already present" 2018-11-17 13:38:42 +01:00
Gerrygames
9a87adf51b Use BiHashMap as palette 2018-11-17 13:38:29 +01:00
Gerrygames
ce65c7f583 fix merge issues 2018-11-17 13:36:35 +01:00
Gerrygames
82013d5737 Keep Chunk as an interface 2018-11-17 13:35:44 +01:00
Gerrygames
14377ca354 Use types for ChunkSections 2018-11-17 13:35:34 +01:00
Gerrygames
c5969c303e 18w46a 2018-11-15 15:44:50 +01:00
Gerrygames
b86950d0e7 fix #1076 2018-11-13 10:59:11 +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
4be46cd51d Use List and Map, fixes duplicate block ids in palette causing issues 2018-11-12 17:10:19 +01:00
Gerrygames
bb2b8bc538 Use methods for palette rewriting, fix "value already present" 2018-11-12 16:08:01 +01:00
Gerrygames
41ef4f6284 Use BiHashMap as palette 2018-11-12 14:36:01 +01:00
creeper123123321
cfd3179cb8
try to eat less ram 2018-11-11 11:57:33 -02:00
Myles
1a3170c7db
Merge pull request #1077 from creeper123123321/translations
Translation rewriting
2018-11-10 10:45:21 +00:00
creeper123123321
408bd49120
fix set cooldown 2018-11-10 08:41:22 -02:00
creeper123123321
3fc2d28b95
fix npe 2018-11-08 16:18:20 -02:00
creeper123123321
d9eff7bb5c
Translation rewriting 2018-11-08 16:11:01 -02:00
Gerrygames
0b34b65f76 add sound and block id mappings 2018-11-08 14:40:02 +01:00
Gerrygames
ccb5ceb9b3 use blockmapping for air ids 2018-11-08 13:46:02 +01:00
Gerrygames
9fac4f9de4 18w45a 2018-11-08 13:43:38 +01:00
creeper123123321
bec27e0fa6
Use ChatColor.COLOR_CHAR 2018-11-04 10:51:29 -02:00
creeper123123321
437b02c961
color rewriting changes 2018-11-04 08:56:22 -02:00
Gerrygames
b92f4070d4 calculate non-air blocks correctly 2018-11-01 19:07:10 +01:00
Myles
b9750be745
Merge pull request #1066 from creeper123123321/master
Tolerate some identifiers. Should fix #1063
2018-11-01 15:58:31 +00:00
Gerrygames
973b473100 don't use NotImplementedException 2018-10-31 20:28:14 +01:00
creeper123123321
b7606aece0
Tolerate some identifiers. Should fix #1063 2018-10-31 16:26:55 -03:00
Gerrygames
3f62730404 forgot some entity ids 2018-10-31 18:57:18 +01:00
Gerrygames
c58b28fd00 18w44a 2018-10-31 18:51:54 +01:00
creeper123123321
149b3c2e29
fix player digging 2018-10-31 14:48:28 -03:00
Gerrygames
aa067d4073 Merge branch 'myles_dev' into 1.14
# Conflicts:
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
2018-10-29 20:16:06 +01:00
Gerrygames
4c8917c6a0 remap items in advancements 2018-10-29 20:08:37 +01:00
creeper123123321
6652a7fd83
Change item id to int, fix valid string being considered as invalid, tests 2018-10-27 11:55:17 -03: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
Gerrygames
2da9b99789 1.14 position changes 2018-10-26 18:36:35 +02:00
Gerrygames
28bb60244f fix merge issues 2018-10-26 17:09:26 +02:00
Gerrygames
928cd9de94 Merge branch 'chunk_section_rewrite' into 1.14
# Conflicts:
#	common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/ChunkSection.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/chunks/ChunkSection1_13.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/ChunkSection1_9to1_8.java
2018-10-26 17:02:01 +02:00
Gerrygames
0046fea684
Merge pull request #4 from creeper123123321/1.14
Sounds, calculate non-air blocks, getNewBlockId
2018-10-26 16:54:13 +02:00
Marco Neuhaus
3684d3f9a2 add support for 18w43c 2018-10-26 14:34:09 +02:00
creeper123123321
69c52c48ab
Sounds, calculate non-air blocks, getNewBlockId 2018-10-25 18:25:57 -03:00
Gerrygames
9cf5a66e2f Keep Chunk as an interface 2018-10-25 20:26:24 +02:00
Gerrygames
ae73ef1a33 Use types for ChunkSections 2018-10-25 13:56:40 +02:00
creeper123123321
aef88cd82f
send 4096 in chunk data short 2018-10-25 04:44:03 -03:00
creeper123123321
9cd40f3ec2
fix wrong order 2018-10-24 19:25:33 -03:00
creeper123123321
a368f0babc
trying to implement lightning based on Pokechu22 documentation 2018-10-24 19:07:16 -03:00
Gerrygames
9565a47c22 fix chunk packets 2018-10-24 21:14:07 +02:00
Gerrygames
0df089b3cb 1.14 development 2018-10-24 19:05:14 +02: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
Myles
0a2524fec8
Merge pull request #1054 from Gerrygames/myles_master
fix #1052
2018-10-22 17:35:07 +01:00
Gerrygames
162d6aa33a 1.13.2 support 2018-10-22 15:18:23 +02:00
Gerrygames
fdcdd0fe40 Merge remote-tracking branch 'Myles/master' into 1.13.2 2018-10-22 15:18:06 +02:00
Gerrygames
8532d388f8 fix #1052 2018-10-22 14:33:38 +02:00
Gerrygames
0b7e438128 fix #1044 2018-10-22 11:29:22 +02:00
Plancke
81514e4192 convert every color in the name 2018-10-21 23:19:54 +02:00
Plancke
7d5c59aa34 Don't read the array size 2018-10-21 23:06:24 +02:00
Plancke
dc6d9367b0 Rewrite scoreboard team member names to fix the color changing 2018-10-21 22:56:11 +02:00
Gerrygames
b7a3c8568f 1.13.2-pre2 support 2018-10-20 11:25:20 +02:00
Gerrygames
5cecfd14d9 1.13.2-pre1 support 2018-10-17 15:38:59 +02:00
KennyTV
033d3bcd4d Remove some more unncessary/doubled map check 2018-09-30 21:19:18 +02:00
KennyTV
449ec15309 Remove unncessary/doubled map check 2018-09-30 20:48:23 +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
creeper123123321
eb5c10d375
Fix PacketWrapper#constructPacket 2018-09-24 03:42:08 -03:00
Myles
9f6766fb82 Back to 1.5.2-SNAPSHOT 2018-09-23 19:28:07 +01:00
Myles
ab77eb98c0 Prepare for 1.5.1 release 2018-09-23 18:54:24 +01:00
Myles
85ab5d7741 Use Channel instead of SocketChannel
For better compatibility with third party software.
2018-09-23 18:52:26 +01:00
Myles
6457ff315f Merge branch 'pr/987' 2018-09-23 18:43:29 +01:00
Myles
c09a9c88b4
Merge pull request #1005 from creeper123123321/sendpackettoserver
PacketWrapper#sendToServer changes
2018-09-23 18:18:00 +01:00
creeper123123321
b61edb0d8e
javadoc, fix possible NPE 2018-09-21 14:46:22 -03:00
creeper123123321
5024375466
Fix item particle 2018-09-02 15:13:38 -03:00
Myles
527b5e6f99 Allow disabling of auto-complete in 1.13 via disable-1_13-auto-complete in config #891 2018-09-01 07:53:36 +01:00
creeper123123321
17115460b7
PacketWrapper#sendToServer changes 2018-08-28 14:02:48 -03:00
Myles
84aaec6bff Fix bossbars (credit to @JollyajaX) 2018-08-23 21:40:39 +01:00
creeper123123321
8bf230e057
Rewrite arrow metadata and remove 0x10 metadata flag in 1.12.2 -> 1.13 2018-08-23 17:18:59 -03:00
creeper123123321
4cd70ee711
Fix rewriting 2018-08-22 17:27:21 -03:00
creeper123123321
3d1d73a81a
Rewrite declare recipes and villager gui 2018-08-22 17:05:46 -03:00
Myles
0f77da15ff Back to snapshot for dev 2018-08-22 17:32:47 +01:00
Myles
a05ea7c1ce Prepare for 1.13.1 update 2018-08-22 17:05:24 +01:00
Myles
925aaf345c Merge branch 'master' into dev 2018-08-21 17:18:27 +01:00
Myles
2510751fdf Introduce 'suppress-1_13-conversion-errors' option 2018-08-21 16:26:04 +01:00
Myles
83e94dbf4a Fix tab complete support for 1.13.1-pre2 2018-08-21 16:07:24 +01:00
Marco Neuhaus
252c996abf update to 1.13.1-pre2 2018-08-20 20:08:02 +02:00
Marco Neuhaus
c141d6efc7 fix tags packet 2018-08-16 23:14:08 +02:00
Marco Neuhaus
3b48f11f7b add support for 1.13.1-pre1 2018-08-16 22:38:22 +02:00
Myles
9ec8e2daf7 Update version to correspond to snapshot version 2018-08-12 20:33:24 +01:00
Myles
4f84200a47 Merge upstream 2018-08-12 20:29:30 +01:00
Myles
e4a99c4a3d
Merge pull request #942 from creeper123123321/buffer-changes
Replace Unpooled.buffer()
2018-08-12 20:27:44 +01:00