Commit graph

84 commits

Author SHA1 Message Date
DoctorMacc
dbe1755a8e Update mappings repository 2020-06-20 18:28:07 -04:00
Camotoy
effd7602af
Clarify Bedrock remote address change (#787)
There's no reason for most users to try changing this.
2020-06-19 13:39:40 -05:00
Camotoy
9369b20209
Add 1.9+ PvP 'Cooldown' (#768)
* Add 1.9+ PvP 'Cooldown'

This commit adds a subtitle that acts as the Java cooldown. This is an optional feature disabled in the config with `show-cooldown`. This does not appear on plugins that use OldCombatMechanics.

* No need to bump up the config version; I was just tested with OldCombatMechanics

* Use simpler casting

* Use session variable of lastHitTime for theoretically better performance

* Reuse attribute value calculation from AttributeUtils

* Remove unused imports

* Revert config version update in config.yml
2020-06-16 19:03:28 -05:00
RednedEpic
259be96652 Update mappings submodule (Fixes #630) 2020-05-24 12:51:56 -05:00
Camotoy
99f69b3a7d
Rewrite Ping Passthrough (#468)
* Fix ping passthrough on BungeeCord

* Initial implementation of direct ping passthrough

* Finished implementation of direct ping passthrough

* Remove test for something else entirely

* Fix standalone

* Add config option for ping passthrough interval

* Use GeyserPingInfo to reduce methods

* Add querying; modify ping passthrough

* Add separate config options for passthrough MOTD and player counts

* Convert all plugin bootstraps to use internal ping events to that other plugins can handle ping modifications

* Small changes

* Fix invalid packet spawm

* Add legacy ping passthrough option

* Fix BungeeCord

* Proper UUID for BungeeCord, thanks @theminecoder

* Update config version and messages

* Merge master... again

* Add missing javadocs and minor changes

Co-authored-by: James Harrison <james@fasttortoise.co.uk>
Co-authored-by: theminecoder <theminecoder.dev@gmail.com>
Co-authored-by: Redned <redned235@gmail.com>
2020-05-23 16:50:04 -05:00
rtm516
fc6532732d
Adds skin ears from MinecraftCapes.co.uk + Clientside linked account skins + Elytra textures (#539)
* Added ears geometry support

* Added ear fetching from mc capes

* Added support for deadmau5

* Commented, documented and cleaned code

* Allow bedrock players to see their java skin/cape/ears when joining

* Optimised Imports

* Fix missing else statement

* Moved ears and fixed elytra skins

* Added ears config option

* Fixed cape/elytra transparency

* Fixed slim skin geometry

* Fixed async ears request and added alex skin

* Fixed default elytra not showing with no cape

* Moved to normal Base64 functions

Co-authored-by: James Harrison <james@fasttortoise.co.uk>
2020-05-23 16:06:34 -05:00
Camotoy
1664221fa9
Add optional workaround for >Y128 Nether building (#615)
* Add optional workaround for >Y128 Nether building

This commit adds a config option for building above the Nether by changing the Nether's dimension ID to match the End's.

* Only check for workaround application once

* Fix mappings?

* Include a bit more for the above bedrock nether building config option

Co-authored-by: Redned <redned235@gmail.com>
2020-05-23 16:02:51 -05:00
Camotoy
a7f363ec09
Add option for disabling command suggestions; add config version (#598)
* Add option for disabling command suggestions; add config version

This commit adds an option for disabling command suggestions. If enabled, command suggestions will not be sent to the server so as to remove command freezing. This commit also adds a config version variable so users are notified when to regenerate their configs.

* Rename GeyserConfiguration.checkGeyserConfiguration()
2020-05-20 22:43:22 -05:00
rtm516
3ab5c697c1
Updated mappings submodule (#596) 2020-05-19 21:39:10 +01:00
Camotoy
34d4817795
Add visual support for double chests (#523)
* Add visual support for double chests

* Update mappings submodule
2020-05-10 14:26:00 -05:00
Camotoy
b49004ddaf
Add block entity translators for Bedrock-only block entities (#478)
* Initial work on flower pots

* Flowers work in-game, not yet chunk load

* Don't overwrite my code before merge

* Finish up flower pots; add piston support on chunk load

* Clean up

* Remove debug line; update mappings
2020-05-04 21:32:02 -05:00
RednedEpic
0532d5310f Update mappings 2020-05-04 00:29:22 -05:00
RednedEpic
25d3e0708f Map most all missing sounds 2020-05-03 23:56:07 -05:00
RednedEpic
7f7d89e517 Add tnt sounds/particles and support for level event sounds 2020-05-03 01:48:38 -05:00
RednedEpic
d7592d8216 Add back in explosion translator, add identifier support for sounds
Some sounds require an identifier be added, otherwise they don't properly play.
2020-05-02 01:56:08 -05:00
RednedEpic
ff26dcad0d Start work on entity sounds, other misc implementations/fixes 2020-05-02 01:06:22 -05:00
RednedEpic
ad596cdccb Add sound handlers for block interaction
These sound handlers had to be added since on Minecraft: Java Edition, these sounds are handled clientside whilst Minecraft: Bedrock Edition expects something from the server. To counter this, we emulate the sounds of that on Minecraft: Java Edition within Geyser and send it to the client. The code may seem a tadredundant, but there is not much of an alternative unfortunately.
2020-04-30 00:21:02 -05:00
RednedEpic
31be608038 Add block break sounds for blocks with 0 hardness, and refactor some things
The refactors in this commit go a bit beyond the scope of what the sound/effects branch was meant to accomplish, however most of these changes are necessary so chunk caching could be reintroduced for the standalone version. The chunk caching here allows for us to get the block ID before the block was broken, and in the future allow us to implement newer features. Chunk caching is optional (and disabled by default) as on non-Bukkit versions, it can eat up a lot of RAM with many players online.
2020-04-29 15:01:53 -05:00
rtm516
257918904b
Fixed spawn egg colours not loading in (#429) 2020-04-25 23:55:06 -05:00
RednedEpic
7320e38a08 Update mappings 2020-04-25 17:56:39 -05:00
OnlyBMan
e82adf2cf9
Implement shield blocking (#395)
* basic shield blocking

* Offhand works

* Add Shield as id in BlockTranslator

* Change Block Translator to Item Translator

* Fix formatting

Co-authored-by: DoctorMacc <toy.fighter1@gmail.com>
Co-authored-by: Redned <redned235@gmail.com>
2020-04-24 22:11:28 -05:00
RednedEpic
0a5312fff2 Update mappings submodule 2020-04-15 15:02:12 -05:00
RednedEpic
605c9ef4db Merge branch 'master' into inventory 2020-04-11 22:46:25 -05:00
rtm516
1ef50cbb95 Added automatic en_us download and extraction from JAR 2020-04-09 14:36:32 +01:00
rtm516
70a71b2ee8 Updated mappings commit 2020-04-09 00:23:21 +01:00
rtm516
2cd5472ff0 Started work on the locale fetching and loading system 2020-04-08 21:11:56 +01:00
rtm516
49df48fcf0 Fixed some strings getting missed 2020-04-05 22:47:03 +01:00
rtm516
845c914492 Moved loading and added default locale config option 2020-04-05 02:58:23 +01:00
BuildTools
7cbb0388e2 Update mappings submodule 2020-03-27 16:16:33 -04:00
RednedEpic
6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic
41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -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
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
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