Commit Graph

1418 Commits

Author SHA1 Message Date
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
Gerrygames
864715af40
Merge pull request #5 from Gerrygames/1.14_18w43c
Add support for 18w43c
2018-10-26 14:41:15 +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
Gerrygames
4e2ba4f810
Merge pull request #3 from creeper123123321/1.14
fix light
2018-10-25 12:10:05 +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
8ba1725eae
Merge pull request #1055 from Gerrygames/1.13.2
1.13.2
2018-10-22 17:35:25 +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
Myles
ccc144556b
Merge pull request #1053 from Gerrygames/book_fix
fix #1044
2018-10-22 12:10:34 +01:00
Gerrygames
0b7e438128 fix #1044 2018-10-22 11:29:22 +02:00
Myles
2f11268dcc
Merge pull request #1050 from Plancke/master
Fix scoreboard colors
2018-10-21 23:11:09 +01: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
Myles
6c609a6b23
Merge pull request #1049 from Gerrygames/1.13.2
1.13.2-pre2 support
2018-10-20 10:32:02 +01:00
Gerrygames
b7a3c8568f 1.13.2-pre2 support 2018-10-20 11:25:20 +02:00
Myles
80f84d4001
Merge pull request #1048 from Gerrygames/1.13.2
1.13.2
2018-10-17 16:21:53 +01:00
Gerrygames
5cecfd14d9 1.13.2-pre1 support 2018-10-17 15:38:59 +02:00
Myles
8bfcc550f7
Merge pull request #1036 from KennyTV/master
Remove some more unncessary/doubled map check
2018-10-03 17:12:47 +01:00
KennyTV
e40be243de Return correct default protocol, whoops! 2018-10-03 10:12:13 +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
8b0ccd81e2
Merge pull request #1035 from KennyTV/master
Remove unncessary doubled map check
2018-09-30 16:16:51 +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
0255f3c42f
Merge pull request #1030 from creeper123123321/master
Fix PacketWrapper#constructPacket
2018-09-24 08:44:14 +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
Myles
e8dc4c893f
Merge pull request #1013 from creeper123123321/master
Fix item particle
2018-09-23 18:17:29 +01:00
creeper123123321
b61edb0d8e
javadoc, fix possible NPE 2018-09-21 14:46:22 -03:00