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

210 Commits

Author SHA1 Message Date
rtm516 c51a48221b Merge remote-tracking branch 'origin/master' into server-language-processing 2020-04-09 13:58:45 +01:00
rtm516 c61d87714b On demand downloading and loading of language files 2020-04-09 00:20:41 +01:00
rtm516 55b2fd0259 Kick the user on incorrect login info 2020-04-05 10:42:02 +01:00
RednedEpic 392b0b5727 Merge branch 'master' into inventory 2020-04-04 03:12:23 -05:00
Redned ddf2f471ea
Merge branch 'master' into chunk-fix 2020-04-04 02:00:18 -05:00
RednedEpic 5222232e72 Add rest of fixes for operator bug 2020-03-26 23:00:52 -05:00
William Johnstone a0884596e3 Fix issue with players being able to update their own gamemode 2020-03-21 22:59:16 +00:00
RednedEpic 1bcee8d36f Merge branch 'master' into inventory 2020-03-15 13:21:37 -05:00
RednedEpic e203cfd4a7 Move back to XUID for Floodgate 
The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4.
 2020-03-14 14:03:44 -05:00
RednedEpic 6eac178305 Merge branch 'master' into inventory 2020-03-10 18:46:27 -05:00
Tim203 37d377b483
Floodgate now uses identity instead of xuid 2020-03-09 21:32:19 +01:00
RednedEpic b2d611e24c Fix some problems brought from merge conflicts 2020-03-05 20:53:58 -06:00
RednedEpic 418026dbe6 Merge branch 'block-entities' into inventory 2020-03-05 20:00:14 -06:00
AJ Ferguson eaf45ff6f7 Fix chunk view position bugs on some servers 2020-03-05 16:26:36 -09:00
RednedEpic 6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic 1670c77672 Only allow console to shut down Geyser with a command 2020-03-04 20:44:42 -06:00
RednedEpic 2bdf3d4d7f Merge branch 'master' into plugin 2020-02-26 19:31:19 -06:00
AJ Ferguson bc3992f775 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java
 2020-02-25 22:12:39 -09:00
RednedEpic f5bc328737 Merge branch 'master' into feature/new-protocol-lib 2020-02-25 18:54:31 -06:00
RednedEpic 41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
RednedEpic 9ffec0021c Fix movement bugs *and* allow for teleportation 2020-02-16 12:40:54 -06:00
RednedEpic 4bb34cdcce Merge branch 'master' into feature/new-protocol-lib 2020-02-14 17:57:28 -06:00
RednedEpic 4186715083 Update to NukkitX Protocol Lib 2.5.0 release 2020-02-14 17:39:26 -06:00
AJ Ferguson b1a0ed3e91 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-12 21:58:09 -09:00
AJ Ferguson 7f194b2d54 Increase render distance instead of chunkpublisher radius 2020-02-11 13:42:02 -09:00
AJ Ferguson 9008036ee4 Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-10 17:38:56 -09:00
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
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 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
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
Tim203 15506cf5b4 Edited PlayerInit behavior and updated protocol lib to 2.3.0 2019-10-09 20:39:38 +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 1c74a6252a Some fixes, added playerlist. Entity spawning doesn't work yet 2019-09-17 00:28:29 +02: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 202e3e584c new remapper (: 2019-08-05 21:59:54 -04: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