Commit Graph

1644 Commits

Author SHA1 Message Date
Myles
54b35ef075 Merge branch 'master' into dev 2018-12-05 19:02:50 +00:00
Myles
fba0a59324
Merge pull request #1107 from creeper123123321/master
Change Chunk#getBiomeData() to int[]
2018-12-05 19:01:25 +00:00
creeper123123321
c5c7d36bd1
Change Chunk#getBiomeData() to int[] 2018-12-05 16:52:53 -02:00
Myles
83ba55dda5
Merge pull request #1104 from Gerrygames/block-connections-master
fix BlockConnectionStorage not being initialized
2018-12-03 08:26:46 +00: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
Myles
4023f2412d
Merge pull request #1093 from Gerrygames/block-connections-master
Implement 'serverside-blockconnection' for block-connections.
2018-12-02 12:28:58 +00:00
Myles
27d56caa48
Merge pull request #1100 from creeper123123321/master
Make Travis test compiling with Java 11
2018-11-29 15:36:14 +00:00
Myles
0cc1146f0e
Merge pull request #1103 from Gerrygames/1.14
18w48a
2018-11-29 15:34:53 +00:00
Gerrygames
8aa7b749ca 18w48a 2018-11-29 16:31:39 +01:00
creeper123123321
55fad45a6c
Update Lombok to make compile on Java 11 2018-11-26 16:30:18 -02:00
creeper123123321
22cc12e7a9
Try to compile with Java 11 2018-11-26 16:30:12 -02:00
Myles
2812b121ab
Merge pull request #1099 from creeper123123321/master
Fix Velocity platform breaking changes
2018-11-26 18:02:41 +00:00
creeper123123321
ad3465f0d3
Fix Velocity platform breaking changes 2018-11-26 15:58:17 -02:00
Marco Neuhaus
fc8b55dce7 fix spelling mistake 2018-11-24 18:42:00 +01:00
Myles
62d67e9a38
Merge pull request #1095 from Gerrygames/1.14
18w47a
2018-11-21 16:23:30 +00: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
Myles
66d836739c
Merge pull request #1092 from Gerrygames/chunk-refactor
Chunk refactor
2018-11-17 13:14:27 +00:00
Myles
ab1c44c4fb Propose 2.0.0 snapshot as this version contains several API breaking changes 2018-11-17 13:13:55 +00:00
Myles
8549c22567 Change the name of the config class to be more consistent 2018-11-17 13:12:19 +00:00
Myles
d0300de136 Prevent initialization error 2018-11-17 13:08:51 +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
Myles
75664961b8
Merge pull request #1090 from Gerrygames/1.14
18w46a
2018-11-16 09:55:02 +00:00
Gerrygames
c5969c303e 18w46a 2018-11-15 15:44:50 +01:00
Myles
f4b6b1795e
Merge pull request #1085 from Gerrygames/myles_master
fix #1076
2018-11-13 10:05:09 +00:00
Gerrygames
b86950d0e7 fix #1076 2018-11-13 10:59:11 +01:00
creeper123123321
3ef1ac06df
fix version, detect velocity implementation, fix npe, fix detectorservice 2018-11-12 15:05:52 -02: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
Myles
7f77cbfd74
Merge pull request #1081 from creeper123123321/master
Use less ram on translation mappings
2018-11-12 16:45:19 +00:00
Myles
ca716a65d2
Merge pull request #1084 from Gerrygames/faster_palette
Faster palette
2018-11-12 16:44:47 +00: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
Myles
25463a929a
Merge pull request #1078 from creeper123123321/master
fix set cooldown
2018-11-10 10:44:34 +00:00