Google
/
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

151 Commits

Author SHA1 Message Date
SupremeMortal c9f33f8344
Pull in new submodule changes 2020-02-09 21:22:39 +00:00
OnlyBMan 4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
AJ Ferguson 5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
Redned c4857c6a54 Merge branch 'master' into plugin 2020-01-25 23:03:47 -06:00
RednedEpic ed322029f3 Update hybrid mode reference to 'floodgate' in config.yml 2020-01-18 17:53:56 -06:00
RednedEpic 5c7755b772 Shade netty into Bukkit jar 2020-01-18 16:38:40 -06:00
AJ Ferguson 9f7cba1915 Fix build error caused by mappings submodule 2020-01-08 19:48:03 -09:00
RednedEpic 814da2453c Implement sheep colors and shearing (Closes #126) 2020-01-08 20:26:44 -06: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
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
AJ Ferguson a4279d1f34 Fix bubble columns 2019-12-21 14:14:20 -09:00
AJ Ferguson 20595a6e03 Exclude Edu items from creative 2019-12-21 01:35:34 -09:00
AJ Ferguson d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
RednedEpic 3cc2d4775e Update bedrock assets 
1.14 blocks are still somewhat buggy and break with the latest runtime_block_states file, so the old one is being used for the time being. Bedrock players should have no problems joining java servers in 1.15, but new blocks won't show up for now.
 2019-12-10 21:01:56 -06:00
RednedEpic bb4dfeadf6 Update item and block mappings for 1.15 2019-12-10 20:42:51 -06: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
RednedEpic fe6b0e8afa Update mappings submodule 2019-12-03 18:43:52 -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 02569ea9d8 Update stonecutter mappings 2019-11-29 16:43:55 -09:00
RednedEpic 1cfeb01e38 Update wood mappings 2019-11-28 10:35:06 -06:00
AJ Ferguson 0fe1a302a3 Update mappings 2019-11-20 17:28:40 -09:00
RednedEpic 21ddf8af1e Update block palette 2019-11-09 11:14:31 -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
Redned 6b0c45b6c1
Set 'auth-type' to online by default 2019-10-21 19:23:39 -05:00
RednedEpic 3c9fab9fc4 Merge branch 'remapper' into master 2019-10-11 19:24:08 -05:00
AJ Ferguson 2261cfe76a Update blocks.json 2019-10-10 12:49:18 -08:00
RednedEpic a125967ec3 Implement new remapper 2019-10-09 19:11:50 -05: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
Nicolas Znamenski 550d94c4c3 Changed the thread pool size to be part of the config. 2019-09-22 18:08:12 -04:00
RednedEpic 0bcf4aa7ec Fix metrics, remove JSONSimple dependency 2019-09-21 11:00:13 -05: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
EOT3000 59e0aff289 Hybrid mode start + try fixing chunks (hashcodes, etc.) 2019-09-11 16:28:48 -04: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
EOT3000 202e3e584c new remapper (: 2019-08-05 21:59:54 -04:00
Blue Kelp fda221c12c fixup example xbox username 2019-08-02 14:01:01 -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
EOT3000 8c2897dbec new remaps 2019-07-30 20:10:27 -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 d0347c537d Add debug option to prevent console spam 2019-07-21 16:18:20 -05:00
RednedEpic 769b6a47fd Update cached pallete 2019-07-20 14:56:01 -05:00
EOT3000 c050ae240b attempt crash fix 2019-07-16 21:05:10 -04:00
EOT3000 7c74df2aa2 lambdas/more console output/random stuff I don't even remember 2019-07-12 16:59:36 -04:00
EOT3000 43f6dcc2f4 registries/start some packets 2019-07-11 18:39:28 -04:00
RednedEpic 1ddef77ecc Get server to show up in server list 2019-07-08 18:35:32 -05:00
RednedEpic 7afae0ae02 Add config file and reader 
- Added Jackson as a dependency to load/parse YML
- Added a default config.yml
- Added lombok as a dependency

- Removed SnakeYAML
 2019-07-08 14:19:55 -05:00