GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ext-1.19.20-fixes

Browse source 
# Conflicts:
#	core/pom.xml
This commit is contained in:
Konicai 2022-08-09 19:24:47 -04:00
commit 259fed247a
No known key found for this signature in database
GPG key ID: 710D09287708C823
5 changed files with 9973 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-logic/src/main/kotlin/Versions.kt
View file

@ -30,7 +30,7 @@ object Versions {
const val guavaVersion = "29.0-jre" const val guavaVersion = "29.0-jre"
const val nbtVersion = "2.1.0" const val nbtVersion = "2.1.0"
const val websocketVersion = "1.5.1" const val websocketVersion = "1.5.1"
const val protocolVersion = "92d9854" const val protocolVersion = "0bd459f"
// Not pinned to specific version due to possible gradle bug // Not pinned to specific version due to possible gradle bug
// See comment in settings.gradle.kts // See comment in settings.gradle.kts
const val raknetVersion = "1.6.28-SNAPSHOT" const val raknetVersion = "1.6.28-SNAPSHOT"

2
core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View file

@ -40,6 +40,7 @@ import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import com.nukkitx.protocol.bedrock.v527.Bedrock_v527; import com.nukkitx.protocol.bedrock.v527.Bedrock_v527;
import com.nukkitx.protocol.bedrock.v534.Bedrock_v534; import com.nukkitx.protocol.bedrock.v534.Bedrock_v534;
import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntList;
@ -78,6 +79,7 @@ public class ItemRegistryPopulator {
paletteVersions.put("1_19_0", new PaletteVersion(Bedrock_v527.V527_CODEC.getProtocolVersion(), paletteVersions.put("1_19_0", new PaletteVersion(Bedrock_v527.V527_CODEC.getProtocolVersion(),
Collections.singletonMap("minecraft:trader_llama_spawn_egg", "minecraft:llama_spawn_egg"))); Collections.singletonMap("minecraft:trader_llama_spawn_egg", "minecraft:llama_spawn_egg")));
paletteVersions.put("1_19_10", new PaletteVersion(Bedrock_v534.V534_CODEC.getProtocolVersion(), Collections.emptyMap())); paletteVersions.put("1_19_10", new PaletteVersion(Bedrock_v534.V534_CODEC.getProtocolVersion(), Collections.emptyMap()));
paletteVersions.put("1_19_20", new PaletteVersion(Bedrock_v544.V544_CODEC.getProtocolVersion(), Collections.emptyMap()));
GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap(); GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();

5440
core/src/main/resources/bedrock/creative_items.1_19_20.json Normal file
View file

File diff suppressed because it is too large Load diff

BIN
core/src/main/resources/bedrock/entity_identifiers.dat
View file

Binary file not shown.

4530
core/src/main/resources/bedrock/runtime_item_states.1_19_20.json Normal file
View file

File diff suppressed because it is too large Load diff