Commit Graph

959 Commits

Author SHA1 Message Date
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
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