-
-
Notifications
You must be signed in to change notification settings - Fork 674
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Somewhat fix: firework recipe not showing up in recipe book #4873
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Konicai
reviewed
Jul 18, 2024
.../src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
Show resolved
Hide resolved
Konicai
reviewed
Jul 18, 2024
core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
Outdated
Show resolved
Hide resolved
Camotoy
approved these changes
Jul 21, 2024
letsgoawaydev
pushed a commit
to letsgoawaydev/Geyser
that referenced
this pull request
Jul 21, 2024
…#4873) * Somewhat fix firework crafting * Use instanceof instead of casting
letsgoawaydev
added a commit
to letsgoawaydev/Geyser
that referenced
this pull request
Jul 21, 2024
commit 7bd4f9c Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:50:37 2024 +0800 Half complete GuiData commit, needs some changes most likely commit d78441a Merge: 6338d1c 4547431 Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:33:41 2024 +0800 Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api commit 6338d1c Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:33:37 2024 +0800 test commit 0654d2d Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 13:11:27 2024 +0200 Fix: Text display offset <GeyserMC#4439> (GeyserMC#4883) commit 57919db Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 02:15:38 2024 +0200 Somewhat fix: firework recipe not showing up in recipe book (GeyserMC#4873) * Somewhat fix firework crafting * Use instanceof instead of casting commit 23d53db Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 02:10:51 2024 +0200 Fix: Only shutdown/close handlers in onDisable if they're nonnull (GeyserMC#4882) commit 6459f67 Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com> Date: Sat Jul 20 18:09:22 2024 +0800 Use the correct way of sending block breaking particles (GeyserMC#4825) commit ebc7f30 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:22:04 2024 -0400 Respect block range attribute where we can GeyserMC#4864 commit bf16ddb Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:21:36 2024 -0400 Small cleanups commit 2d73e51 Author: chris <github@onechris.mozmail.com> Date: Wed Jul 17 21:44:53 2024 +0200 Properly fix hanging signs (GeyserMC#4872) commit 3fad986 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed Jul 17 14:21:41 2024 -0400 Fix GeyserMC#4870 commit 3144721 Author: Valaphee The Meerkat <32491319+valaphee@users.noreply.github.com> Date: Tue Jul 16 14:13:34 2024 +0200 Empty player list on phase transition, despawn skulls, always reset weather (GeyserMC#4847) * Empty player list on transition, despawn skulls * Always reset weather commit 07bdc1c Author: masel.io <git@byteexception.eu> Date: Tue Jul 16 11:23:30 2024 +0200 Add Timeout to CompletableFuture in GeyserBungeePingPassthrough to Prevent Memory Leak (GeyserMC#4858) * fix: Add timeout for GeyserBungeePingPassthrough#getPingInformation Signed-off-by: ByteExceptionM <git@byteexception.eu> * fix: Use Geyser Logger instead of Bungee Logger Signed-off-by: ByteExceptionM <git@byteexception.eu> * Fix typo Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> * chore: Add ip suppression if configured Signed-off-by: ByteExceptionM <git@byteexception.eu> * Remove empty line Co-authored-by: chris <github@onechris.mozmail.com> * Remove empty line Co-authored-by: chris <github@onechris.mozmail.com> --------- Signed-off-by: ByteExceptionM <git@byteexception.eu> Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> Co-authored-by: chris <github@onechris.mozmail.com> commit ea4a21c Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon Jul 15 15:16:45 2024 -0400 Indicate support for Bedrock 1.21.3 commit 6dfb1a8 Author: chris <github@onechris.mozmail.com> Date: Mon Jul 15 01:31:03 2024 +0200 Fix: Block place sounds on mod platforms (GeyserMC#4859) commit 215b12e Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 21:55:57 2024 +0200 Fix: Totem animation when playing totem effects manually (GeyserMC#4860) * Fix: Totem animation for manually played totem effects * Ensure we always reset the offhand correctly commit 92112f4 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 20:17:22 2024 +0200 Fix: Send a container close packet to Java for containers that could not be opened (GeyserMC#4861) * Close containers if we did not manage to open it * Mark session inventory translator as nonnull commit 054fc09 Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com> Date: Sun Jul 14 16:44:39 2024 +0800 Correctly cap scale attribute (GeyserMC#4856) * Fix scale attribute cap * Update LivingEntity.java commit c862d5a Author: chris <github@onechris.mozmail.com> Date: Sat Jul 13 22:00:15 2024 +0200 Fix: Manually translated item names for block items not showing up properly (GeyserMC#4857) commit 94f17d1 Author: chris <github@onechris.mozmail.com> Date: Sat Jul 13 18:53:13 2024 +0200 Fix: Item color names/glint for rare items (GeyserMC#4763) * debug stick changes * yay light purple item name * Address review * Auto-generate rarity * Add glint generation * Translate all rare items properly * Use putIfAbsent instead of double checks commit e127f9e Author: chris <github@onechris.mozmail.com> Date: Fri Jul 12 20:55:40 2024 +0200 Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#4814) commit 4547431 Merge: 96aecd2 b213fb5 Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:02:04 2024 +0800 Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api commit 96aecd2 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 22:09:55 2024 +0200 Feature: API to switch items in the offhand/mainhand (GeyserMC#4819) commit a9c6d8b Author: chris <github@onechris.mozmail.com> Date: Fri Jul 12 20:42:31 2024 +0200 Add a /geyser ping command (GeyserMC#4131) * Init: Add /geyser ping command * Block just console execution, not everything but console senders * Use RTT as that seems to vary less wildly compared to getPing() * Cleanup, use lang strings * Add ping() method to GeyserConnection in api * Update to cloud changes commit a57671e Author: Konicai <71294714+Konicai@users.noreply.github.com> Date: Thu Jul 11 23:56:42 2024 -0500 Cloud for commands (GeyserMC#3808) Co-authored-by: onebeastchris <github@onechris.mozmail.com> commit b213fb5 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 22:09:55 2024 +0200 Feature: API to switch items in the offhand/mainhand (GeyserMC#4819) commit 51a1295 Author: chris <github@onechris.mozmail.com> Date: Fri Jul 12 20:42:31 2024 +0200 Add a /geyser ping command (GeyserMC#4131) * Init: Add /geyser ping command * Block just console execution, not everything but console senders * Use RTT as that seems to vary less wildly compared to getPing() * Cleanup, use lang strings * Add ping() method to GeyserConnection in api * Update to cloud changes commit af60a77 Author: Konicai <71294714+Konicai@users.noreply.github.com> Date: Thu Jul 11 23:56:42 2024 -0500 Cloud for commands (GeyserMC#3808) Co-authored-by: onebeastchris <github@onechris.mozmail.com>
letsgoawaydev
added a commit
to letsgoawaydev/Geyser
that referenced
this pull request
Jul 21, 2024
commit 7bd4f9c Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:50:37 2024 +0800 Half complete GuiData commit, needs some changes most likely commit d78441a Merge: 6338d1c 4547431 Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:33:41 2024 +0800 Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api commit 6338d1c Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:33:37 2024 +0800 test commit 0654d2d Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 13:11:27 2024 +0200 Fix: Text display offset <GeyserMC#4439> (GeyserMC#4883) commit 57919db Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 02:15:38 2024 +0200 Somewhat fix: firework recipe not showing up in recipe book (GeyserMC#4873) * Somewhat fix firework crafting * Use instanceof instead of casting commit 23d53db Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 02:10:51 2024 +0200 Fix: Only shutdown/close handlers in onDisable if they're nonnull (GeyserMC#4882) commit 6459f67 Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com> Date: Sat Jul 20 18:09:22 2024 +0800 Use the correct way of sending block breaking particles (GeyserMC#4825) commit ebc7f30 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:22:04 2024 -0400 Respect block range attribute where we can GeyserMC#4864 commit bf16ddb Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:21:36 2024 -0400 Small cleanups commit 2d73e51 Author: chris <github@onechris.mozmail.com> Date: Wed Jul 17 21:44:53 2024 +0200 Properly fix hanging signs (GeyserMC#4872) commit 3fad986 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed Jul 17 14:21:41 2024 -0400 Fix GeyserMC#4870 commit 3144721 Author: Valaphee The Meerkat <32491319+valaphee@users.noreply.github.com> Date: Tue Jul 16 14:13:34 2024 +0200 Empty player list on phase transition, despawn skulls, always reset weather (GeyserMC#4847) * Empty player list on transition, despawn skulls * Always reset weather commit 07bdc1c Author: masel.io <git@byteexception.eu> Date: Tue Jul 16 11:23:30 2024 +0200 Add Timeout to CompletableFuture in GeyserBungeePingPassthrough to Prevent Memory Leak (GeyserMC#4858) * fix: Add timeout for GeyserBungeePingPassthrough#getPingInformation Signed-off-by: ByteExceptionM <git@byteexception.eu> * fix: Use Geyser Logger instead of Bungee Logger Signed-off-by: ByteExceptionM <git@byteexception.eu> * Fix typo Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> * chore: Add ip suppression if configured Signed-off-by: ByteExceptionM <git@byteexception.eu> * Remove empty line Co-authored-by: chris <github@onechris.mozmail.com> * Remove empty line Co-authored-by: chris <github@onechris.mozmail.com> --------- Signed-off-by: ByteExceptionM <git@byteexception.eu> Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> Co-authored-by: chris <github@onechris.mozmail.com> commit ea4a21c Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon Jul 15 15:16:45 2024 -0400 Indicate support for Bedrock 1.21.3 commit 6dfb1a8 Author: chris <github@onechris.mozmail.com> Date: Mon Jul 15 01:31:03 2024 +0200 Fix: Block place sounds on mod platforms (GeyserMC#4859) commit 215b12e Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 21:55:57 2024 +0200 Fix: Totem animation when playing totem effects manually (GeyserMC#4860) * Fix: Totem animation for manually played totem effects * Ensure we always reset the offhand correctly commit 92112f4 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 20:17:22 2024 +0200 Fix: Send a container close packet to Java for containers that could not be opened (GeyserMC#4861) * Close containers if we did not manage to open it * Mark session inventory translator as nonnull commit 054fc09 Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com> Date: Sun Jul 14 16:44:39 2024 +0800 Correctly cap scale attribute (GeyserMC#4856) * Fix scale attribute cap * Update LivingEntity.java commit c862d5a Author: chris <github@onechris.mozmail.com> Date: Sat Jul 13 22:00:15 2024 +0200 Fix: Manually translated item names for block items not showing up properly (GeyserMC#4857) commit 94f17d1 Author: chris <github@onechris.mozmail.com> Date: Sat Jul 13 18:53:13 2024 +0200 Fix: Item color names/glint for rare items (GeyserMC#4763) * debug stick changes * yay light purple item name * Address review * Auto-generate rarity * Add glint generation * Translate all rare items properly * Use putIfAbsent instead of double checks commit e127f9e Author: chris <github@onechris.mozmail.com> Date: Fri Jul 12 20:55:40 2024 +0200 Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#4814) commit 4547431 Merge: 96aecd2 b213fb5 Author: Ethan <ethpsa09@gmail.com> Date: Sun Jul 21 21:02:04 2024 +0800 Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api commit 96aecd2 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 22:09:55 2024 +0200 Feature: API to switch items in the offhand/mainhand (GeyserMC#4819) commit a9c6d8b Author: chris <github@onechris.mozmail.com> Date: Fri Jul 12 20:42:31 2024 +0200 Add a /geyser ping command (GeyserMC#4131) * Init: Add /geyser ping command * Block just console execution, not everything but console senders * Use RTT as that seems to vary less wildly compared to getPing() * Cleanup, use lang strings * Add ping() method to GeyserConnection in api * Update to cloud changes commit a57671e Author: Konicai <71294714+Konicai@users.noreply.github.com> Date: Thu Jul 11 23:56:42 2024 -0500 Cloud for commands (GeyserMC#3808) Co-authored-by: onebeastchris <github@onechris.mozmail.com>
letsgoawaydev
added a commit
to letsgoawaydev/Geyser
that referenced
this pull request
Jul 22, 2024
commit 1dd9ba3 Author: chris <github@onechris.mozmail.com> Date: Mon Jul 22 07:24:21 2024 +0200 Fix: Allow items to be worn as hats if their Java base items also allow it (GeyserMC#4885) commit b248abf Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 13:11:27 2024 +0200 Fix: Text display offset <GeyserMC#4439> (GeyserMC#4883) commit ddce101 Merge: 7d5c4a3 96f0098 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:22:12 2024 -0400 Merge branch 'master' of https://github.com/GeyserMC/Geyser commit 7d5c4a3 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:22:04 2024 -0400 Respect block range attribute where we can GeyserMC#4864 commit c9e423a Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sat Jul 20 23:21:36 2024 -0400 Small cleanups commit 96f0098 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 02:15:38 2024 +0200 Somewhat fix: firework recipe not showing up in recipe book (GeyserMC#4873) * Somewhat fix firework crafting * Use instanceof instead of casting commit f62cef7 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 21 02:10:51 2024 +0200 Fix: Only shutdown/close handlers in onDisable if they're nonnull (GeyserMC#4882) commit 8fd99e1 Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com> Date: Sat Jul 20 18:09:22 2024 +0800 Use the correct way of sending block breaking particles (GeyserMC#4825) commit 9fe3acc Author: chris <github@onechris.mozmail.com> Date: Wed Jul 17 21:44:53 2024 +0200 Properly fix hanging signs (GeyserMC#4872) commit 406eae2 Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed Jul 17 14:21:41 2024 -0400 Fix GeyserMC#4870 commit 669a76c Author: Valaphee The Meerkat <32491319+valaphee@users.noreply.github.com> Date: Tue Jul 16 14:13:34 2024 +0200 Empty player list on phase transition, despawn skulls, always reset weather (GeyserMC#4847) * Empty player list on transition, despawn skulls * Always reset weather commit 677a56c Author: masel.io <git@byteexception.eu> Date: Tue Jul 16 11:23:30 2024 +0200 Add Timeout to CompletableFuture in GeyserBungeePingPassthrough to Prevent Memory Leak (GeyserMC#4858) * fix: Add timeout for GeyserBungeePingPassthrough#getPingInformation Signed-off-by: ByteExceptionM <git@byteexception.eu> * fix: Use Geyser Logger instead of Bungee Logger Signed-off-by: ByteExceptionM <git@byteexception.eu> * Fix typo Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> * chore: Add ip suppression if configured Signed-off-by: ByteExceptionM <git@byteexception.eu> * Remove empty line Co-authored-by: chris <github@onechris.mozmail.com> * Remove empty line Co-authored-by: chris <github@onechris.mozmail.com> --------- Signed-off-by: ByteExceptionM <git@byteexception.eu> Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> Co-authored-by: chris <github@onechris.mozmail.com> commit 305495c Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon Jul 15 15:16:45 2024 -0400 Indicate support for Bedrock 1.21.3 commit efc8ba0 Author: chris <github@onechris.mozmail.com> Date: Mon Jul 15 01:31:03 2024 +0200 Fix: Block place sounds on mod platforms (GeyserMC#4859) commit 0689050 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 21:55:57 2024 +0200 Fix: Totem animation when playing totem effects manually (GeyserMC#4860) * Fix: Totem animation for manually played totem effects * Ensure we always reset the offhand correctly commit 9cdda70 Author: chris <github@onechris.mozmail.com> Date: Sun Jul 14 20:17:22 2024 +0200 Fix: Send a container close packet to Java for containers that could not be opened (GeyserMC#4861) * Close containers if we did not manage to open it * Mark session inventory translator as nonnull commit 49f66c2 Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com> Date: Sun Jul 14 16:44:39 2024 +0800 Correctly cap scale attribute (GeyserMC#4856) * Fix scale attribute cap * Update LivingEntity.java commit 6ab0186 Author: chris <github@onechris.mozmail.com> Date: Sat Jul 13 22:00:15 2024 +0200 Fix: Manually translated item names for block items not showing up properly (GeyserMC#4857) commit b0c7ddb Author: chris <github@onechris.mozmail.com> Date: Sat Jul 13 18:53:13 2024 +0200 Fix: Item color names/glint for rare items (GeyserMC#4763) * debug stick changes * yay light purple item name * Address review * Auto-generate rarity * Add glint generation * Translate all rare items properly * Use putIfAbsent instead of double checks commit 93b0a61 Author: chris <github@onechris.mozmail.com> Date: Fri Jul 12 20:55:40 2024 +0200 Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#4814)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4301 - the proper long term fix would be to:
While i was able to craft tools just fine without nbt tags being stripped, this is no guarantee - hence why i left in todo's for now.