Commit Graph

1214 Commits

Author SHA1 Message Date
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
creeper123123321
875d2392b5 Fix position shifting, fix two layers of item copy 2019-11-27 16:39:06 -03:00
KennyTV
a68eac7cd2 Add set cooldown register in ItemRewriter 2019-11-27 12:56:20 +01:00
KennyTV
42efec6e2b Add version to entity type warning 2019-11-27 00:55:33 +01:00
KennyTV
bcb953a45a Fix 1.15 chunk read 2019-11-27 00:08:28 +01:00
KennyTV
bca5b43a2a Fix entity type 2019-11-26 23:59:23 +01:00
KennyTV
da704539f0 Rename suppress-warning config option 2019-11-26 20:14:56 +01:00
KennyTV
bd9a1dda88 Fix last config issues 2019-11-26 18:22:33 +01:00
KennyTV
915258169e Fix inverted array read check 2019-11-26 13:51:37 +01:00
KennyTV
1b207251e8 Add extra mappings constructor for VB 2019-11-25 22:41:59 +01:00
KennyTV
48feee2bfc Destroy 1.15 entities 2019-11-25 20:40:03 +01:00
KennyTV
08e145f831 1.15-pre2 2019-11-25 19:37:02 +01:00
KennyTV
21cad97f3f Some fixes, move blockconnection method to bukkit config 2019-11-25 18:34:55 +01:00
creeper123123321
1e8d04a07d remove deprecated methods and constructor on item and position, inline some uses of position 2019-11-24 17:55:46 -03:00
creeper123123321
a8a33a3a2b add exception for wrong protocol 2019-11-24 09:04:37 -03:00
Gerrygames
c478492227 fix missing boss bar packet remap 2019-11-24 11:52:04 +01:00
creeper123123321
beed8437a4 merge dev 2019-11-23 07:23:20 -03:00
KennyTV
501adc503c Fix typo in simulatePlayerTick getter 2019-11-22 22:39:34 +01:00
KennyTV
907516eb71 Hold config values in fields 2019-11-22 22:00:41 +01:00
creeper123123321
9308fc7712 Fix wrong casting 2019-11-22 15:19:25 -03:00
creeper123123321
062d3759be Use primitive types in Position and BlockFace, remove world block connections on Sponge, clean code in 1.8 entity tracker, add constructor for cloning Item and Position 2019-11-22 15:13:41 -03:00
Gerrygames
582e4a11d4 1.15 pre1 2019-11-21 18:34:29 +01:00
Myles
285744a274
Merge pull request #1520 from creeper123123321/dev
19w46b
2019-11-20 12:59:16 +00:00
Myles
ed5702188c
Merge pull request #1515 from ForceUpdate1/dev_particle_type
Fix area effect cloud
2019-11-20 12:12:43 +00:00
creeper123123321
f9165a1b64 fixed mappings 2019-11-15 12:30:47 -03:00
creeper123123321
bd0ce3dd71 merge dev 2019-11-15 11:35:35 -03:00
creeper123123321
385a483a29 19w46b 2019-11-15 11:19:31 -03:00
Marco Neuhaus
3b97f843cd relocate classes 2019-11-13 22:28:23 +01:00
Gerrygames
c3fa950a9f 19w46a 2019-11-13 17:27:51 +01:00
Marco Neuhaus
000313ee9a move particle type 2019-11-11 12:29:51 +01:00
Marco
dc54551d0c fix area effect cloud
add 1.14 particle type
2019-11-10 16:38:12 +01:00
KennyTV
b3dc05e5ce 19w45b 2019-11-08 14:26:20 +01:00
Gerrygames
d16a760466 19w45a 2019-11-07 18:42:05 +01:00
creeper123123321
3761ebf8c7 Pot handler rewrite 2019-11-04 17:36:16 -03:00
Myles
a7d78f7f69
Merge pull request #1503 from creeper123123321/abstraction-update
Abstraction update
2019-11-02 14:28:58 +00:00
creeper123123321
1735f48f23 primitive array types 2019-11-02 10:00:27 -03:00
creeper123123321
ce4ae73f55
forgotten merge conflict 2019-10-30 14:30:36 -03:00
creeper123123321
fd065fb7c5
merge dev 2019-10-30 14:24:22 -03:00
Myles
5ad2511e17
Merge pull request #1502 from ViaVersion/master
Merge master into dev
2019-10-30 16:59:47 +00:00
Gerrygames
12279731ad 19w44a 2019-10-30 17:14:00 +01:00
MrMicky
ee54e153bf Fix item hover event for 1.12 players 2019-10-23 16:11:14 +02:00
creeper123123321
9ea6c34543 use setflatblock 2019-10-19 15:35:34 -03:00
creeper123123321
005c91eb4d deduplicate minecraft compact array code/decode 2019-10-19 15:31:50 -03:00
Gerrygames
bd805bfdc4 19w42a 2019-10-16 18:07:58 +02:00
Gerrygames
3ffc55b539 19w41a 2019-10-09 18:06:37 +02:00
MrMicky
96c58e7b1c Fix scoreboard colors on 1.13 2019-10-08 13:25:37 +02:00
KennyTV
c8171b3f43 Item rewriter cleanup 2019-10-05 09:17:10 +02:00
KennyTV
626eb14960 Fix an error in the player spawn packet 2019-10-04 13:26:51 +02:00
KennyTV
c131672870 Fix 2019-10-03 11:00:55 +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
79a2304728 19w40a 2019-10-02 16:19:56 +02:00
KennyTV
48edd01461 Readd second cancelOutgoing method for VB 2019-10-02 15:55:59 +02:00
KennyTV
3adffdc438 Minor fix 2019-10-02 15:14:03 +02:00
KennyTV
655ef137c1 Cleanup more entity tracking and rewriting 2019-10-02 15:09:50 +02:00
KennyTV
b11456d86b Helper methods for cancelling packets 2019-10-02 11:17:55 +02:00
KennyTV
42a7b5a1b2 Merge upstream/dev into abstraction 2019-10-02 09:50:51 +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
Nassim
7e323bc497 Untrack entities in 1.14.1 protocol (#1474) 2019-10-01 21:07:42 +01: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
4e7c520abe Entity tracker and rewriter cleanup (#1464) 2019-09-27 19:25:18 +01:00
Gerrygames
dce64a0b34 19w39a (#1465) 2019-09-27 16:17:40 +01:00
Nassim
aa9a1df1ab Actually fix zombie sound rewrites (#1463) 2019-09-26 20:14:54 +01:00
Nassim
4537aaf339 Fix some sound rewrites (#1462)
Resolves #1434
2019-09-26 19:46:48 +01:00
Nassim
44a4ffb26a Migrate to Java optionals (#1458)
* Add fromEntityType method to 1.13 objecttypes

* Migrate guava optionals to java optionals
2019-09-21 10:57:28 +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
MrMaurice211
0c95eaa1c3 Added forge mappings. (#1452) 2019-09-12 08:08:28 +01:00
Gerrygames
c1cce6be9a 19w37a (#1451)
* 19w36a

* 19w37a
2019-09-11 16:09:44 +01:00
Nassim
0afcb893e3 Fix plugin message pattern (#1448) 2019-09-11 13:51:17 +01:00
Nassim
3c436c0259 Fix entity equipment packet for 1.9+ clients (#1449) 2019-09-10 17:09:11 +01:00
Nassim
8b6b3c77e4 Relieve the lightconversion of a little work (#1433) 2019-09-09 13:02:42 +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
ea25b559ed 19w35a (mappings for 34a still missing) 2019-08-28 19:28:23 +02:00
KennyTV
ad8e723005 Mapping and protocolregistry cleanup 2019-08-23 22:14:32 +02:00
KennyTV
4542e9511b Set some object fields to finals, use lambdas 2019-08-23 22:13:37 +02:00
KennyTV
c4b23b8c87 Merge remote-tracking branch 'upstream/master' into abstraction 2019-08-23 21:20:13 +02:00
KennyTV
6f19d2d6d1 Start working on 19w34a 2019-08-23 21:15:38 +02:00
Gerrygames
7cb4e1d00e Fix explosion block desync, fixes #1365 (#1419)
* fix explosion block desync, fixes #1365

* Remove unused import
2019-08-14 09:37:54 +01:00
Thom
99ac42c168 Issue with the CanDestroy taglist (#1411)
* Fix for an issue with the CanDestroy tag

The CanDestroy taglist didn't go to lowercase when a 1.13+ user plays on a server equal to 1.12.2 or lower causing the taglist to not work any longer for items written in caps, this while a 1.12.2 client can use the item with the in caps written CanDestroy taglist on the server

* Added Locale.ROOT to the toLowerCase()

* Added the same functionality to CanPlaceOn
2019-07-29 11:19:30 +01:00
Myles
437b16ccd5 Merge branch 'dev' 2019-07-19 11:20:24 +01:00
KennyTV
abb09153f0 1.14.4 2019-07-18 16:40:34 +02:00
KennyTV
05437a3e70 Fix 1.14 client lag on join 2019-07-16 20:44:56 +02:00
KennyTV
bc09187dc1 1.14.4-pre6 support 2019-07-15 14:58:55 +02:00
KennyTV
2024614b68 1.14.4-pre1 support 2019-07-03 19:36:30 +02:00
Myles
3521f9ac36 Merge branch 'master' into abstraction 2019-06-28 22:02:48 +01:00
creeper123123321
ae7fcbc8ad trying to fix inconsistent types in block placement 2019-06-24 17:14:01 -03:00
Myles
b675018acf
Merge pull request #1375 from KennyTV/master
Fix 1.13 clients unable to break infested blocks (#1370)
2019-06-24 20:37:08 +01:00
Myles
10984cbeb7 Merge branch 'master' into abstraction 2019-06-24 16:24:42 +01:00
Myles
e4750249e9 1.14.3 support 2019-06-24 16:14:31 +01:00
KennyTV
662bae45b7 Fix 1.13 clients unable to break infested blocks (#1370) 2019-06-22 16:07:38 +02:00
Myles
c0e56c7c19 1.14.3 Pre-4 support 2019-06-19 23:11:54 +01:00
Myles
390653a9a6 Merge branch 'master' into abstraction 2019-06-19 09:42:01 +01:00
Myles
0cd04381a4 Merge branch 'master' into dev 2019-06-19 09:41:06 +01:00
Gerrygames
3063538ad0 fix 1.13 chunk reading, fix 1.9 chunk type not using global palette 2019-06-14 17:50:14 +02:00
KennyTV
1c9309ac98 1.14.3 pre-3 2019-06-14 11:17:38 +02:00
Myles
e7c89f28ba
Merge pull request #1363 from KennyTV/dev
1.14.3 pre-2
2019-06-07 13:41:30 +01:00
KennyTV
97a8f41e12 1.14.3 pre-2 2019-06-07 12:36:37 +02:00
Myles
be5bf7961e Merge branch 'master' into dev 2019-06-05 15:56:29 +01:00
Myles
318db58be1 Servers older than 1.13.2 have a length limit on plugin message name 2019-06-05 15:55:55 +01:00
KennyTV
907b5e020c Change new trade list boolean 2019-06-03 21:20:32 +02:00
KennyTV
a8d13fadb3 1.14.3 pre-1 2019-06-03 20:21:33 +02:00
Myles
0137105a6d Fix #1358 by checking for null before processing 2019-05-31 20:43:02 +01:00
Myles
5364d89ca8 Implement hashCode for version 2019-05-27 18:10:57 +01:00
Myles
744fa25349 Fix several NPE cases, apply final to relevant fields, remove unused code
The suggested changes were found with FindBugs, some of these bugs may be rare cases.
2019-05-27 17:50:08 +01:00
Myles
3027490256 Merge branch 'master' into abstraction 2019-05-27 17:29:04 +01:00
Myles
4fb0738c1a
Merge pull request #1356 from Gerrygames/1.14.2
1.14.2
2019-05-27 13:24:38 +01:00
Gerrygames
e8f4f7049b 1.14.2 2019-05-27 14:23:00 +02:00
Gerrygames
eb9e48ecdc 1.14.2-pre4 2019-05-24 18:25:55 +02:00
KennyTV
894503d56b Fix minecart mapping 2019-05-22 18:35:50 +02:00
KennyTV
b2c1c24902 1.14.2-pre3 2019-05-22 16:54:25 +02:00
KennyTV
7fcb489f38 Add dolphin to Entity1_13Types 2019-05-22 15:25:42 +02:00
Myles
10b0a6fbb6 Merge branch 'master' into dev 2019-05-21 18:07:00 +01:00
Myles
b0fc69c308
Merge pull request #1339 from KennyTV/abstraction
Remove duplicated code in configs and EntityType
2019-05-21 17:49:53 +01:00
Andrew Steinborn
232ee9b63b Don't try to send register messages without channels
Bukkit interprets this as attempting to register the channel "" (the
empty string), which fails on Minecraft 1.13 and above.
2019-05-17 18:01:58 -04:00
KennyTV
d7aa23681b 1.14.2-pre2 2019-05-17 15:15:21 +02:00
Myles
b75016a186 Merge branch 'master' into dev 2019-05-17 11:59:59 +01:00
Myles
6882b7074c Fix #1333 pandas missing 2019-05-17 11:59:46 +01:00
Gerrygames
a075e31a4e 1.14.2-pre1 2019-05-16 19:21:26 +02:00
Myles
bdd32688fa
Merge pull request #1330 from kashike/cleanup
Reduce duplication in various classes
2019-05-15 22:24:27 +01:00
KennyTV
82da5e5a60 Fix MappingData reference 2019-05-15 13:37:23 +02:00
KennyTV
a191d0de16 Reduce code duplication MappingData in (also regarding future versions) 2019-05-15 13:32:29 +02:00
KennyTV
ae6cff5325 Remove deprecated config methods 2019-05-15 12:48:40 +02:00
KennyTV
eb9520cdc3 Reduce duplicated code in config classes 2019-05-15 12:22:56 +02:00
KennyTV
f8f20097a9 Move some default methods to EntityType 2019-05-15 12:04:56 +02:00
Myles
a6e1488545
Merge pull request #1331 from Gerrygames/abstraction
Java 8, FunctionalInterface remapper
2019-05-15 09:21:33 +01:00
kashike
34c009e4e5 Reduce duplication in various classes 2019-05-14 13:56:50 -07:00
Gerrygames
6e4516272b fix missing final declaration 2019-05-14 10:27:55 +02:00
Gerrygames
2e37175dc2 1.14.1 abstraction 2019-05-14 10:21:50 +02:00
Gerrygames
f25442337d Merge remote-tracking branch 'Myles/master' into abstraction_1.14.1 2019-05-14 10:15:58 +02:00
Gerrygames
77d572190e 1.14.1 2019-05-13 14:00:37 +02:00
Gerrygames
18f7459070 Java 8, FunctionalInterface remapper 2019-05-13 12:43:38 +02:00
Gerrygames
e8f8473e1c IEntityType -> EntityType 2019-05-13 12:04:03 +02:00
Myles
1d0d032431 Merge branch 'master' into dev 2019-05-12 13:01:08 +01:00
Myles
fac7dafca5 Use fixed locale for toUpperCase/toLower #1126 2019-05-12 13:00:14 +01:00
creeper123123321
a51f347371
Use readableBytes 2019-05-10 16:02:17 -03:00
Gerrygames
1fe3c337e1 1.14-pre2 2019-05-09 17:26:56 +02:00
Gerrygames
2442520ef3 use spaces 2019-05-09 15:07:20 +02:00
Gerrygames
44183f19cd @Override and protected 2019-05-09 14:46:24 +02:00
Gerrygames
23b68a867c abstract MetadataRewriter 2019-05-09 14:43:48 +02:00
creeper123123321
4d16dbf76f
Not tested workaround for #1312 2019-05-08 20:38:55 -03:00
Gerrygames
6911d061a7 abstract EntityTracker 2019-05-08 12:14:41 +02:00
Gerrygames
3b932bd6b3 1.14.1 pre1 2019-05-07 18:19:34 +02:00
creeper123123321
5a2c047e7a
Register tabcompletethread once - fixes #1316 2019-05-05 14:16:24 -03:00
creeper123123321
e249ea1f0a
fix tag ids - not tested 2019-05-01 16:54:09 -03:00
creeper123123321
e1b06d3872
Add some needed tags 2019-05-01 16:37:17 -03:00
creeper123123321
ad12866bf4
Send set view distance on server change - not tested 2019-05-01 12:52:53 -03:00
creeper123123321
6b58d86248
Make PipelineUtil.containsCause check if the instance is of the class type 2019-05-01 11:31:36 -03:00
creeper123123321
7f6069e76b
Send light update before chunk packet, maybe better ByteBuf releasing, ignore cancel exception on UserConnection#send 2019-05-01 11:15:48 -03:00
Myles
04d5ae074a
Merge pull request #1305 from creeper123123321/master
Pose handling for 1.14
2019-04-30 22:00:29 +01:00
Gerrygames
06340e593d faster light writing 2019-04-29 19:02:14 +02:00
creeper123123321
6d8a763f4c
Don't send pose to the client entity 2019-04-27 17:39:45 -03:00
creeper123123321
61b5c90aa7
Recalculate pose when using or leaving bed 2019-04-27 17:21:01 -03:00
creeper123123321
d7eff51805
Not tested pose handling 2019-04-27 16:23:24 -03:00
Myles
da7a57026d
Merge pull request #1303 from KennyTV/master
Some minor optimization
2019-04-27 18:47:46 +01:00
creeper123123321
13086c7cac
Fixed connecting after sending the packet 2019-04-27 14:03:48 -03:00
KennyTV
d76e70b1f7 Don't cache Item 2019-04-27 18:59:18 +02:00
KennyTV
c7c5c79365 Some minor optimization 2019-04-27 18:36:01 +02:00
creeper123123321
87eceb5264
Use cached cancel exception when not in debug mode 2019-04-27 13:34:35 -03:00
creeper123123321
7b29972af0
Fix wrong protocol class 2019-04-27 13:12:19 -03:00
creeper123123321
4258f52f86
Workaround for packet order issue in neighbour chunk updates 2019-04-27 13:03:53 -03:00
Myles
63fc733c88
Merge pull request #1292 from Gerrygames/palette_fix
fix setPaletteEntry
2019-04-25 22:53:07 +01:00
Gerrygames
c8a19a1d83 fix setPaletteEntry 2019-04-25 22:16:19 +02:00
KennyTV
6ab525be7b Fix blockconnection 2019-04-25 22:05:32 +02:00
Myles
fd1932cfd8
Merge pull request #1288 from creeper123123321/master
Fix husks
2019-04-25 11:44:41 +01:00
KennyTV
ac1943758d Remove unnecessary heightmap entries 2019-04-25 12:11:14 +02:00
KennyTV
1f86c6ab21 Slightly reduce map lookups 2019-04-25 11:50:55 +02:00
creeper123123321
44f8f5e66d
Fix husks 2019-04-24 18:37:29 -03:00
creeper123123321
0380d80138
Force resend center chunk on respawn 2019-04-24 15:45:28 -03:00
Gerrygames
53a639e7ae 1.14 heightmap 2019-04-24 18:40:03 +02:00
creeper123123321
8d85106ee8
Set center chunk to 0,0 on respawn 2019-04-23 18:52:46 -03:00
Myles
2e289a1d18 Fix encoding of position
Huge thanks to those involved on this goose hunt.
2019-04-23 22:15:05 +01:00
Myles
b4418c02ca Fix Entity Tracker on Bungee being incorrect after server switch #1215 2019-04-23 21:29:51 +01:00
Myles
05e056a28b Cancel packets correctly so they don't mess bungee up 2019-04-23 17:28:26 +01:00
Myles
34b0db57ae Get ready.... 2019-04-23 16:16:49 +01:00
Myles
0c9de82e99 Merging went wrong 2019-04-23 16:02:18 +01:00
Myles
11ce8524ac Merge with master 2019-04-23 15:40:47 +01:00
Myles
4a8534c164 Refactor class names for protocols
The inconsistency was too much for me.
2019-04-23 15:34:17 +01:00
Myles
c3e406e95b Workaround villager packet causing issues 2019-04-23 13:02:18 +01:00
Myles
dad71f1179 Rewrite inventory names which use .name syntax 2019-04-23 10:30:21 +01: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
Gerrygames
a4085c1a5a only update center chunk when needed 2019-04-22 11:42:42 +02:00
creeper123123321
4eb69eac66
Run zombie rewrite before zombie villager rewrite 2019-04-21 16:50:41 -03:00
creeper123123321
8b5f6d1e67
fixed some metadata 2019-04-21 16:32:59 -03:00
creeper123123321
3a4db0a675
fixed 2019-04-21 15:57:40 -03:00
creeper123123321
b2352105e6
Handle new attack mode flag in insentient 2019-04-21 15:34:23 -03:00
KennyTV
f2628097ce Remap areaeffectcloud particles 2019-04-21 20:03:07 +02:00
KennyTV
d7353e01b0 Remove ')' 2019-04-21 18:52:53 +02:00
KennyTV
6674423ea4 Merge branch 'dev' of https://github.com/ViaVersion/ViaVersion into dev 2019-04-21 18:51:07 +02:00
creeper123123321
e34c291bd6
fix velocity in item and arrow 2019-04-21 13:46:17 -03:00
KennyTV
6c39966fef Fix tridents 2019-04-21 18:36:21 +02:00
Gerrygames
f64d5446a4 1.14 Pre-Release 5 2019-04-18 14:18:48 +02:00
Gerrygames
8c27ead19e 1.14 Pre-Release 3 2019-04-16 16:22:58 +02:00
Gerrygames
ea5ab1c2f5 1.14 Pre-Release 2 2019-04-13 11:45:22 +02:00
creeper123123321
6d1464d3f4
fix leave bed 2019-04-10 16:48:21 -03:00
creeper123123321
2d6defba11
Resync the inventory when selecting trade
Closes #1237
2019-04-10 15:05:27 -03:00
Gerrygames
4c6ee807a7 fix horse equipment packet id 2019-04-10 17:43:42 +02:00
Gerrygames
afe767c6db 1.14 Pre-Release 1 2019-04-10 17:28:12 +02:00
Gerrygames
c51373dc9a fix open sign editor 2019-04-07 15:39:10 +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
creeper123123321
cf3eb8b993
More plugin messages 2019-04-06 09:05:23 -03:00
creeper123123321
d9e057eb4f
Use set center chunk packet 2019-04-05 17:13:26 -03:00
Myles
33cd80da7e
Merge pull request #1244 from Gerrygames/1.14
19w14b
2019-04-05 17:50:37 +01:00
Gerrygames
8231b3aebe 19w14b 2019-04-05 18:48:38 +02:00
KennyTV
91687339bf Actually fix book opening 2019-04-04 20:28:02 +02:00
Gerrygames
3ef8aa9e7f 19w14a 2019-04-03 19:39:39 +02:00
creeper123123321
77acdc1a17
Fix invisible renamed banners 2019-04-02 15:40:19 -03:00
Myles
aecf9fb9b1
Merge pull request #1236 from ViaVersion/master
merge master into dev
2019-03-30 18:23:09 +00:00
Myles
c8d1304e7f
Merge pull request #1230 from creeper123123321/dev2
read nbt in 1.14 chunk, pose metatype, don't change ping protocol if …
2019-03-30 14:07:22 +00:00
creeper123123321
6751acb6c4
Generated mappings for 13b 2019-03-30 10:00:54 -03:00
creeper123123321
475fb97730
19w13b and workaround for chunks not loading near to world border on 1.13.2 on join 2019-03-30 09:26:31 -03:00
Gerrygames
acee33aae6 fix chunk loading in 19w13a 2019-03-27 20:16:26 +01:00
Gerrygames
65f60098c8 19w13a 2019-03-27 19:08:53 +01:00
creeper123123321
19a75abaf3
read nbt in 1.14 chunk, pose metatype, don't change ping protocol if different from provider 2019-03-24 13:07:03 -03:00
creeper123123321
0f49ce2f9d
Update OpenNBT 2019-03-24 10:59:51 -03:00
creeper123123321
e03db26530
Fix numeric ids that doesn't need string remap 2019-03-23 16:23:15 -03:00
creeper123123321
3fd3777e8c
Don't connect fences to stairs 2019-03-22 15:18:41 -03:00
creeper123123321
c5e0fcae9a
convert numerical ids to string ids on canplaceon/candestroy 2019-03-21 17:48:14 -03:00
Gerrygames
56b5986fc5 19w12b 2019-03-21 17:04:33 +01:00
Gerrygames
e0b88b750d 19w12a 2019-03-20 14:27:28 +01:00
creeper123123321
4e28a10aaa
ignore non-identifier format on plugin messages 2019-03-18 15:11:35 -03:00
Myles
49205f0361 Merge branch 'master' into dev 2019-03-18 11:30:19 +00:00
Myles
47819180c4 Rework previous commit + Introduce injection information to dump 2019-03-18 11:30:02 +00:00
Myles
be3fa19c0a Consistency: itruncate1_14Books -> isTruncate1_14Books 2019-03-17 16:11:36 +00:00
Myles
32a2734082 Merge branch 'master' into dev 2019-03-17 16:10:38 +00:00
Myles
ee5eb59e42 Revert unnecessary synchronizes in ListWrapper
Usually the list we're wrapping is synchronized, so instead we'll ensure our code can be run concurrently.

There might be issues with other plugins and this change (but it's unlikely), open a issue if you see any of these after this change.
2019-03-17 16:04:13 +00:00
Gerrygames
d44ecaabf7 send difficulty instead of ignoring it 2019-03-13 19:03:22 +01:00
Gerrygames
f8df3239d5 "fix" trade list 2019-03-13 18:07:09 +01:00
Gerrygames
f9d957a827 19w11a 2019-03-13 17:53:17 +01:00
creeper123123321
bef3e3d18f
process translate on command block entity 2019-03-10 16:36:30 -03:00
creeper123123321
aca764c288
fix command block #1212 2019-03-10 16:18:41 -03:00
creeper123123321
3c0282b04f
Fix missing villager sound remap 2019-03-10 07:30:09 -03:00
KennyTV
53ca96f158 Fix particles 2019-03-07 23:59:31 +01:00
KennyTV
f8895c7c78 Try to fix particles 2019-03-07 23:11:09 +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
15fec93bf1 Fix minecart data 2019-03-04 16:42:22 +01:00
Myles
64d2de010d Fix Minecart typo (thanks KennyTV) 2019-03-04 11:37:38 +00:00
Myles
ad1cd2c993
Merge pull request #1208 from KennyTV/dev
Add option to truncate edited books with more than 50 pages on 1.14
2019-03-04 09:34:41 +00:00
KennyTV
687de97fcd Use read instead of passthrough 2019-03-04 10:30:06 +01:00
KennyTV
9d0331e190 Add option to truncate edited books with more than 50 pages 2019-03-04 10:14:52 +01:00
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
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
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