Skip to content

Commit d114ab9

Browse files
onebeastchrisonebeastchris
committed
send ServerboundPlayerLoadedPacket, update built-in-tags
1 parent be77e6b commit d114ab9

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

‎core/src/main/java/org/geysermc/geyser/session/cache/tags/BlockTag.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public final class BlockTag {
5656
public static final Tag<Block> OVERWORLD_NATURAL_LOGS = create("overworld_natural_logs");
5757
public static final Tag<Block> LOGS = create("logs");
5858
public static final Tag<Block> DARK_OAK_LOGS = create("dark_oak_logs");
59+
public static final Tag<Block> PALE_OAK_LOGS = create("pale_oak_logs");
5960
public static final Tag<Block> OAK_LOGS = create("oak_logs");
6061
public static final Tag<Block> BIRCH_LOGS = create("birch_logs");
6162
public static final Tag<Block> ACACIA_LOGS = create("acacia_logs");
@@ -80,8 +81,8 @@ public final class BlockTag {
8081
public static final Tag<Block> SMALL_FLOWERS = create("small_flowers");
8182
public static final Tag<Block> BEDS = create("beds");
8283
public static final Tag<Block> FENCES = create("fences");
83-
public static final Tag<Block> TALL_FLOWERS = create("tall_flowers");
8484
public static final Tag<Block> FLOWERS = create("flowers");
85+
public static final Tag<Block> BEE_ATTRACTIVE = create("bee_attractive");
8586
public static final Tag<Block> PIGLIN_REPELLENTS = create("piglin_repellents");
8687
public static final Tag<Block> GOLD_ORES = create("gold_ores");
8788
public static final Tag<Block> IRON_ORES = create("iron_ores");
@@ -97,6 +98,7 @@ public final class BlockTag {
9798
public static final Tag<Block> BADLANDS_TERRACOTTA = create("badlands_terracotta");
9899
public static final Tag<Block> CONCRETE_POWDER = create("concrete_powder");
99100
public static final Tag<Block> COMPLETES_FIND_TREE_TUTORIAL = create("completes_find_tree_tutorial");
101+
public static final Tag<Block> SHULKER_BOXES = create("shulker_boxes");
100102
public static final Tag<Block> FLOWER_POTS = create("flower_pots");
101103
public static final Tag<Block> ENDERMAN_HOLDABLE = create("enderman_holdable");
102104
public static final Tag<Block> ICE = create("ice");
@@ -130,7 +132,6 @@ public final class BlockTag {
130132
public static final Tag<Block> WALL_POST_OVERRIDE = create("wall_post_override");
131133
public static final Tag<Block> CLIMBABLE = create("climbable");
132134
public static final Tag<Block> FALL_DAMAGE_RESETTING = create("fall_damage_resetting");
133-
public static final Tag<Block> SHULKER_BOXES = create("shulker_boxes");
134135
public static final Tag<Block> HOGLIN_REPELLENTS = create("hoglin_repellents");
135136
public static final Tag<Block> SOUL_FIRE_BASE_BLOCKS = create("soul_fire_base_blocks");
136137
public static final Tag<Block> STRIDER_WARM_BLOCKS = create("strider_warm_blocks");
@@ -198,6 +199,7 @@ public final class BlockTag {
198199
public static final Tag<Block> FOXES_SPAWNABLE_ON = create("foxes_spawnable_on");
199200
public static final Tag<Block> WOLVES_SPAWNABLE_ON = create("wolves_spawnable_on");
200201
public static final Tag<Block> FROGS_SPAWNABLE_ON = create("frogs_spawnable_on");
202+
public static final Tag<Block> BATS_SPAWNABLE_ON = create("bats_spawnable_on");
201203
public static final Tag<Block> AZALEA_GROWS_ON = create("azalea_grows_on");
202204
public static final Tag<Block> CONVERTABLE_TO_MUD = create("convertable_to_mud");
203205
public static final Tag<Block> MANGROVE_LOGS_CAN_GROW_THROUGH = create("mangrove_logs_can_grow_through");

‎core/src/main/java/org/geysermc/geyser/session/cache/tags/ItemTag.java‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public final class ItemTag {
5353
public static final Tag<Item> LOGS_THAT_BURN = create("logs_that_burn");
5454
public static final Tag<Item> LOGS = create("logs");
5555
public static final Tag<Item> DARK_OAK_LOGS = create("dark_oak_logs");
56+
public static final Tag<Item> PALE_OAK_LOGS = create("pale_oak_logs");
5657
public static final Tag<Item> OAK_LOGS = create("oak_logs");
5758
public static final Tag<Item> BIRCH_LOGS = create("birch_logs");
5859
public static final Tag<Item> ACACIA_LOGS = create("acacia_logs");
@@ -77,11 +78,13 @@ public final class ItemTag {
7778
public static final Tag<Item> SMALL_FLOWERS = create("small_flowers");
7879
public static final Tag<Item> BEDS = create("beds");
7980
public static final Tag<Item> FENCES = create("fences");
80-
public static final Tag<Item> TALL_FLOWERS = create("tall_flowers");
81-
public static final Tag<Item> FLOWERS = create("flowers");
8281
public static final Tag<Item> PIGLIN_REPELLENTS = create("piglin_repellents");
8382
public static final Tag<Item> PIGLIN_LOVED = create("piglin_loved");
8483
public static final Tag<Item> IGNORED_BY_PIGLIN_BABIES = create("ignored_by_piglin_babies");
84+
public static final Tag<Item> PIGLIN_SAFE_ARMOR = create("piglin_safe_armor");
85+
public static final Tag<Item> DUPLICATES_ALLAYS = create("duplicates_allays");
86+
public static final Tag<Item> BREWING_FUEL = create("brewing_fuel");
87+
public static final Tag<Item> SHULKER_BOXES = create("shulker_boxes");
8588
public static final Tag<Item> MEAT = create("meat");
8689
public static final Tag<Item> SNIFFER_FOOD = create("sniffer_food");
8790
public static final Tag<Item> PIGLIN_FOOD = create("piglin_food");
@@ -103,6 +106,7 @@ public final class ItemTag {
103106
public static final Tag<Item> LLAMA_TEMPT_ITEMS = create("llama_tempt_items");
104107
public static final Tag<Item> OCELOT_FOOD = create("ocelot_food");
105108
public static final Tag<Item> PANDA_FOOD = create("panda_food");
109+
public static final Tag<Item> PANDA_EATS_FROM_GROUND = create("panda_eats_from_ground");
106110
public static final Tag<Item> PIG_FOOD = create("pig_food");
107111
public static final Tag<Item> RABBIT_FOOD = create("rabbit_food");
108112
public static final Tag<Item> STRIDER_FOOD = create("strider_food");
@@ -135,7 +139,20 @@ public final class ItemTag {
135139
public static final Tag<Item> LECTERN_BOOKS = create("lectern_books");
136140
public static final Tag<Item> BOOKSHELF_BOOKS = create("bookshelf_books");
137141
public static final Tag<Item> BEACON_PAYMENT_ITEMS = create("beacon_payment_items");
142+
public static final Tag<Item> WOODEN_TOOL_MATERIALS = create("wooden_tool_materials");
138143
public static final Tag<Item> STONE_TOOL_MATERIALS = create("stone_tool_materials");
144+
public static final Tag<Item> IRON_TOOL_MATERIALS = create("iron_tool_materials");
145+
public static final Tag<Item> GOLD_TOOL_MATERIALS = create("gold_tool_materials");
146+
public static final Tag<Item> DIAMOND_TOOL_MATERIALS = create("diamond_tool_materials");
147+
public static final Tag<Item> NETHERITE_TOOL_MATERIALS = create("netherite_tool_materials");
148+
public static final Tag<Item> REPAIRS_LEATHER_ARMOR = create("repairs_leather_armor");
149+
public static final Tag<Item> REPAIRS_CHAIN_ARMOR = create("repairs_chain_armor");
150+
public static final Tag<Item> REPAIRS_IRON_ARMOR = create("repairs_iron_armor");
151+
public static final Tag<Item> REPAIRS_GOLD_ARMOR = create("repairs_gold_armor");
152+
public static final Tag<Item> REPAIRS_DIAMOND_ARMOR = create("repairs_diamond_armor");
153+
public static final Tag<Item> REPAIRS_NETHERITE_ARMOR = create("repairs_netherite_armor");
154+
public static final Tag<Item> REPAIRS_TURTLE_HELMET = create("repairs_turtle_helmet");
155+
public static final Tag<Item> REPAIRS_WOLF_ARMOR = create("repairs_wolf_armor");
139156
public static final Tag<Item> STONE_CRAFTING_MATERIALS = create("stone_crafting_materials");
140157
public static final Tag<Item> FREEZE_IMMUNE_WEARABLES = create("freeze_immune_wearables");
141158
public static final Tag<Item> DAMPENS_VIBRATIONS = create("dampens_vibrations");
@@ -151,7 +168,6 @@ public final class ItemTag {
151168
public static final Tag<Item> SKULLS = create("skulls");
152169
public static final Tag<Item> TRIMMABLE_ARMOR = create("trimmable_armor");
153170
public static final Tag<Item> TRIM_MATERIALS = create("trim_materials");
154-
public static final Tag<Item> TRIM_TEMPLATES = create("trim_templates");
155171
public static final Tag<Item> DECORATED_POT_SHERDS = create("decorated_pot_sherds");
156172
public static final Tag<Item> DECORATED_POT_INGREDIENTS = create("decorated_pot_ingredients");
157173
public static final Tag<Item> SWORDS = create("swords");
@@ -161,7 +177,15 @@ public final class ItemTag {
161177
public static final Tag<Item> SHOVELS = create("shovels");
162178
public static final Tag<Item> BREAKS_DECORATED_POTS = create("breaks_decorated_pots");
163179
public static final Tag<Item> VILLAGER_PLANTABLE_SEEDS = create("villager_plantable_seeds");
180+
public static final Tag<Item> VILLAGER_PICKS_UP = create("villager_picks_up");
164181
public static final Tag<Item> DYEABLE = create("dyeable");
182+
public static final Tag<Item> FURNACE_MINECART_FUEL = create("furnace_minecart_fuel");
183+
public static final Tag<Item> BUNDLES = create("bundles");
184+
public static final Tag<Item> SKELETON_PREFERRED_WEAPONS = create("skeleton_preferred_weapons");
185+
public static final Tag<Item> DROWNED_PREFERRED_WEAPONS = create("drowned_preferred_weapons");
186+
public static final Tag<Item> PIGLIN_PREFERRED_WEAPONS = create("piglin_preferred_weapons");
187+
public static final Tag<Item> PILLAGER_PREFERRED_WEAPONS = create("pillager_preferred_weapons");
188+
public static final Tag<Item> WITHER_SKELETON_DISLIKED_WEAPONS = create("wither_skeleton_disliked_weapons");
165189
public static final Tag<Item> ENCHANTABLE_FOOT_ARMOR = create("enchantable/foot_armor");
166190
public static final Tag<Item> ENCHANTABLE_LEG_ARMOR = create("enchantable/leg_armor");
167191
public static final Tag<Item> ENCHANTABLE_CHEST_ARMOR = create("enchantable/chest_armor");
@@ -181,6 +205,8 @@ public final class ItemTag {
181205
public static final Tag<Item> ENCHANTABLE_CROSSBOW = create("enchantable/crossbow");
182206
public static final Tag<Item> ENCHANTABLE_VANISHING = create("enchantable/vanishing");
183207
public static final Tag<Item> ENCHANTABLE_MACE = create("enchantable/mace");
208+
public static final Tag<Item> MAP_INVISIBILITY_EQUIPMENT = create("map_invisibility_equipment");
209+
public static final Tag<Item> GAZE_DISGUISE_EQUIPMENT = create("gaze_disguise_equipment");
184210

185211
private ItemTag() {}
186212

‎core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.geysermc.geyser.translator.protocol.Translator;
3535
import org.geysermc.geyser.util.InventoryUtils;
3636
import org.geysermc.geyser.util.LoginEncryptionUtils;
37+
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundPlayerLoadedPacket;
3738

3839
@Translator(packet = SetLocalPlayerAsInitializedPacket.class)
3940
public class BedrockSetLocalPlayerAsInitializedTranslator extends PacketTranslator<SetLocalPlayerAsInitializedPacket> {
@@ -72,6 +73,7 @@ public void translate(GeyserSession session, SetLocalPlayerAsInitializedPacket p
7273
session.getFormCache().resendAllForms();
7374

7475
GeyserImpl.getInstance().eventBus().fire(new SessionJoinEvent(session));
76+
session.sendDownstreamGamePacket(ServerboundPlayerLoadedPacket.INSTANCE);
7577
}
7678
}
7779
}

0 commit comments

Comments
 (0)