3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-10-02 08:00:07 +02:00
Commit graph

662 Commits

Autor SHA1 Nachricht Datum
Joshua Castle
ac9ea6ff9b
Merge 'upstream/master' into feature/blocky
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-19 02:25:20 -07:00
Joshua Castle
eb5e281735
Extended collision boxes are much improved
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-19 02:20:34 -07:00
Camotoy
a330c9a5db
Fix lecterns
Huge thanks to Dylan from PocketMine for the idea here.

Fixes #3138
2023-03-18 17:40:51 -04:00
Camotoy
9609686eb3 Version out potion registry
The ID of (for example) redstone dust has shifted, meaning that our hack of re-using IDs no longer works.

Fixes #3620
2023-03-17 19:07:31 -04:00
Camotoy
147618d5bc
Fix player nametags always appearing 2023-03-17 13:41:13 -04:00
Camotoy
acb25b0c99
Remove legacy 1.19.2x Bedrock code 2023-03-17 13:41:01 -04:00
Camotoy
79e9890923
Fix smithing tables not opening 2023-03-15 11:03:29 -04:00
Joshua Castle
9be2ec9d65
Merge upstream (1.19.4/1.19.70)
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-14 20:48:46 -07:00
Tim203
6ec7326193
Removed another debug line 2023-03-14 21:16:38 +01:00
Camotoy
d3e7d99396 Remove debug print 2023-03-14 15:53:16 -04:00
Camotoy
03c0767965 Finish 1.19.4 support and add Bedrock 1.19.70 support 2023-03-14 15:37:57 -04:00
Camotoy
720c901535
Fix nameTagVisibility nullability 2023-03-14 07:44:52 -04:00
Joshua Castle
553ea3e5f3
X is mirrored...
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-13 22:06:41 -07:00
Joshua Castle
b36ccbef19
Consider all hitboxes in calculation
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-13 21:05:31 -07:00
Camotoy
2436b2b1be Damage will now show again. 2023-03-12 23:51:51 -04:00
Joshua Castle
7f85e909b8
Extended collision boxes actually work
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-12 18:53:10 -07:00
Camotoy
777c69a21e
Remove armor quick change config
This is now in vanilla 1.19.4.
2023-03-12 13:06:13 -04:00
Joshua Castle
550a4725ef
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-03-11 01:49:19 -08:00
Joshua Castle
5f5159d30e
Extended collision boxes almost work
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-11 01:48:51 -08:00
Camotoy
b3f1c64249 Base changes for Java 1.19.4 support 2023-03-10 20:51:51 -05:00
nils
2f23e5cb9c
fix: Fix legacy ping passthough (#3601) 2023-03-10 00:13:20 -05:00
Joshua Castle
0bd14899a1
Notes for me
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-08 23:06:10 -08:00
Joshua Castle
45d5034970
We have our extended collision registry
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-08 22:10:47 -08:00
Joshua Castle
06db476f60
Add some notes for the extended collision box impl
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-07 22:26:12 -08:00
Joshua Castle
7c3ceadbb8
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-03-07 22:21:47 -08:00
Joshua Castle
4002c1df8d
Initial framework for extended collision boxes
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-06 22:24:53 -08:00
Camotoy
1be2a1ccac
Fix sleeping on vanilla/Fabric
Fixes #3595
2023-03-06 20:53:54 -05:00
Joshua Castle
f1bd04a71d
Account for if custom skulls are added on 1st run
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-05 20:26:13 -08:00
Joshua Castle
0d110ca4f4
Custom tool breakspeed by server; Closes #3348
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2023-03-05 20:21:56 -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
Joshua Castle
7a8796a90f
Merge remote-tracking branch 'upstream/master' into feature/blocky 2023-02-24 21:55:40 -08: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
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
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
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
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