3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-14 03:50:10 +01:00
Commit graph

185 Commits

Autor SHA1 Nachricht Datum
KennyTV
b03dfa9951
20w16a 2020-04-15 17:53:02 +02:00
KennyTV
721808d71d 20w15a 2020-04-08 16:15:53 +02:00
KennyTV
0ee6369884 20w14a, entity name fixes, abstract tag rewriter 2020-04-02 21:03:05 +02:00
KennyTV
875b85b0fc 20w13a 2020-03-25 19:42:06 +01:00
KennyTV
a7ab4153ef 20w12a 2020-03-18 19:15:58 +01:00
KennyTV
7887e10bb6 20w11a 2020-03-11 22:14:08 +01:00
KennyTV
2bf69c2df2 20w10a 2020-03-04 18:07:49 +01:00
KennyTV
efbc246a72 20w09a 2020-02-26 18:50:30 +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
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
2184ef19ca 20w06a, more cleanup 2020-02-05 20:09:06 +01:00
Jo0001
bf15415185
Add link to krusics "Blocked Version Generator" 2020-02-01 20:26:03 +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
5ad62a03ed Make plugin channel mappings modifiable 2020-01-05 21:21:58 +01:00
KennyTV
da704539f0 Rename suppress-warning config option 2019-11-26 20:14:56 +01:00
creeper123123321
bd0ce3dd71 merge dev 2019-11-15 11:35:35 -03: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
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
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
Nassim
9408946b36 Merge master into abstraction (#1457) 2019-09-19 10:22:06 +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
Nassim
5eb3771704 Fix no light for non full blocks (#1414) 2019-09-09 13:02:30 +01:00
BlackBeltPanda
9fd4795cb3 Update mapping-lang-1.12-1.13.json (#1439)
Fixes Tool Smith and Weapon Smith Villager names
2019-09-08 16:01:35 +01:00
Gerrygames
23eadaeaee 19w36a (#1435) 2019-09-04 16:49:27 +01:00
KennyTV
f35eb3054c Finish 19w35a 2019-08-29 19:56:30 +02:00
KennyTV
6f19d2d6d1 Start working on 19w34a 2019-08-23 21:15:38 +02:00
KennyTV
ac1943758d Remove unnecessary heightmap entries 2019-04-25 12:11:14 +02:00
Gerrygames
53a639e7ae 1.14 heightmap 2019-04-24 18:40:03 +02: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
Myles
421a5e8141 Merge branch 'master' into dev 2019-04-06 13:31:44 +01:00
Myles
9fe19e763a Update GitHub + chat links 2019-04-06 13:31:33 +01:00
Myles
aecf9fb9b1
Merge pull request #1236 from ViaVersion/master
merge master into dev
2019-03-30 18:23:09 +00:00
creeper123123321
6751acb6c4
Generated mappings for 13b 2019-03-30 10:00:54 -03:00
Gerrygames
65f60098c8 19w13a 2019-03-27 19:08:53 +01:00
creeper123123321
c5e0fcae9a
convert numerical ids to string ids on canplaceon/candestroy 2019-03-21 17:48:14 -03:00
Gerrygames
e0b88b750d 19w12a 2019-03-20 14:27:28 +01: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
Gerrygames
31550bd010 19w09a 2019-02-27 17:03:38 +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
Myles
f1743e5912
Merge pull request #1186 from creeper123123321/tabdelay
Tab delaying
2019-02-10 16:42:05 +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
KennyTV
bafa6edd28 Fix some stair and lever connections 2019-02-03 00:22:49 +01:00
Gerrygames
91d9f99c70 19w05a 2019-01-30 17:16:06 +01:00
Gerrygames
b7f72bf55d 19w04a 2019-01-24 16:56:59 +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
f6932e09f7 fix lever mapping 2019-01-18 14:07:27 +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
Myles
6b7bf843a1 Merge branch 'master' into dev 2019-01-09 16:30:29 +00: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
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
Gerrygames
134987cb20 18w49a 2018-12-06 09:32:53 +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
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
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
creeper123123321
cfd3179cb8
try to eat less ram 2018-11-11 11:57:33 -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
9fac4f9de4 18w45a 2018-11-08 13:43:38 +01:00
Myles
6457ff315f Merge branch 'pr/987' 2018-09-23 18:43:29 +01: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
Myles
2510751fdf Introduce 'suppress-1_13-conversion-errors' option 2018-08-21 16:26:04 +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
Myles
7c0c4ee74d Implement prefix based team colours (based on code by @JollyAjax) 2018-07-20 21:21:24 +01: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
5f1fba0276
1.13-pre8 2018-07-13 15:23:07 -03:00
creeper123123321
aacce4f77b
Sound rewriting with JSON 2018-07-05 07:34:09 -03:00