GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity
1,292 Commits 13 Branches 0 Tags 91 MiB
Commit Graph

315 Commits

Author SHA1 Message Date
SupremeMortal 6599aefc43
Use correct ID for duplicates 2019-12-30 23:35:28 +00:00
SupremeMortal b96ef99beb
Start working on direct block mapping. 
This will not work
 2019-12-30 23:33:27 +00:00
AJ Ferguson 4153e98134 Change lighting fix method 2019-12-28 23:20:48 -09:00
AJ Ferguson c4658ecdae Small changes 2019-12-28 21:45:41 -09: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
Redned 97d8b8db68
Merge pull request #115 from AJ-Ferguson/master 
Block states and fix waterlogged blocks
 2019-12-23 12:03:15 -06:00
AJ Ferguson 776d4c6585 Optimize waterlogged check 2019-12-22 00:32:49 -09:00
RednedEpic 70fd9867f5 Add Sponge platform bootstrap 2019-12-21 16:18:34 -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 9a9695ead7 Handle new creative_items.json format 2019-12-21 01:32:49 -09:00
AJ Ferguson b222b05348 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2019-12-21 00:49:16 -09:00
AJ Ferguson d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
OnlyBMan afab21695a Update SkinProvider.java 
Remove duplicate code
 2019-12-16 22:26:35 -05:00
OnlyBMan 203b3b9d46 Update SkinProvider.java 
Instead of calling the scale method 3 times, just used a cached scaled image
 2019-12-15 19:24:00 -05:00
OnlyBMan 16950bf8f2 Update SkinProvider.java 
Fix OptiFine capes and downscales banner capes so they work on PE too.
 2019-12-14 21:12:12 -05: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
Tim203 7ff4e509ee You can see signs now 2019-12-06 19:32:10 +01:00
SupremeMortal f5923d8e2e
General pom cleanup. 2019-12-06 11:02:31 +00:00
AJ Ferguson 7a58840821 Fix NoClassDefFoundError in Java 9+ 2019-12-02 14:22:13 -09:00
AJ Ferguson 8bb8208a46 Merge branch 'master' into inventory 2019-11-30 15:22:50 -09:00
RednedEpic ebf6050d44 Start work on block entities (partially-functioning) 
Most block entities should now *show up*. Some like signs will not as of yet, however when another player places one, they will display. Block entities are not yet fully functional and may only just be visible for the time being.
 2019-11-30 18:22:11 -06: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 7d645fbf16 First Flootgate commit 2019-11-30 13:34:45 +01:00
RednedEpic c91e8e1958 Update mappings to use new submodule 2019-11-29 20:34:51 -06:00
AJ Ferguson 24e5d34ce9 Cleanup 2019-11-29 15:49:29 -09:00
AJ Ferguson e7a1063ee2 Merge branch 'master' into inventory 2019-11-29 02:15:35 -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 ee4a01e304 (Actually) fix offline mode skins 2019-11-27 21:22:27 -06:00
RednedEpic ca9fc4e64c Merge remote-tracking branch 'origin/feature/1.13-bedrock' into feature/1.13-bedrock 2019-11-26 19:53:29 -06:00
RednedEpic 8725dba69c Fix offline mode console spam for skins 2019-11-26 19:52:13 -06:00
Tim203 068033aeaa Fixes errors related to skins 2019-11-19 21:31:24 +01:00
RednedEpic 3e8ab6ca83 Fix players not showing up 
Skins still need some work as it applies to every player online rather than a specific player; however, players are now visible regardless.
 2019-11-15 21:25:43 -06:00
AJ Ferguson ce7237392b Merge branch 'feature/1.13-bedrock' into 1.13-inventory 2019-11-15 14:55:15 -09: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
RednedEpic 90e6ebc1be More work on 1.13 2019-11-05 18:55:59 -06: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 24c27a03a9 Various fixes 
Fix offhand, use AtomicInteger for transaction id, send null stack instead of air, and clear open inventory on dimension change
 2019-10-22 15:31:03 -08:00
AJ Ferguson 4074582059 Close open inventory before opening a new one 2019-10-20 19:41:46 -08:00
AJ Ferguson 88648f705e Work on inventory transactions 
work in progress
 2019-10-20 13:25:41 -08:00
AJ Ferguson 2bab0d1d19 Calculate attribute modifiers and fix sprinting/sneaking 2019-10-17 23:54:20 -08:00
RednedEpic eabbacaaad Remove unnecessary null checks for missing mappings 
"Missing mappings" are given placeholder values upon startup, so these null checks are pointless.
 2019-10-15 22:21:44 -05:00
RednedEpic f6ab70cabb Remove empty Remapper class from merge conflict 2019-10-13 15:28:46 -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
Redned 30d15707a6
Merge pull request #41 from Tim203/master 
Players spawn, skins and capes, scoreboard, bossbar, fixes and updated protocol lib
 2019-10-11 18:56:32 -05:00
