CPU
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,292 Commits 7 Branches 0 Tags 53 MiB
Commit Graph

200 Commits

Author SHA1 Message Date
SupremeMortal f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping 
 Conflicts:
	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-09 22:53:57 +00:00
AJ Ferguson e4ab4b336c Chunk fixes 2020-02-05 19:32:33 -09:00
AJ Ferguson 13f198845c Fix bugs when rapidly switching dimensions 2020-02-05 19:21:09 -09:00
OnlyBMan 0bb18d26b0 Load biome definitions only once instead of everytime a new player joins 2020-02-05 22:02:23 -05:00
OnlyBMan 4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
RednedEpic 0cf574ddcb Merge branch 'master' into feature/direct-block-mapping 2020-02-05 18:59:20 -06:00
RednedEpic 4f461bf374 Start on converting to the new NukkitX protocol library updates 2020-02-05 18:55:34 -06:00
AJ Ferguson 5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
RednedEpic 240f41ff03 Use Path instead of File for floodgate key file in config 
...and fix related issues with the file not being found.
 2020-01-26 11:22:21 -06:00
RednedEpic cc3cf70257 Search for key in Geyser plugin folder in plugin versions 2020-01-25 22:59:00 -06:00
Tim203 ba724bb7d6 Added the Nintendo Switch as DeviceOS 2020-01-25 13:10:58 +01:00
RednedEpic 6bb478bda4 Merge branch 'master' into block-entities 2020-01-19 22:35:33 -06:00
RednedEpic 52b23950ea Merge branch 'master' into plugin (should fix building) 2020-01-18 16:46:07 -06:00
RednedEpic dc594ee22c Update license headers 
Certain headers for classes that are to be removed (e.g. plugin api) were not updated to prevent merge conflicts.
 2020-01-08 21:05:42 -06:00
AJ Ferguson 66f5ed9495 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java
 2020-01-04 14:39:01 -09:00
RednedEpic 2fc591e341 Merge Floodgate changes 2020-01-03 23:58:58 -06:00
RednedEpic 0c24ffc629 Merge branch 'master' into plugin 2020-01-03 23:25:00 -06:00
SupremeMortal 94851ef4b8
Move all block related code into BlockTranslator 
It makes more sense.
 2019-12-31 00:14:38 +00:00
AJ Ferguson 782feed641 Fix lighting when reloading world 2019-12-28 18:17:00 -09:00
AJ Ferguson b2f86ec20b Rewrite dimension code 
New code does not rely on pausing the thread
 2019-12-28 04:35:21 -09:00
AJ Ferguson 8efeb3fe25 Fix exception when removing all entities 2019-12-27 03:03:12 -09:00
AJ Ferguson cc0b3293bf Start fixing dimension switching and respawning 2019-12-27 02:29:46 -09:00
AJ Ferguson 8061e2d76d Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2019-12-23 16:58:59 -09:00
RednedEpic e1ba1fa3e8 Merge remote-tracking branch 'origin/master' into block-entities 2019-12-23 13:49:20 -06:00
RednedEpic e38322a3ec Nuke plugin API 
https://media.giphy.com/media/oe33xf3B50fsc/giphy.gif
 2019-12-21 11:35:48 -06:00
AJ Ferguson d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
Tim203 64b04330c3 Added the player his IP to the transferable data 2019-12-17 23:27:29 +01:00
Tim203 9527709c59 Merge branch 'master' of https://github.com/GeyserMC/Geyser 
 Conflicts:
	common/pom.xml
	connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
 2019-12-10 20:52:42 +01:00
AJ Ferguson 211436c1e0 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
 2019-12-06 14:06:24 -09:00
SupremeMortal 6e8a0847b4
Fix typo from protocol lib 2019-12-04 18:13:49 +00:00
AJ Ferguson 8bb8208a46 Merge branch 'master' into inventory 2019-11-30 15:22:50 -09:00
RednedEpic cd17dc5f4c Use FastUtil over Trove for maps/collections to reduce memory usage 
This should significantly decrease the amount of RAM being used by Geyser. Previously it was using 300mb - 400mb on average. This has dropped it down to 80mb - 120mb. Ideally I'd like to decrease this value further, but that will require some more work.
 2019-11-30 13:26:51 -06:00
