Commit graph

3180 commits

Author SHA1 Message Date
Joshua Castle
e077407a1a
Temporarily fix build on eclipse so I may work...
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-05 18:33:24 -08:00
Joshua Castle
f59d72843f
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-03-05 18:31:05 -08:00
apex_
10c2e51da4
Fix closing inventory confirmation behavior (#3587) 2023-03-03 09:09:52 -05:00
Camotoy
95d10fb7fc Don't throw an AssertionError on failed locale download
Fixes #3589
2023-03-02 18:40:40 -05:00
onebeastchris
fca726caa4
version bump (#3585)
seems like aternos depends on this to show the latest version iirc; should be bumped either way
2023-02-27 14:09:07 -05:00
Joshua Castle
7a8796a90f
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-02-24 21:55:40 -08:00
rtm516
b0c42086ad
Fix build IDs for publishing 2023-02-25 04:03:42 +00:00
rtm516
9b77d43fa2
Testing in production 2023-02-25 03:08:02 +00:00
rtm516
806ce6c930
Import build secrets as env vars 2023-02-25 02:57:43 +00:00
rtm516
c9b58e154f
Allow build notifcation on success or failure 2023-02-25 02:36:51 +00:00
Redned
a72e49527d
Simplify publish logic and move to GitHub Actions (#3579)
Co-authored-by: Tim203 <mctim203@gmail.com>
Co-authored-by: rtm516 <ryantmilner@hotmail.co.uk>
2023-02-24 20:05:15 -06:00
Camotoy
50104c95ec
Remove deploying Jenkinsfile step 2023-02-24 13:32:46 -05:00
Camotoy
65319c5859 Prepare for an actual 568 release 2023-02-24 12:40:29 -05:00
Camotoy
e50226132f
Fix more issues of chunks not appearing 2023-02-23 13:11:18 -05:00
Jackson_57
e42c2d8ed5
Fix artifact paths (#3570) 2023-02-22 15:11:06 +01:00
Joshua Castle
29835a1b76
Fix block break speeds thanks to @Camotoy
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-02-20 21:52:46 -08:00
Joshua Castle
48c6f9446d
Submodule
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-02-20 13:05:01 -08:00
Joshua Castle
5f2c8b0d8b
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-02-20 13:04:07 -08:00
Camotoy
e7b8b4ef29
Update supported versions in README 2023-02-17 18:55:40 -05:00
Kas-tle
cfd7aeb927
Update PR Build Action for API (#3535)
* Use API from use making PR if exists

* Update CONTRIBUTING.md

* Address @Tim203's review

* Fix path

* Build the api before doing anything with the Geyser repo

---------

Co-authored-by: Tim203 <mctim203@gmail.com>
2023-02-17 20:37:01 +01:00
Camotoy
406dfcb22c Fix error on 1.19.62 2023-02-16 20:01:51 -05:00
Camotoy
30277d5411 Anticipate support for the patch version of 1.19.60 2023-02-15 16:17:38 -05:00
Camotoy
ee754c529b
Add implementation for ClientEmoteEvent
Also, a few random changes I've stored since forever.
2023-02-15 00:17:14 -05:00
Camotoy
6a6a601efc Notify on disconnect when a new Geyser update is available 2023-02-15 00:01:33 -05:00
Joshua Castle
c1412c57b3
Merge and exit API removal hellscape
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-02-11 20:31:16 -08:00
Tim203
f9705c1e46
Merge remote-tracking branch 'origin/master' into feature/move-base-api 2023-02-11 12:24:07 +01:00
onebeastchris
9b3b2fba17
callout internet connection issues (#3544) 2023-02-09 22:18:03 -05:00
Camotoy
c60a4d0759
Upcoming API changes for emote event 2023-02-09 19:15:33 +01:00
Tim203
ed36adec56
Merge remote-tracking branch 'origin/master'
# Conflicts:
#	api/src/main/java/org/geysermc/geyser/api/GeyserApi.java
#	api/src/main/java/org/geysermc/geyser/api/command/Command.java
#	api/src/main/java/org/geysermc/geyser/api/command/CommandExecutor.java
#	api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
#	api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventBus.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventRegistrar.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventSubscriber.java
#	api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventBus.java
#	api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventSubscriber.java
#	api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCommandsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomItemsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPostInitializeEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPreInitializeEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserShutdownEvent.java
#	api/src/main/java/org/geysermc/geyser/api/extension/Extension.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionDescription.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLoader.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLogger.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionManager.java
#	api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidDescriptionException.java
#	api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidExtensionException.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemData.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemOptions.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomRenderOffsets.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java
#	api/src/main/java/org/geysermc/geyser/api/network/AuthType.java
#	api/src/main/java/org/geysermc/geyser/api/network/BedrockListener.java
#	api/src/main/java/org/geysermc/geyser/api/network/RemoteServer.java
#	api/src/main/java/org/geysermc/geyser/api/util/TriState.java
#	core/build.gradle.kts
#	gradle/libs.versions.toml
#	settings.gradle.kts
2023-02-09 17:34:27 +01:00
Tim203
21885949c7
Moved the base api to a separate repo 2023-02-09 17:31:00 +01:00
pop4959
3d97188db0
Add property to show scoreboard logs (#3539)
* property to show scoreboard logs

* cache system property
2023-02-09 11:19:17 -05:00
Camotoy
bad077de53
oops 2023-02-07 13:15:02 -05:00
Camotoy
6ee3d4ed96
Fix #3537 2023-02-07 13:14:06 -05:00
Camotoy
f07f532d8e
Update supported versions in README 2023-02-07 12:09:16 -05:00
Camotoy
0bba18c726
Initial support for 1.19.60 Bedrock 2023-02-05 13:29:28 -05:00
Tim203
effe046308
Merge remote-tracking branch 'origin/master' into feature/dedicated-api-repo 2023-02-04 21:25:11 +01:00
Joshua Castle
9e74e904e7
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-02-03 22:01:32 -08:00
Camotoy
25c2d30881
Remove players from player team map on team remove 2023-02-02 16:31:26 -05:00
Camotoy
0388785ea7
Fix some instances of team-applied nametags not working
Fixes #3531
2023-02-02 15:25:05 -05:00
Kas-tle
d14ca99a52
Merge pull request #3 from davchoo/feature/blocky
Fix block registry scanning in MappingsReader
2023-02-01 15:26:28 -08:00
davchoo
7bc0bde379
Include entry when logging exceptions from block mappings 2023-01-31 23:34:28 -05:00
davchoo
cbe7256125
Skin hashes can have less than 64 characters? 2023-01-31 23:24:08 -05:00
davchoo
a91b531f99
Fix block registry scan in MappingsReader 2023-01-31 23:24:04 -05:00
Kas-tle
d1790cc09d
Merge pull request #2 from davchoo/feature/blocky
Simplify creating CustomBlockMappings
2023-01-31 13:07:53 -08:00
Camotoy
c909b2b1a5
Fix #3521 2023-01-31 13:01:20 -05:00
davchoo
00a453fe42
Treat all properties as string properties
There isn't a real need to check for boolean and int properties
2023-01-30 15:07:35 -05:00
davchoo
d99cb468f1
Rework MappingsReader_v1 to avoid passing maps around 2023-01-30 15:01:49 -05:00
Camotoy
29f234d030 Fix /geyser reload on Spigot
Fixes #3478
2023-01-29 22:15:26 -05:00
Joshua Castle
1efe7342eb
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-01-29 13:53:31 -08:00
Joshua Castle
57c90da15b
Address @davchoo's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-01-29 13:44:05 -08:00