mirror of
https://github.com/GeyserMC/Geyser.git
synced 2025-12-20 15:29:27 +00:00
Version item components, update creative items
This commit is contained in:
@@ -197,7 +197,7 @@ public class ItemRegistryPopulator {
|
|||||||
paletteVersions.add(new PaletteVersion("1_21_93", Bedrock_v819.CODEC.getProtocolVersion(), eightOneNineFallbacks, Conversion844_827::remapItem));
|
paletteVersions.add(new PaletteVersion("1_21_93", Bedrock_v819.CODEC.getProtocolVersion(), eightOneNineFallbacks, Conversion844_827::remapItem));
|
||||||
paletteVersions.add(new PaletteVersion("1_21_100", Bedrock_v827.CODEC.getProtocolVersion(), eightTwoSevenFallbacks, Conversion844_827::remapItem));
|
paletteVersions.add(new PaletteVersion("1_21_100", Bedrock_v827.CODEC.getProtocolVersion(), eightTwoSevenFallbacks, Conversion844_827::remapItem));
|
||||||
paletteVersions.add(new PaletteVersion("1_21_110", Bedrock_v844.CODEC.getProtocolVersion()));
|
paletteVersions.add(new PaletteVersion("1_21_110", Bedrock_v844.CODEC.getProtocolVersion()));
|
||||||
paletteVersions.add(new PaletteVersion("1_21_110", Bedrock_v859.CODEC.getProtocolVersion()));
|
paletteVersions.add(new PaletteVersion("1_21_120", Bedrock_v859.CODEC.getProtocolVersion()));
|
||||||
|
|
||||||
GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
|
GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
|
||||||
|
|
||||||
@@ -211,13 +211,6 @@ public class ItemRegistryPopulator {
|
|||||||
throw new AssertionError("Unable to load Java runtime item IDs", e);
|
throw new AssertionError("Unable to load Java runtime item IDs", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
NbtMap vanillaComponents;
|
|
||||||
try (InputStream stream = bootstrap.getResourceOrThrow("bedrock/item_components.nbt")) {
|
|
||||||
vanillaComponents = (NbtMap) NbtUtils.createGZIPReader(stream, true, true).readTag();
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new AssertionError("Unable to load Bedrock item components", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean customItemsAllowed = GeyserImpl.getInstance().getConfig().isAddNonBedrockItems();
|
boolean customItemsAllowed = GeyserImpl.getInstance().getConfig().isAddNonBedrockItems();
|
||||||
|
|
||||||
// List values here is important compared to HashSet - we need to preserve the order of what's given to us
|
// List values here is important compared to HashSet - we need to preserve the order of what's given to us
|
||||||
@@ -244,6 +237,13 @@ public class ItemRegistryPopulator {
|
|||||||
throw new AssertionError("Unable to load Bedrock runtime item IDs", e);
|
throw new AssertionError("Unable to load Bedrock runtime item IDs", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NbtMap vanillaComponents;
|
||||||
|
try (InputStream stream = bootstrap.getResourceOrThrow("bedrock/item_components.%s.nbt".formatted(palette.version()))) {
|
||||||
|
vanillaComponents = (NbtMap) NbtUtils.createGZIPReader(stream, true, true).readTag();
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new AssertionError("Unable to load Bedrock item components", e);
|
||||||
|
}
|
||||||
|
|
||||||
// Used for custom items
|
// Used for custom items
|
||||||
int nextFreeBedrockId = 0;
|
int nextFreeBedrockId = 0;
|
||||||
Int2ObjectMap<ItemDefinition> registry = new Int2ObjectOpenHashMap<>();
|
Int2ObjectMap<ItemDefinition> registry = new Int2ObjectOpenHashMap<>();
|
||||||
|
|||||||
9516
core/src/main/resources/bedrock/creative_items.1_21_120.json
Normal file
9516
core/src/main/resources/bedrock/creative_items.1_21_120.json
Normal file
File diff suppressed because it is too large
Load Diff
BIN
core/src/main/resources/bedrock/item_components.1_21_110.nbt
Normal file
BIN
core/src/main/resources/bedrock/item_components.1_21_110.nbt
Normal file
Binary file not shown.
BIN
core/src/main/resources/bedrock/item_components.1_21_120.nbt
Normal file
BIN
core/src/main/resources/bedrock/item_components.1_21_120.nbt
Normal file
Binary file not shown.
BIN
core/src/main/resources/bedrock/item_components.1_21_90.nbt
Normal file
BIN
core/src/main/resources/bedrock/item_components.1_21_90.nbt
Normal file
Binary file not shown.
BIN
core/src/main/resources/bedrock/item_components.1_21_93.nbt
Normal file
BIN
core/src/main/resources/bedrock/item_components.1_21_93.nbt
Normal file
Binary file not shown.
11330
core/src/main/resources/bedrock/runtime_item_states.1_21_120.json
Normal file
11330
core/src/main/resources/bedrock/runtime_item_states.1_21_120.json
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user