Tim203 f1b19fc04e Little changes 2019-11-30 19:10:29 +01:00
Tim203 1c48279a9f Little changes 2019-11-30 18:38:09 +01:00
Tim203 b12256bc1e Changed a method name 2019-11-30 15:32:13 +01:00
Tim203 7d645fbf16 First Flootgate commit 2019-11-30 13:34:45 +01:00
AJ Ferguson 24e5d34ce9 Cleanup 2019-11-29 15:49:29 -09:00
AJ Ferguson 489c39e900 Start adding support for crafting 
Expect bugs
 2019-11-27 18:55:58 -09:00
AJ Ferguson af85d6e4d2 Merge branch 'master' into 1.13-inventory 2019-11-27 18:39:52 -09:00
RednedEpic 51c1792d67 Only send one empty chunk upon login 2019-11-15 22:21:26 -06:00
AJ Ferguson ce7237392b Merge branch 'feature/1.13-bedrock' into 1.13-inventory 2019-11-15 14:55:15 -09:00
AJ Ferguson 7d4cb06fbe Fix crash on login 2019-11-13 17:26:45 -09:00
RednedEpic cfdaacf017 Minor cleanup 2019-11-12 22:28:47 -06:00
RednedEpic 3ffaf5c0e5 Attempt to fix crashes on login 2019-11-10 16:53:01 -06:00
AJ Ferguson 2d36a8b43b Begin adding support for creative 
Still need to complete item mappings
 2019-11-09 17:20:47 -09:00
RednedEpic 21ddf8af1e Update block palette 2019-11-09 11:14:31 -06:00
AJ Ferguson 659d52d18a Merge branch 'master' into inventory 2019-11-07 23:20:19 -09:00
RednedEpic 90e6ebc1be More work on 1.13 2019-11-05 18:55:59 -06:00
Redned a4b2a016f8 Set version for pong and StartGamePacket from bedrock packet codec 2019-11-02 15:58:50 -05:00
Redned 5fee344743 Fix block palette 2019-11-02 15:50:04 -05:00
RednedEpic 0e2f64b95a Start on 1.13 changes (not functional yet) 
Cached palette still needs fixing, therefore this build actually does nothing yet.
 2019-10-30 21:14:23 -05:00
AJ Ferguson a65a14c2f2 Fix block breaking in creative 2019-10-27 01:56:47 -08:00
AJ Ferguson 88648f705e Work on inventory transactions 
work in progress
 2019-10-20 13:25:41 -08:00