RednedEpic 8c541304a6 Convert item and block maps in Toolbox to TIntObjectMaps 2019-10-11 18:38:34 -05:00
Tim203 c462017149 Improved remapper performance 2019-10-11 00:15:23 +02:00
Tim203 0e97e52337 Only notify debuggers that parsing GameProfile data failed and use the default skin and cape 2019-10-10 23:27:30 +02:00
Tim203 46cb14fc0a Removed unused class and made PlayerList show every player again 2019-10-10 23:16:07 +02:00
RednedEpic a125967ec3 Implement new remapper 2019-10-09 19:11:50 -05:00
EOT3000 c556fa94ea Fix red sand/regular sand mix 2019-10-09 17:07:56 -04:00
Tim203 15506cf5b4 Edited PlayerInit behavior and updated protocol lib to 2.3.0 2019-10-09 20:39:38 +02:00
EOT3000 d99c285676 Entity interact? 2019-10-07 14:30:08 -04:00
Tim203 5eb7565b0a Third party capes, rotation fixed, wait for the client and updated protocol lib 2019-10-02 22:45:29 +02: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
RednedEpic b6d4bf5147 Fix most all metadatable items not showing up (for the most part) 
The actual block data translation (like stair rotation) all needs to be done still, but this is a huge step toward getting that complete.
 2019-09-17 21:15:34 -05: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 5d87b7ccab Cleanup startup messages 2019-09-15 18:46:05 -05:00
RednedEpic 03bf12ee65 Implement more block mappings 2019-09-13 18:49:46 -05:00
SupremeMortal ed7213d7c7
Remove IntelliJ files @EOT3000 added... and more chunk changes. 2019-09-13 10:39:38 +01:00
SupremeMortal d8388d0315
Merge remote-tracking branch 'upstream/chunks' into chunks 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
 2019-09-13 10:15:43 +01:00
SupremeMortal 7a6d3f4604
Various chunk tweaks. 2019-09-13 10:08:48 +01:00
Redned 7bda95cfb2
Set non-air blocks on the block layer 2019-09-11 22:22:46 -05:00
EOT3000 db864b7e51 try more chunk stuff 2019-09-11 18:54:51 -04:00
EOT3000 59e0aff289 Hybrid mode start + try fixing chunks (hashcodes, etc.) 2019-09-11 16:28:48 -04:00
RednedEpic 6cb80dea28 Minor cleanup upon initial block remap 2019-09-10 18:45:46 -05:00
RednedEpic 383429d71b Fix a few chunk errors 
This does not fix chunks on its own, they're still very much a work in progress, however this commit should hopefully resolve a few issues. The client might still crash due to some invalid mappings (most likely), but this should bring us one step closer.

With hardcoded values for the chunks, the client wouldn't crash (which leads me to the conclusion stated above) and on the occasions that it would not time out, the chunks were empty.

Co-authored-by: SupremeMortal <suprememortal@users.noreply.github.com>
 2019-09-08 15:46:10 -05:00
RednedEpic bd8a00b5eb Merge branch 'master' into chunks 2019-08-30 16:56:34 -05:00
RednedEpic 1c1785ac51 Start work on chunks 
- There are probably many errors and issues with this code (some dumb ones probably). As of right now it crashes the client.
 2019-08-30 16:47:33 -05:00
RednedEpic b611f8facb Rewrite remapper 2019-08-09 22:16:34 -05:00
EOT3000 c621ead6d9 fix things 2019-08-08 21:50:29 -04: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 7c807740a4 even more mappings! 2019-08-07 19:56:44 -04:00
EOT3000 d22861d61b remap fixes 2019-08-07 19:08:48 -04:00
RednedEpic cadd779f43 Implement entity attribute support 2019-08-06 01:39:39 -05: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 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 bf7c74e072 fix cert/handshake error 2019-08-02 13:55:06 -07:00
Blue Kelp 5f93b5bec4 null safety on auth/handshake errors 2019-08-02 13:54:40 -07:00
Blue Kelp f62aa390d2 support auto-login of configured users 
- fall back to window/form prompt if user is not configured
 2019-08-02 13:15:32 -07:00
Blue Kelp 168778026a refactor file utils for reuse 2019-08-01 21:16:17 -07:00
Blue Kelp 6f5c9a535e consolidate with existing utils class 2019-08-01 21:15:11 -07:00
Blue Kelp 9bebfd5ded pull out auth window code into util class 2019-08-01 21:15:11 -07:00
RednedEpic 3784ba7baa Code cleanups and update ItemTranslator to work with new mappings 2019-07-31 14:59:23 -05:00
EOT3000 8c2897dbec new remaps 2019-07-30 20:10:27 -04:00
EOT3000 0bb3bc49d9 comment out remap function, because we won't need it for a while! 2019-07-30 08:38:37 -04:00
EOT3000 66bc2753f7 add re-mappings 2019-07-29 22:25:13 -04:00
RednedEpic 635a26dd60 Start work on inventory/item translators 2019-07-29 17:20:48 -05:00
RednedEpic 77ea4eda60 Encrypt bedrock packets 2019-07-24 17:53:42 -05:00
EOT3000 f0551727ca First Event! 2019-07-22 10:20:49 -04:00
EOT3000 464e9cbd2a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
 2019-07-21 19:14:09 -04:00
RednedEpic 82f56a7c34 Code cleanups 2019-07-21 17:22:56 -05:00
EOT3000 9d9611cbbf Start chunk conversions 2019-07-21 15:48:36 -04:00
RednedEpic a777add304 Add chat translators 2019-07-20 20:10:30 -05:00
SupremeMortal b2f366f7b4 Fix crashes. 2019-07-20 23:35:14 +01:00
RednedEpic a369ebccf7 Fix compile errors 2019-07-20 14:56:32 -05:00
EOT3000 9ba14d9dc9 attempt crash fix/fix typo/others 2019-07-18 20:11:58 -04:00
RednedEpic 3d7ee87a58 Fix compile errors and cleanups 2019-07-17 01:07:31 -05:00
EOT3000 c050ae240b attempt crash fix 2019-07-16 21:05:10 -04:00
EOT3000 43f6dcc2f4 registries/start some packets 2019-07-11 18:39:28 -04:00