Commit Graph

943 Commits

Author SHA1 Message Date
KennyTV
814bd9d85e Merge remote-tracking branch 'origin/master' into abstraction 2020-01-15 19:13:33 +01:00
KennyTV
7f0af23f96 Fix 1.11 evocation id
Fixes #1629
2020-01-15 18:53:26 +01:00
Myles
cd2ca76236 Merge branch 'master' into abstraction 2020-01-14 19:12:42 +00:00
KennyTV
538b467fa6 Fix heightmaps 2020-01-14 19:18:02 +01:00
Myles
86af7f054a
Merge pull request #1601 from KennyTV/abstraction
Cleanup some block rewrite methods
2020-01-06 14:56:17 +00:00
KennyTV
3384b6bc17 Only load mappings file from dir if manually copied 2020-01-06 10:52:42 +01:00
KennyTV
4bdb566fb5 Kept the wrong defaults 2020-01-05 21:23:40 +01:00
KennyTV
5ad62a03ed Make plugin channel mappings modifiable 2020-01-05 21:21:58 +01:00
KennyTV
5d974858fe Some more cleanup 2019-12-20 17:53:14 +01:00
KennyTV
fddbeda81e Back to snapshot 2019-12-20 16:29:10 +01:00
KennyTV
1c1ec10a0a Common methods for block rewriting 2019-12-17 18:29:38 +01:00
Myles
cd9566fbc8 1.15.1 support 2019-12-17 15:28:43 +00:00
KennyTV
5a1dadf476 1.15.1 2019-12-17 14:54:51 +01:00
Myles
6eabb17f67 Merge from master 2019-12-15 09:16:53 +00:00
Myles
4f72edeaee Merge branch 'master' into dev 2019-12-15 09:02:48 +00:00
Robin Brämer
f35b931004
fix typo 2019-12-14 22:01:50 +01:00
KennyTV
9c8a8e2e9c Fix book edit 2019-12-14 16:22:24 +01:00
Myles
d5907711e1
Merge pull request #1576 from astei/remove-unneeded-indirection
Remove unneeded indirection
2019-12-13 08:30:22 +00:00
Andrew Steinborn
437463f1b4 Revert "Remove indirection in byte array writing"
This reverts commit ba08c3ad2f.

Breaks the API that ViaRewind and ViaBackwards depend on.
2019-12-12 20:45:03 -05:00
creeper123123321
d6b52bcc54 Merge remote-tracking branch 'upstream/abstraction' into primitive_types 2019-12-12 15:23:32 -03:00
KennyTV
be4d071250 1.15.1-pre1 2019-12-12 16:32:53 +01:00
Andrew Steinborn
ba08c3ad2f Remove indirection in byte array writing
This saves us from the cost of (un)boxing bytes on the fly.
2019-12-12 00:02:09 -05:00
Andrew Steinborn
220c45b800 Remove indirection in StringType decoding 2019-12-11 23:55:44 -05:00
Andrew Steinborn
a42e724f50 Remove unneeded indirection in NBTType
ByteBufInputStream implements DataInput, ByteBufOutputStream implements DataOutput. Use them to exploit native Netty ByteBuf calls where possible.
2019-12-11 23:51:39 -05:00
KennyTV
1002ca4016 Fix biomedata on some custom Spigot versions 2019-12-11 20:36:49 +01:00
Myles
c1b11a55d5 Back to SNAPSHOT 2019-12-11 11:16:05 +00:00
Myles
a21a2079c6 2.2.1 2019-12-11 11:12:22 +00:00
KennyTV
b7b8bdc841 Ignore unneeded sound warnings 2019-12-11 12:07:22 +01:00
KennyTV
5f46dcbab0 Merge remote-tracking branch 'upstream/master' into abstraction
# Conflicts:
#	bukkit/pom.xml
#	bungee/pom.xml
#	common/pom.xml
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
#	common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
#	jar/pom.xml
#	pom.xml
#	sponge-legacy/pom.xml
#	sponge/pom.xml
#	velocity/pom.xml
2019-12-11 09:53:09 +01:00
KennyTV
dfbe2e9739 Fix acknowledge digging
Fixes #1564
2019-12-11 09:30:51 +01:00
Gerrygames
84624a4884 fix entity metadata in spawn packet being ignored 2019-12-11 02:10:16 +01:00
Myles
68ac978d45 Back to SNAPSHOT 2019-12-10 15:34:42 +00:00
Myles
8136eb15e1 Merge 1.15 support 2019-12-10 15:31:07 +00:00
Myles
c85d4224ad 1.15 protocol + 2.2.0 2019-12-10 15:29:26 +00:00
KennyTV
9dae40f455 Fix trade list 2019-12-09 19:30:09 +01:00
Gerrygames
44a3108982 fix wrong import - #1560 2019-12-09 19:24:18 +01:00
Gerrygames
ea045e6c34 1.15-pre7 2019-12-09 13:48:06 +01:00
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