RednedEpic 7571df9903 Attempt to reduce memory usage and fix not being disconnected from Java 2019-10-16 13:55:05 -05:00
RednedEpic 5cf96ec5be Update to latest MCProtocolLib version 2019-10-13 15:28:03 -05:00
RednedEpic 3c9fab9fc4 Merge branch 'remapper' into master 2019-10-11 19:24:08 -05:00
RednedEpic a125967ec3 Implement new remapper 2019-10-09 19:11:50 -05:00
Tim203 15506cf5b4 Edited PlayerInit behavior and updated protocol lib to 2.3.0 2019-10-09 20:39:38 +02:00
Tim203 a7bd9da644 Bugfixes 2019-10-05 00:29:33 +02:00
Tim203 89550a5ecb Bugfixes 2019-10-04 19:25:08 +02:00
Tim203 ee97585036
Merge branch 'master' into master 2019-10-03 19:09:59 +02:00
Tim203 5eb7565b0a Third party capes, rotation fixed, wait for the client and updated protocol lib 2019-10-02 22:45:29 +02:00
AJ Ferguson 4b0d777128 Fix crash after first disconnect 2019-10-01 15:36:33 -08:00
AJ Ferguson fe845710b6 Fix for block breaking 2019-09-30 14:17:36 -08:00
EOT3000 da0c59446f Try fixing block break (didn't work). Also add more metrics 2019-09-30 12:44:25 -04:00
Tim203 0b193c04e7 Players spawn, player skins, scoreboard, bossbar and updated protocol lib 2019-09-25 23:52:28 +02:00
Tim203 cbdf4f7633 Made paintings not crash the client, bugfixes and improvements 2019-09-21 09:42:44 +02:00
Tim203 30b9caf5fa Corrected some stuff 2019-09-17 00:45:39 +02:00
Tim203 1c74a6252a Some fixes, added playerlist. Entity spawning doesn't work yet 2019-09-17 00:28:29 +02:00
Redned ef7800a739 Move block translations to separate class 
This is to be expanded upon further at a later date
 2019-09-15 19:04:54 -05:00
Redned 7f051bd6bc Start work on a basic chunk cache and block collision detection 2019-09-15 18:34:14 -05:00
SupremeMortal c9be13d487
Fix AIOOBE and remove PlayerSession usage. 2019-09-13 15:45:55 +01:00
SupremeMortal ab55050d11
Close remote java connection when bedrock player leaves. 2019-09-13 14:37:31 +01:00
SupremeMortal 9a9f67b45f
Get chunks working to some degree. 2019-09-13 11:49:18 +01:00
EOT3000 59e0aff289 Hybrid mode start + try fixing chunks (hashcodes, etc.) 2019-09-11 16:28:48 -04:00
Redned 7aa4457f34
Uncomment disconnect code for downstream disconnect 
- This should hopefully reduce spam in console when a java client is disconnected. The disconnect handler will be rewritten later to address the not being able to reconnect issue.
 2019-08-23 22:49:48 -05:00
RednedEpic ba21acc9c8 Cleanup adding/removing players 2019-08-08 20:42:55 -05:00
RednedEpic 295d8d5256 Fix double disconnect bug and minor code cleanups 2019-08-08 18:16:46 -05:00
EOT3000 de78c93b72 chunks. Still don't work, but hey, it doesn't crash or hang! 2019-08-08 18:14:08 -04:00
EOT3000 b66631407b api stuff 2019-08-05 22:14:41 -04:00
EOT3000 7fccb0d69d new remapper (: 2019-08-05 22:09:45 -04:00
EOT3000 5318a664b8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
 2019-08-05 22:05:56 -04:00
EOT3000 202e3e584c new remapper (: 2019-08-05 21:59:54 -04:00
RednedEpic c926c7d8fa Remove unnecessary duplicate of StartGamePacket 2019-08-05 15:30:56 -05:00
RednedEpic eaf57550e5 Implement support for changing held item 2019-08-05 15:16:45 -05:00
RednedEpic 128769dee8 Minor refactors and tweaks, update README 2019-08-03 22:24:53 -05:00
RednedEpic c114e4d541 (A lot) more work on entities 2019-08-03 01:51:05 -05:00
RednedEpic d496d4958e Start work on entity translations 2019-08-02 22:38:09 -05:00
Blue Kelp 5f93b5bec4 null safety on auth/handshake errors 2019-08-02 13:54:40 -07:00
Logicism c7869e77e8 Scoreboard Fix 2019-07-29 19:57:43 -07:00
RednedEpic 635a26dd60 Start work on inventory/item translators 2019-07-29 17:20:48 -05:00
RednedEpic dbfbaf47cd Cleanup and refactor translator code 2019-07-24 15:13:07 -05:00
RednedEpic df6836e12b Add authentication/online mode support 2019-07-24 01:29:54 -05:00
RednedEpic 657f12654b Add form API and other small changes 2019-07-23 18:16:25 -05:00
RednedEpic ccb52007fc Allow connected sessions to run Geyser commands 2019-07-21 19:52:20 -05:00
EOT3000 266d374167 completely re-do console 2019-07-13 15:00:51 -04:00
EOT3000 c44fdb2951 Merge remote-tracking branch 'origin/master' 2019-07-11 18:40:02 -04:00
EOT3000 43f6dcc2f4 registries/start some packets 2019-07-11 18:39:28 -04:00
RednedEpic 539a52f64a Switch to MIT license 2019-07-11 16:30:35 -05:00
RednedEpic 17b99a80fe Add more packet handlers, allowing upstream to connect to remote 2019-07-10 01:34:22 -05:00