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
73dccbaf24
Merge branch 'pr/1045'
2018-11-17 13:15:20 +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
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
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
creeper123123321
eb5c10d375
Fix PacketWrapper#constructPacket
2018-09-24 03:42:08 -03: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
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
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
creeper123123321
12e2f8b35a
Make enchanting table show the enchantment correctly
2018-08-12 09:56:39 -03:00
creeper123123321
1e7dbac34e
Reduce cooldown
2018-08-11 12:31:45 -03:00
creeper123123321
e39876ae67
Use unpowered note block
2018-08-11 06:54:38 -03:00
creeper123123321
ff3bc9a0cd
Rewrite block action, effect, tags and advancements; palette rewriting
2018-08-10 19:21:35 -03:00
creeper123123321
dfe1850b93
Merge remote-tracking branch 'upstream/master' into dev
2018-08-10 18:34:32 -03:00
Marco Neuhaus
5c490be861
remove file header
2018-08-09 09:25:00 +02:00
Marco Neuhaus
849c7b4fcf
fix wrong import
2018-08-08 23:35:14 +02:00
Marco Neuhaus
fd5bb94cb5
code cleanup
2018-08-08 22:32:29 +02:00
Marco Neuhaus
647bbbedb0
add items remapping
2018-08-08 21:45:54 +02:00
Marco Neuhaus
6cfb21f660
add support for 18w32a
2018-08-08 18:58:25 +02:00
creeper123123321
c709b019e1
Use ChatRewriter.legacyTextToJson in metadata rewriting
2018-08-06 15:31:05 -03:00
creeper123123321
543daa2628
Rewrite invalid biomes
2018-08-05 17:45:22 -03:00
creeper123123321
3bdf81158a
Rewrite BungeeCord's plugin channel format
2018-08-05 17:26:14 -03:00
Marco Neuhaus
58b30341ee
remove comment headers
2018-08-03 23:15:59 +02:00
Marco Neuhaus
741e0f8fda
add support for 18w31a
2018-08-01 20:20:52 +02:00
creeper123123321
d8885f9156
Put prefix last color into the start of suffix
2018-07-30 08:49:32 -03:00
creeper123123321
e9aa18fd6b
Fix memory leak
2018-07-29 09:34:27 -03:00
creeper123123321
7518f8b98b
Replace Unpooled.buffer()
...
(cherry picked from commit e9159cb2de
)
2018-07-29 09:11:55 -03:00
creeper123123321
e5169378fc
Revert "Replace Unpooled.buffer()"
...
This reverts commit e9159cb
2018-07-29 08:56:26 -03:00
creeper123123321
ca23750c28
merge upstream^2 + lowercase sound ids
2018-07-29 08:31:48 -03:00
creeper123123321
446fd84035
merge upstream
2018-07-29 08:30:58 -03:00
Myles
fc264d0b0f
Cleanup various debug code
2018-07-29 12:14:17 +01:00
Myles
e9ad372039
Remap negative ids to air (workaround for #933 )
2018-07-29 11:48:38 +01:00
creeper123123321
73ee2498e8
More optimization
2018-07-25 18:12:38 -03:00
creeper123123321
6608877ef0
Rewrite palette instead of rewriting each block
2018-07-25 18:03:25 -03:00
creeper123123321
e9159cb2de
Replace Unpooled.buffer()
2018-07-25 09:04:06 -03:00
creeper123123321
a403c7424c
*facepalm*
2018-07-24 10:55:08 -03:00
creeper123123321
de2abdcab0
*facepalm*
2018-07-23 10:20:41 -03:00
creeper123123321
088ce93701
Use short[] for sound remapping
2018-07-23 10:15:55 -03:00
creeper123123321
b5a7c92c8d
Add missing .toClient
2018-07-22 19:11:29 -03:00
creeper123123321
d4144264d5
Use short[] for block mappings
2018-07-22 19:03:22 -03:00
creeper123123321
b221530276
Update Protocol1_13To1_12_2.java
2018-07-22 18:02:17 -03:00
creeper123123321
8476c83d62
Merge branch 'master' into master
2018-07-22 18:01:04 -03:00
Matsv
9d624bc822
Reimplement advancements by rewriting the items to flat items
2018-07-22 22:58:18 +02:00
creeper123123321
f15c841b99
Hacky fix to noteblock
2018-07-22 17:51:18 -03:00
creeper123123321
019bccd24a
Rewrite advancements
2018-07-22 17:06:43 -03:00
creeper123123321
584c0709e8
Block data
2018-07-22 16:24:38 -03:00
creeper123123321
d577088b8c
Named sound effect rewriting + Effect rewriting (thanks @Pokechu22)
2018-07-22 15:15:40 -03:00
Mats
72f5d8addc
Merge pull request #910 from creeper123123321/master
...
Fix bungee-chat italic, bold, obfuscated, underline, strikethrough
2018-07-22 03:24:51 +02:00
Mats
6d959169fa
Merge pull request #914 from Pokechu22/wdl-channels
...
Remap WDL plugin channels
2018-07-22 03:23:33 +02:00
Pokechu22
1e91b21537
Remap WDL plugin channels
2018-07-21 14:18:49 -07:00
Michał Kasprzyk
b64a0b065c
Fix MC|StopSound plugin channel rewriting.
...
(ID of stop sound packet is 0x4C, not 0x4B)
2018-07-21 17:32:30 +02:00
creeper123123321
faf7e5d25f
Fix bungee-chat italic, bold, obfuscated, underline, strikethrough
2018-07-21 11:48:31 -03:00
Gerrygames
bb4b5d3080
Fix reddust particle color for 1.13 clients
2018-07-21 11:18:14 +02:00
dinnerwolph
3646fad197
fix server icon
2018-07-21 02:51:07 +02:00
Myles
7c0c4ee74d
Implement prefix based team colours (based on code by @JollyAjax)
2018-07-20 21:21:24 +01:00
creeper123123321
6c17615ecb
Accept int tag in level
2018-07-20 15:58:04 -03:00
creeper123123321
9a1376dcb3
Accept int tag
2018-07-20 15:54:52 -03:00
creeper123123321
32161333dd
Fix custom enchantments
2018-07-20 15:47:05 -03:00
creeper123123321
e067492cca
Catch exception
2018-07-20 13:23:40 -03:00
creeper123123321
1cdf2ed1ef
Make compatible with older netty
2018-07-20 13:16:34 -03:00
creeper123123321
dc90652853
Memory efficiency
2018-07-20 13:16:33 -03:00
creeper123123321
a2fce6f4a5
Update WorldPackets.java
2018-07-20 10:29:51 -03:00
creeper123123321
78b9e5d833
Fix biomes
2018-07-20 10:26:56 -03:00
creeper123123321
4e2156bd2b
Remove redundant tags
2018-07-20 07:14:51 -03:00
Matsv
7a331bdb09
Rewrite entity names for spawners, fixes #884
2018-07-20 11:15:37 +02:00
Matsv
df32569af6
Flowerpot check for empty strings / return air
2018-07-19 13:18:34 +02:00
Mats
361c36349b
Merge pull request #877 from creeper123123321/master
...
Rewrite StoredEnchantments
2018-07-19 13:13:00 +02:00
Matsv
ddbbb14c72
Correct changed directions for item frames Fixes #874
2018-07-19 11:54:09 +02:00
Matsv
a0899d4776
Fix falling / block dust particles
2018-07-19 09:52:53 +02:00
creeper123123321
4c8761b17b
Rewrite StoredEnchantments
2018-07-19 04:51:38 -03:00
Myles
17564506b5
Temporary force biomes to be ocean
2018-07-18 23:19:13 +01:00
Matsv
dfd18d64c2
Correct directPallette check (Thanks @Pokechu22)
2018-07-18 23:39:23 +02:00
Myles
c3eaf5a1b0
Remove some channel debug
2018-07-18 19:27:39 +01:00
creeper123123321
7ad59b7cb0
Fix banner items
2018-07-18 15:23:46 -03:00
creeper123123321
5d19697004
Fix patterns
2018-07-18 14:43:57 -03:00
Myles
8f7c090a23
Fix javadocs :P
2018-07-18 18:25:43 +01:00
creeper123123321
9232ea4fd6
*facepalm*
2018-07-18 14:15:37 -03:00
creeper123123321
cd9ff95226
1.13!!!!!
2018-07-18 14:12:35 -03:00
creeper123123321
54ad8606dc
Chunk1_13 - not tested
2018-07-18 14:12:35 -03:00
PureGero
3016e774ff
Skulls don't have 'Rot'; Painting names
...
Skulls on walls don't always have a 'Rot' tag if it's rotation is 0.
'DonkeyKong', 'SkullAndRoses' and 'BurningSkull' weren't displaying.
2018-07-18 18:38:11 +10:00
creeper123123321
ba9198bd45
*facepalm*³
2018-07-17 17:51:31 -03:00
creeper123123321
29460a310b
*facepalm*²
2018-07-17 17:49:35 -03:00
creeper123123321
3507c2016a
*facepalm*
2018-07-17 17:44:46 -03:00
creeper123123321
6d996a93c8
Do not create unnecessary tag
2018-07-17 17:40:39 -03:00
creeper123123321
7cd1563805
1.13-pre10, fix flower pots, comment debug message
2018-07-17 17:15:43 -03:00
creeper123123321
17023d6afd
Correct comment
2018-07-17 10:41:05 -03:00
creeper123123321
ca85c9739a
1.13-pre9, RIP BaseProtocol1_13, use Type.VAR_INT_ARRAY
2018-07-16 15:45:41 -03:00
creeper123123321
c47d5dcba6
Changes on plugin channel rewriting
2018-07-15 09:26:26 -03:00
Matsv
7335c8ea98
Fix commandblock minecart
2018-07-15 13:56:42 +02:00
creeper123123321
31a1bf35d9
More changes involving BaseProtocol - not tested yet
2018-07-14 09:11:17 -03:00
creeper123123321
051df7401e
Fix click window packet
2018-07-14 07:53:31 -03:00
creeper123123321
5f1fba0276
1.13-pre8
2018-07-13 15:23:07 -03:00
creeper123123321
9ac3110d3e
it should work
2018-07-12 14:29:15 -03:00
creeper123123321
251f8bccaa
/tableflip
2018-07-11 11:31:56 -03:00
creeper123123321
84d3c0d3e8
update tags packet id
2018-07-11 10:46:42 -03:00
creeper123123321
074aa302bc
missing id changes
2018-07-11 10:13:36 -03:00
creeper123123321
638165aad5
1.13-pre7
2018-07-11 09:47:13 -03:00
creeper123123321
aacce4f77b
Sound rewriting with JSON
2018-07-05 07:34:09 -03:00
creeper123123321
2153377c0e
client to server plugin message rewriting
2018-07-04 17:10:30 -03:00
creeper123123321
006fb177e6
1.13-pre6
2018-07-04 10:50:01 -03:00
creeper123123321
cabc010582
Update mappings
2018-07-04 10:33:37 -03:00
creeper123123321
314af6d000
Brackets.
2018-07-03 11:26:00 -03:00
creeper123123321
697e883649
More BaseProtocol changes
2018-07-03 11:19:32 -03:00
creeper123123321
f81892ea74
BaseProtocol changes
2018-07-03 09:58:00 -03:00
Myles
2c62cc37e7
Merge pull request #844 from creeper123123321/platform-and-sponge-changes
...
Platform and Sponge changes
2018-07-02 22:50:12 +01:00
creeper123123321
e3f71c26e7
1.13-pre5 + revert some changes
2018-07-02 11:36:03 -03:00
creeper123123321
7fda025c0d
maybe cleaner code?
2018-06-28 07:34:56 -03:00
creeper123123321
383cbe15a6
reduce code
2018-06-27 15:08:09 -03:00
creeper123123321
7cace1ee32
fixed flowerpots
2018-06-27 14:27:12 -03:00
creeper123123321
1be25079d4
*facepalm*
2018-06-27 14:16:01 -03:00
creeper123123321
16cc07c020
some modifications
2018-06-27 14:10:37 -03:00
creeper123123321
7d671c2908
Fix BaseProtocol
2018-06-27 09:51:41 -03:00
creeper123123321
df2d9ba3d8
1.13-pre4 + ProtocolPipeline changes
2018-06-27 09:39:38 -03:00
creeper123123321
6f98e35dec
Update BlockStorage
2018-06-22 09:30:11 -03:00
creeper123123321
39419f4ca3
1.13-pre3
2018-06-22 09:19:57 -03:00
creeper123123321
e26b6d08e1
1.13-pre2 + merge master
2018-06-17 10:17:33 -03:00
creeper123123321
cb4fcde6f4
1.13-pre2 + merge master
2018-06-17 10:16:53 -03:00
creeper123123321
f12a210665
Platform and Sponge changes
2018-06-14 15:21:49 -03:00