diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/tags/BlockTag.java b/core/src/main/java/org/geysermc/geyser/session/cache/tags/BlockTag.java index 6ad666780..59d301a89 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/tags/BlockTag.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/tags/BlockTag.java @@ -56,6 +56,7 @@ public final class BlockTag { public static final Tag OVERWORLD_NATURAL_LOGS = create("overworld_natural_logs"); public static final Tag LOGS = create("logs"); public static final Tag DARK_OAK_LOGS = create("dark_oak_logs"); + public static final Tag PALE_OAK_LOGS = create("pale_oak_logs"); public static final Tag OAK_LOGS = create("oak_logs"); public static final Tag BIRCH_LOGS = create("birch_logs"); public static final Tag ACACIA_LOGS = create("acacia_logs"); @@ -80,8 +81,8 @@ public final class BlockTag { public static final Tag SMALL_FLOWERS = create("small_flowers"); public static final Tag BEDS = create("beds"); public static final Tag FENCES = create("fences"); - public static final Tag TALL_FLOWERS = create("tall_flowers"); public static final Tag FLOWERS = create("flowers"); + public static final Tag BEE_ATTRACTIVE = create("bee_attractive"); public static final Tag PIGLIN_REPELLENTS = create("piglin_repellents"); public static final Tag GOLD_ORES = create("gold_ores"); public static final Tag IRON_ORES = create("iron_ores"); @@ -97,6 +98,7 @@ public final class BlockTag { public static final Tag BADLANDS_TERRACOTTA = create("badlands_terracotta"); public static final Tag CONCRETE_POWDER = create("concrete_powder"); public static final Tag COMPLETES_FIND_TREE_TUTORIAL = create("completes_find_tree_tutorial"); + public static final Tag SHULKER_BOXES = create("shulker_boxes"); public static final Tag FLOWER_POTS = create("flower_pots"); public static final Tag ENDERMAN_HOLDABLE = create("enderman_holdable"); public static final Tag ICE = create("ice"); @@ -130,7 +132,6 @@ public final class BlockTag { public static final Tag WALL_POST_OVERRIDE = create("wall_post_override"); public static final Tag CLIMBABLE = create("climbable"); public static final Tag FALL_DAMAGE_RESETTING = create("fall_damage_resetting"); - public static final Tag SHULKER_BOXES = create("shulker_boxes"); public static final Tag HOGLIN_REPELLENTS = create("hoglin_repellents"); public static final Tag SOUL_FIRE_BASE_BLOCKS = create("soul_fire_base_blocks"); public static final Tag STRIDER_WARM_BLOCKS = create("strider_warm_blocks"); @@ -198,6 +199,7 @@ public final class BlockTag { public static final Tag FOXES_SPAWNABLE_ON = create("foxes_spawnable_on"); public static final Tag WOLVES_SPAWNABLE_ON = create("wolves_spawnable_on"); public static final Tag FROGS_SPAWNABLE_ON = create("frogs_spawnable_on"); + public static final Tag BATS_SPAWNABLE_ON = create("bats_spawnable_on"); public static final Tag AZALEA_GROWS_ON = create("azalea_grows_on"); public static final Tag CONVERTABLE_TO_MUD = create("convertable_to_mud"); public static final Tag MANGROVE_LOGS_CAN_GROW_THROUGH = create("mangrove_logs_can_grow_through"); diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/tags/ItemTag.java b/core/src/main/java/org/geysermc/geyser/session/cache/tags/ItemTag.java index 4f42f146a..e2f4f2db3 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/tags/ItemTag.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/tags/ItemTag.java @@ -53,6 +53,7 @@ public final class ItemTag { public static final Tag LOGS_THAT_BURN = create("logs_that_burn"); public static final Tag LOGS = create("logs"); public static final Tag DARK_OAK_LOGS = create("dark_oak_logs"); + public static final Tag PALE_OAK_LOGS = create("pale_oak_logs"); public static final Tag OAK_LOGS = create("oak_logs"); public static final Tag BIRCH_LOGS = create("birch_logs"); public static final Tag ACACIA_LOGS = create("acacia_logs"); @@ -77,11 +78,13 @@ public final class ItemTag { public static final Tag SMALL_FLOWERS = create("small_flowers"); public static final Tag BEDS = create("beds"); public static final Tag FENCES = create("fences"); - public static final Tag TALL_FLOWERS = create("tall_flowers"); - public static final Tag FLOWERS = create("flowers"); public static final Tag PIGLIN_REPELLENTS = create("piglin_repellents"); public static final Tag PIGLIN_LOVED = create("piglin_loved"); public static final Tag IGNORED_BY_PIGLIN_BABIES = create("ignored_by_piglin_babies"); + public static final Tag PIGLIN_SAFE_ARMOR = create("piglin_safe_armor"); + public static final Tag DUPLICATES_ALLAYS = create("duplicates_allays"); + public static final Tag BREWING_FUEL = create("brewing_fuel"); + public static final Tag SHULKER_BOXES = create("shulker_boxes"); public static final Tag MEAT = create("meat"); public static final Tag SNIFFER_FOOD = create("sniffer_food"); public static final Tag PIGLIN_FOOD = create("piglin_food"); @@ -103,6 +106,7 @@ public final class ItemTag { public static final Tag LLAMA_TEMPT_ITEMS = create("llama_tempt_items"); public static final Tag OCELOT_FOOD = create("ocelot_food"); public static final Tag PANDA_FOOD = create("panda_food"); + public static final Tag PANDA_EATS_FROM_GROUND = create("panda_eats_from_ground"); public static final Tag PIG_FOOD = create("pig_food"); public static final Tag RABBIT_FOOD = create("rabbit_food"); public static final Tag STRIDER_FOOD = create("strider_food"); @@ -135,7 +139,20 @@ public final class ItemTag { public static final Tag LECTERN_BOOKS = create("lectern_books"); public static final Tag BOOKSHELF_BOOKS = create("bookshelf_books"); public static final Tag BEACON_PAYMENT_ITEMS = create("beacon_payment_items"); + public static final Tag WOODEN_TOOL_MATERIALS = create("wooden_tool_materials"); public static final Tag STONE_TOOL_MATERIALS = create("stone_tool_materials"); + public static final Tag IRON_TOOL_MATERIALS = create("iron_tool_materials"); + public static final Tag GOLD_TOOL_MATERIALS = create("gold_tool_materials"); + public static final Tag DIAMOND_TOOL_MATERIALS = create("diamond_tool_materials"); + public static final Tag NETHERITE_TOOL_MATERIALS = create("netherite_tool_materials"); + public static final Tag REPAIRS_LEATHER_ARMOR = create("repairs_leather_armor"); + public static final Tag REPAIRS_CHAIN_ARMOR = create("repairs_chain_armor"); + public static final Tag REPAIRS_IRON_ARMOR = create("repairs_iron_armor"); + public static final Tag REPAIRS_GOLD_ARMOR = create("repairs_gold_armor"); + public static final Tag REPAIRS_DIAMOND_ARMOR = create("repairs_diamond_armor"); + public static final Tag REPAIRS_NETHERITE_ARMOR = create("repairs_netherite_armor"); + public static final Tag REPAIRS_TURTLE_HELMET = create("repairs_turtle_helmet"); + public static final Tag REPAIRS_WOLF_ARMOR = create("repairs_wolf_armor"); public static final Tag STONE_CRAFTING_MATERIALS = create("stone_crafting_materials"); public static final Tag FREEZE_IMMUNE_WEARABLES = create("freeze_immune_wearables"); public static final Tag DAMPENS_VIBRATIONS = create("dampens_vibrations"); @@ -151,7 +168,6 @@ public final class ItemTag { public static final Tag SKULLS = create("skulls"); public static final Tag TRIMMABLE_ARMOR = create("trimmable_armor"); public static final Tag TRIM_MATERIALS = create("trim_materials"); - public static final Tag TRIM_TEMPLATES = create("trim_templates"); public static final Tag DECORATED_POT_SHERDS = create("decorated_pot_sherds"); public static final Tag DECORATED_POT_INGREDIENTS = create("decorated_pot_ingredients"); public static final Tag SWORDS = create("swords"); @@ -161,7 +177,15 @@ public final class ItemTag { public static final Tag SHOVELS = create("shovels"); public static final Tag BREAKS_DECORATED_POTS = create("breaks_decorated_pots"); public static final Tag VILLAGER_PLANTABLE_SEEDS = create("villager_plantable_seeds"); + public static final Tag VILLAGER_PICKS_UP = create("villager_picks_up"); public static final Tag DYEABLE = create("dyeable"); + public static final Tag FURNACE_MINECART_FUEL = create("furnace_minecart_fuel"); + public static final Tag BUNDLES = create("bundles"); + public static final Tag SKELETON_PREFERRED_WEAPONS = create("skeleton_preferred_weapons"); + public static final Tag DROWNED_PREFERRED_WEAPONS = create("drowned_preferred_weapons"); + public static final Tag PIGLIN_PREFERRED_WEAPONS = create("piglin_preferred_weapons"); + public static final Tag PILLAGER_PREFERRED_WEAPONS = create("pillager_preferred_weapons"); + public static final Tag WITHER_SKELETON_DISLIKED_WEAPONS = create("wither_skeleton_disliked_weapons"); public static final Tag ENCHANTABLE_FOOT_ARMOR = create("enchantable/foot_armor"); public static final Tag ENCHANTABLE_LEG_ARMOR = create("enchantable/leg_armor"); public static final Tag ENCHANTABLE_CHEST_ARMOR = create("enchantable/chest_armor"); @@ -181,6 +205,8 @@ public final class ItemTag { public static final Tag ENCHANTABLE_CROSSBOW = create("enchantable/crossbow"); public static final Tag ENCHANTABLE_VANISHING = create("enchantable/vanishing"); public static final Tag ENCHANTABLE_MACE = create("enchantable/mace"); + public static final Tag MAP_INVISIBILITY_EQUIPMENT = create("map_invisibility_equipment"); + public static final Tag GAZE_DISGUISE_EQUIPMENT = create("gaze_disguise_equipment"); private ItemTag() {} diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java index 47c5bfd35..556d8cd8d 100644 --- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java @@ -34,6 +34,7 @@ import org.geysermc.geyser.translator.protocol.PacketTranslator; import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.util.InventoryUtils; import org.geysermc.geyser.util.LoginEncryptionUtils; +import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundPlayerLoadedPacket; @Translator(packet = SetLocalPlayerAsInitializedPacket.class) public class BedrockSetLocalPlayerAsInitializedTranslator extends PacketTranslator { @@ -72,6 +73,7 @@ public class BedrockSetLocalPlayerAsInitializedTranslator extends PacketTranslat session.getFormCache().resendAllForms(); GeyserImpl.getInstance().eventBus().fire(new SessionJoinEvent(session)); + session.sendDownstreamGamePacket(ServerboundPlayerLoadedPacket.INSTANCE); } } }