Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-11-19 22:40:18 +01:00
Add support for Bedrock 1.19.50 (560)
Dieser Commit ist enthalten in:
Ursprung
7dc2ca35d6
Commit
8f96823048
@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
|
|||||||
|
|
||||||
Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
|
Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
|
||||||
|
|
||||||
### Currently supporting Minecraft Bedrock 1.19.0 - 1.19.40 and Minecraft Java 1.19.1/1.19.2.
|
### Currently supporting Minecraft Bedrock 1.19.20 - 1.19.50 and Minecraft Java 1.19.1/1.19.2.
|
||||||
|
|
||||||
## Setting Up
|
## Setting Up
|
||||||
Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.
|
Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.
|
||||||
|
@ -44,6 +44,8 @@ import lombok.Setter;
|
|||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import org.geysermc.geyser.entity.EntityDefinition;
|
import org.geysermc.geyser.entity.EntityDefinition;
|
||||||
import org.geysermc.geyser.entity.GeyserDirtyMetadata;
|
import org.geysermc.geyser.entity.GeyserDirtyMetadata;
|
||||||
|
import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
|
||||||
|
import org.geysermc.geyser.network.GameProtocol;
|
||||||
import org.geysermc.geyser.session.GeyserSession;
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
import org.geysermc.geyser.translator.text.MessageTranslator;
|
import org.geysermc.geyser.translator.text.MessageTranslator;
|
||||||
import org.geysermc.geyser.util.EntityUtils;
|
import org.geysermc.geyser.util.EntityUtils;
|
||||||
@ -353,10 +355,14 @@ public class Entity {
|
|||||||
public void setFlags(ByteEntityMetadata entityMetadata) {
|
public void setFlags(ByteEntityMetadata entityMetadata) {
|
||||||
byte xd = entityMetadata.getPrimitiveValue();
|
byte xd = entityMetadata.getPrimitiveValue();
|
||||||
setFlag(EntityFlag.ON_FIRE, ((xd & 0x01) == 0x01) && !getFlag(EntityFlag.FIRE_IMMUNE)); // Otherwise immune entities sometimes flicker onfire
|
setFlag(EntityFlag.ON_FIRE, ((xd & 0x01) == 0x01) && !getFlag(EntityFlag.FIRE_IMMUNE)); // Otherwise immune entities sometimes flicker onfire
|
||||||
|
// As of 1.19.50, the client does not want the sprinting, sneaking or gliding set on itself
|
||||||
|
if (!GameProtocol.supports1_19_50(session) || !(this instanceof SessionPlayerEntity sessionPlayer) || sessionPlayer.getSession() != session) {
|
||||||
setFlag(EntityFlag.SNEAKING, (xd & 0x02) == 0x02);
|
setFlag(EntityFlag.SNEAKING, (xd & 0x02) == 0x02);
|
||||||
setFlag(EntityFlag.SPRINTING, (xd & 0x08) == 0x08);
|
setFlag(EntityFlag.SPRINTING, (xd & 0x08) == 0x08);
|
||||||
|
|
||||||
// Swimming is ignored here and instead we rely on the pose
|
// Swimming is ignored here and instead we rely on the pose
|
||||||
setFlag(EntityFlag.GLIDING, (xd & 0x80) == 0x80);
|
setFlag(EntityFlag.GLIDING, (xd & 0x80) == 0x80);
|
||||||
|
}
|
||||||
|
|
||||||
setInvisible((xd & 0x20) == 0x20);
|
setInvisible((xd & 0x20) == 0x20);
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,9 @@ public class SessionPlayerEntity extends PlayerEntity {
|
|||||||
@Override
|
@Override
|
||||||
public void setFlags(ByteEntityMetadata entityMetadata) {
|
public void setFlags(ByteEntityMetadata entityMetadata) {
|
||||||
super.setFlags(entityMetadata);
|
super.setFlags(entityMetadata);
|
||||||
session.setSwimmingInWater((entityMetadata.getPrimitiveValue() & 0x10) == 0x10 && getFlag(EntityFlag.SPRINTING));
|
|
||||||
|
byte flags = entityMetadata.getPrimitiveValue();
|
||||||
|
session.setSwimmingInWater((flags & 0x10) == 0x10 && (flags & 0x08) == 0x08);
|
||||||
refreshSpeed = true;
|
refreshSpeed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,6 +34,7 @@ import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
|
|||||||
import com.nukkitx.protocol.bedrock.v545.Bedrock_v545;
|
import com.nukkitx.protocol.bedrock.v545.Bedrock_v545;
|
||||||
import com.nukkitx.protocol.bedrock.v554.Bedrock_v554;
|
import com.nukkitx.protocol.bedrock.v554.Bedrock_v554;
|
||||||
import com.nukkitx.protocol.bedrock.v557.Bedrock_v557;
|
import com.nukkitx.protocol.bedrock.v557.Bedrock_v557;
|
||||||
|
import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
|
||||||
import org.geysermc.geyser.session.GeyserSession;
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -48,7 +49,7 @@ public final class GameProtocol {
|
|||||||
* Default Bedrock codec that should act as a fallback. Should represent the latest available
|
* Default Bedrock codec that should act as a fallback. Should represent the latest available
|
||||||
* release of the game that Geyser supports.
|
* release of the game that Geyser supports.
|
||||||
*/
|
*/
|
||||||
public static final BedrockPacketCodec DEFAULT_BEDROCK_CODEC = Bedrock_v557.V557_CODEC;
|
public static final BedrockPacketCodec DEFAULT_BEDROCK_CODEC = Bedrock_v560.V560_CODEC;
|
||||||
/**
|
/**
|
||||||
* A list of all supported Bedrock versions that can join Geyser
|
* A list of all supported Bedrock versions that can join Geyser
|
||||||
*/
|
*/
|
||||||
@ -61,9 +62,6 @@ public final class GameProtocol {
|
|||||||
private static final PacketCodec DEFAULT_JAVA_CODEC = MinecraftCodec.CODEC;
|
private static final PacketCodec DEFAULT_JAVA_CODEC = MinecraftCodec.CODEC;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
SUPPORTED_BEDROCK_CODECS.add(Bedrock_v527.V527_CODEC.toBuilder()
|
|
||||||
.minecraftVersion("1.19.0/1.19.2")
|
|
||||||
.build());
|
|
||||||
SUPPORTED_BEDROCK_CODECS.add(Bedrock_v534.V534_CODEC.toBuilder()
|
SUPPORTED_BEDROCK_CODECS.add(Bedrock_v534.V534_CODEC.toBuilder()
|
||||||
.minecraftVersion("1.19.10/1.19.11")
|
.minecraftVersion("1.19.10/1.19.11")
|
||||||
.build());
|
.build());
|
||||||
@ -74,6 +72,7 @@ public final class GameProtocol {
|
|||||||
SUPPORTED_BEDROCK_CODECS.add(Bedrock_v554.V554_CODEC.toBuilder()
|
SUPPORTED_BEDROCK_CODECS.add(Bedrock_v554.V554_CODEC.toBuilder()
|
||||||
.minecraftVersion("1.19.30/1.19.31")
|
.minecraftVersion("1.19.30/1.19.31")
|
||||||
.build());
|
.build());
|
||||||
|
SUPPORTED_BEDROCK_CODECS.add(Bedrock_v557.V557_CODEC);
|
||||||
SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
|
SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,14 +92,14 @@ public final class GameProtocol {
|
|||||||
|
|
||||||
/* Bedrock convenience methods to gatekeep features and easily remove the check on version removal */
|
/* Bedrock convenience methods to gatekeep features and easily remove the check on version removal */
|
||||||
|
|
||||||
public static boolean supports1_19_10(GeyserSession session) {
|
|
||||||
return session.getUpstream().getProtocolVersion() >= Bedrock_v534.V534_CODEC.getProtocolVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean supports1_19_30(GeyserSession session) {
|
public static boolean supports1_19_30(GeyserSession session) {
|
||||||
return session.getUpstream().getProtocolVersion() >= Bedrock_v554.V554_CODEC.getProtocolVersion();
|
return session.getUpstream().getProtocolVersion() >= Bedrock_v554.V554_CODEC.getProtocolVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean supports1_19_50(GeyserSession session) {
|
||||||
|
return session.getUpstream().getProtocolVersion() >= Bedrock_v560.V560_CODEC.getProtocolVersion();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the {@link PacketCodec} for Minecraft: Java Edition.
|
* Gets the {@link PacketCodec} for Minecraft: Java Edition.
|
||||||
*
|
*
|
||||||
|
@ -31,6 +31,7 @@ import com.google.common.collect.ImmutableMap;
|
|||||||
import com.nukkitx.nbt.*;
|
import com.nukkitx.nbt.*;
|
||||||
import com.nukkitx.protocol.bedrock.v527.Bedrock_v527;
|
import com.nukkitx.protocol.bedrock.v527.Bedrock_v527;
|
||||||
import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
|
import com.nukkitx.protocol.bedrock.v544.Bedrock_v544;
|
||||||
|
import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
|
||||||
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
|
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
|
||||||
import it.unimi.dsi.fastutil.ints.IntSet;
|
import it.unimi.dsi.fastutil.ints.IntSet;
|
||||||
import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
||||||
@ -73,13 +74,9 @@ public final class BlockRegistryPopulator {
|
|||||||
private static void registerBedrockBlocks() {
|
private static void registerBedrockBlocks() {
|
||||||
BiFunction<String, NbtMapBuilder, String> emptyMapper = (bedrockIdentifier, statesBuilder) -> null;
|
BiFunction<String, NbtMapBuilder, String> emptyMapper = (bedrockIdentifier, statesBuilder) -> null;
|
||||||
ImmutableMap<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> blockMappers = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
|
ImmutableMap<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> blockMappers = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
|
||||||
.put(ObjectIntPair.of("1_19_0", Bedrock_v527.V527_CODEC.getProtocolVersion()), (bedrockIdentifier, statesBuilder) -> {
|
.put(ObjectIntPair.of("1_19_20", Bedrock_v544.V544_CODEC.getProtocolVersion()), emptyMapper)
|
||||||
if (bedrockIdentifier.equals("minecraft:muddy_mangrove_roots")) {
|
.put(ObjectIntPair.of("1_19_50", Bedrock_v560.V560_CODEC.getProtocolVersion()), emptyMapper)
|
||||||
statesBuilder.remove("pillar_axis");
|
.build();
|
||||||
}
|
|
||||||
return null;
|
|
||||||
})
|
|
||||||
.put(ObjectIntPair.of("1_19_20", Bedrock_v544.V544_CODEC.getProtocolVersion()), emptyMapper).build();
|
|
||||||
|
|
||||||
for (Map.Entry<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> palette : blockMappers.entrySet()) {
|
for (Map.Entry<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> palette : blockMappers.entrySet()) {
|
||||||
NbtList<NbtMap> blocksTag;
|
NbtList<NbtMap> blocksTag;
|
||||||
|
@ -37,6 +37,7 @@ import com.nukkitx.protocol.bedrock.data.SoundEvent;
|
|||||||
import com.nukkitx.protocol.bedrock.data.inventory.ComponentItemData;
|
import com.nukkitx.protocol.bedrock.data.inventory.ComponentItemData;
|
||||||
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
||||||
import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
|
import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.v560.Bedrock_v560;
|
||||||
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;
|
||||||
@ -76,10 +77,8 @@ public class ItemRegistryPopulator {
|
|||||||
|
|
||||||
public static void populate() {
|
public static void populate() {
|
||||||
Map<String, PaletteVersion> paletteVersions = new Object2ObjectOpenHashMap<>();
|
Map<String, PaletteVersion> paletteVersions = new Object2ObjectOpenHashMap<>();
|
||||||
paletteVersions.put("1_19_0", new PaletteVersion(Bedrock_v527.V527_CODEC.getProtocolVersion(),
|
|
||||||
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_20", new PaletteVersion(Bedrock_v544.V544_CODEC.getProtocolVersion(), Collections.emptyMap()));
|
paletteVersions.put("1_19_20", new PaletteVersion(Bedrock_v544.V544_CODEC.getProtocolVersion(), Collections.emptyMap()));
|
||||||
|
paletteVersions.put("1_19_50", new PaletteVersion(Bedrock_v560.V560_CODEC.getProtocolVersion(), Collections.emptyMap()));
|
||||||
|
|
||||||
GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
|
GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
|
||||||
|
|
||||||
|
@ -58,19 +58,55 @@ import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.Server
|
|||||||
import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundCustomQueryPacket;
|
import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundCustomQueryPacket;
|
||||||
import com.github.steveice10.packetlib.BuiltinFlags;
|
import com.github.steveice10.packetlib.BuiltinFlags;
|
||||||
import com.github.steveice10.packetlib.Session;
|
import com.github.steveice10.packetlib.Session;
|
||||||
import com.github.steveice10.packetlib.event.session.*;
|
import com.github.steveice10.packetlib.event.session.ConnectedEvent;
|
||||||
|
import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
|
||||||
|
import com.github.steveice10.packetlib.event.session.PacketErrorEvent;
|
||||||
|
import com.github.steveice10.packetlib.event.session.PacketSendingEvent;
|
||||||
|
import com.github.steveice10.packetlib.event.session.SessionAdapter;
|
||||||
import com.github.steveice10.packetlib.packet.Packet;
|
import com.github.steveice10.packetlib.packet.Packet;
|
||||||
import com.github.steveice10.packetlib.tcp.TcpClientSession;
|
import com.github.steveice10.packetlib.tcp.TcpClientSession;
|
||||||
import com.github.steveice10.packetlib.tcp.TcpSession;
|
import com.github.steveice10.packetlib.tcp.TcpSession;
|
||||||
import com.nukkitx.math.GenericMath;
|
import com.nukkitx.math.GenericMath;
|
||||||
import com.nukkitx.math.vector.*;
|
import com.nukkitx.math.vector.Vector2f;
|
||||||
|
import com.nukkitx.math.vector.Vector2i;
|
||||||
|
import com.nukkitx.math.vector.Vector3d;
|
||||||
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
|
import com.nukkitx.math.vector.Vector3i;
|
||||||
import com.nukkitx.nbt.NbtMap;
|
import com.nukkitx.nbt.NbtMap;
|
||||||
import com.nukkitx.protocol.bedrock.BedrockPacket;
|
import com.nukkitx.protocol.bedrock.BedrockPacket;
|
||||||
import com.nukkitx.protocol.bedrock.BedrockServerSession;
|
import com.nukkitx.protocol.bedrock.BedrockServerSession;
|
||||||
import com.nukkitx.protocol.bedrock.data.*;
|
import com.nukkitx.protocol.bedrock.data.Ability;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.AbilityLayer;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.AttributeData;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.AuthoritativeMovementMode;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.ChatRestrictionLevel;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.GamePublishSetting;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.GameRuleData;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.GameType;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.PlayerPermission;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.SoundEvent;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.SyncedPlayerMovementSettings;
|
||||||
import com.nukkitx.protocol.bedrock.data.command.CommandPermission;
|
import com.nukkitx.protocol.bedrock.data.command.CommandPermission;
|
||||||
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
||||||
import com.nukkitx.protocol.bedrock.packet.*;
|
import com.nukkitx.protocol.bedrock.packet.AvailableEntityIdentifiersPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.BiomeDefinitionListPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.ChunkRadiusUpdatedPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.ClientboundMapItemDataPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.CraftingDataPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.CreativeContentPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.EmoteListPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.GameRulesChangedPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.ItemComponentPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.LevelSoundEvent2Packet;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.PlayerFogPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.SetTimePacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.TextPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.TransferPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.UpdateAbilitiesPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.UpdateAdventureSettingsPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import io.netty.channel.EventLoop;
|
import io.netty.channel.EventLoop;
|
||||||
import it.unimi.dsi.fastutil.bytes.ByteArrays;
|
import it.unimi.dsi.fastutil.bytes.ByteArrays;
|
||||||
@ -127,7 +163,20 @@ import org.geysermc.geyser.registry.type.ItemMapping;
|
|||||||
import org.geysermc.geyser.registry.type.ItemMappings;
|
import org.geysermc.geyser.registry.type.ItemMappings;
|
||||||
import org.geysermc.geyser.session.auth.AuthData;
|
import org.geysermc.geyser.session.auth.AuthData;
|
||||||
import org.geysermc.geyser.session.auth.BedrockClientData;
|
import org.geysermc.geyser.session.auth.BedrockClientData;
|
||||||
import org.geysermc.geyser.session.cache.*;
|
import org.geysermc.geyser.session.cache.AdvancementsCache;
|
||||||
|
import org.geysermc.geyser.session.cache.BookEditCache;
|
||||||
|
import org.geysermc.geyser.session.cache.ChunkCache;
|
||||||
|
import org.geysermc.geyser.session.cache.EntityCache;
|
||||||
|
import org.geysermc.geyser.session.cache.EntityEffectCache;
|
||||||
|
import org.geysermc.geyser.session.cache.FormCache;
|
||||||
|
import org.geysermc.geyser.session.cache.LodestoneCache;
|
||||||
|
import org.geysermc.geyser.session.cache.PistonCache;
|
||||||
|
import org.geysermc.geyser.session.cache.PreferencesCache;
|
||||||
|
import org.geysermc.geyser.session.cache.SkullCache;
|
||||||
|
import org.geysermc.geyser.session.cache.TagCache;
|
||||||
|
import org.geysermc.geyser.session.cache.TeleportCache;
|
||||||
|
import org.geysermc.geyser.session.cache.WorldBorder;
|
||||||
|
import org.geysermc.geyser.session.cache.WorldCache;
|
||||||
import org.geysermc.geyser.skin.FloodgateSkinUploader;
|
import org.geysermc.geyser.skin.FloodgateSkinUploader;
|
||||||
import org.geysermc.geyser.text.GeyserLocale;
|
import org.geysermc.geyser.text.GeyserLocale;
|
||||||
import org.geysermc.geyser.text.MinecraftLocale;
|
import org.geysermc.geyser.text.MinecraftLocale;
|
||||||
@ -143,7 +192,14 @@ import java.net.ConnectException;
|
|||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
@ -1228,8 +1284,12 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
|||||||
this.pose = Pose.SNEAKING;
|
this.pose = Pose.SNEAKING;
|
||||||
playerEntity.setBoundingBoxHeight(1.5f);
|
playerEntity.setBoundingBoxHeight(1.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// As of 1.19.50, the client does not want sneaking set on itself
|
||||||
|
if (!GameProtocol.supports1_19_50(this)) {
|
||||||
playerEntity.setFlag(EntityFlag.SNEAKING, sneaking);
|
playerEntity.setFlag(EntityFlag.SNEAKING, sneaking);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void setSwimming(boolean swimming) {
|
public void setSwimming(boolean swimming) {
|
||||||
if (swimming) {
|
if (swimming) {
|
||||||
@ -1628,7 +1688,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
|||||||
boolean spectator = gameMode == GameMode.SPECTATOR;
|
boolean spectator = gameMode == GameMode.SPECTATOR;
|
||||||
boolean worldImmutable = gameMode == GameMode.ADVENTURE || spectator;
|
boolean worldImmutable = gameMode == GameMode.ADVENTURE || spectator;
|
||||||
|
|
||||||
if (GameProtocol.supports1_19_10(this)) {
|
|
||||||
UpdateAdventureSettingsPacket adventureSettingsPacket = new UpdateAdventureSettingsPacket();
|
UpdateAdventureSettingsPacket adventureSettingsPacket = new UpdateAdventureSettingsPacket();
|
||||||
adventureSettingsPacket.setNoMvP(false);
|
adventureSettingsPacket.setNoMvP(false);
|
||||||
adventureSettingsPacket.setNoPvM(false);
|
adventureSettingsPacket.setNoPvM(false);
|
||||||
@ -1687,40 +1746,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
|||||||
|
|
||||||
updateAbilitiesPacket.getAbilityLayers().add(abilityLayer);
|
updateAbilitiesPacket.getAbilityLayers().add(abilityLayer);
|
||||||
sendUpstreamPacket(updateAbilitiesPacket);
|
sendUpstreamPacket(updateAbilitiesPacket);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
AdventureSettingsPacket adventureSettingsPacket = new AdventureSettingsPacket();
|
|
||||||
adventureSettingsPacket.setUniqueEntityId(bedrockId);
|
|
||||||
adventureSettingsPacket.setCommandPermission(commandPermission);
|
|
||||||
adventureSettingsPacket.setPlayerPermission(playerPermission);
|
|
||||||
|
|
||||||
Set<AdventureSetting> flags = adventureSettingsPacket.getSettings();
|
|
||||||
if (canFly || spectator) {
|
|
||||||
flags.add(AdventureSetting.MAY_FLY);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flying || spectator) {
|
|
||||||
if (spectator && !flying) {
|
|
||||||
// We're "flying locked" in this gamemode
|
|
||||||
flying = true;
|
|
||||||
ServerboundPlayerAbilitiesPacket abilitiesPacket = new ServerboundPlayerAbilitiesPacket(true);
|
|
||||||
sendDownstreamPacket(abilitiesPacket);
|
|
||||||
}
|
|
||||||
flags.add(AdventureSetting.FLYING);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (worldImmutable) {
|
|
||||||
flags.add(AdventureSetting.WORLD_IMMUTABLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (spectator) {
|
|
||||||
flags.add(AdventureSetting.NO_CLIP);
|
|
||||||
}
|
|
||||||
|
|
||||||
flags.add(AdventureSetting.AUTO_JUMP);
|
|
||||||
|
|
||||||
sendUpstreamPacket(adventureSettingsPacket);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getRenderDistance() {
|
private int getRenderDistance() {
|
||||||
|
@ -32,12 +32,21 @@ import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
|
|||||||
import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction;
|
import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction;
|
||||||
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction;
|
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction;
|
||||||
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClickPacket;
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClickPacket;
|
||||||
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.*;
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundInteractPacket;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundUseItemOnPacket;
|
||||||
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundUseItemPacket;
|
||||||
import com.nukkitx.math.vector.Vector3d;
|
import com.nukkitx.math.vector.Vector3d;
|
||||||
import com.nukkitx.math.vector.Vector3f;
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
import com.nukkitx.math.vector.Vector3i;
|
import com.nukkitx.math.vector.Vector3i;
|
||||||
import com.nukkitx.protocol.bedrock.data.LevelEventType;
|
import com.nukkitx.protocol.bedrock.data.LevelEventType;
|
||||||
import com.nukkitx.protocol.bedrock.data.inventory.*;
|
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.inventory.InventoryActionData;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.inventory.InventorySource;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.inventory.LegacySetItemSlotData;
|
||||||
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
|
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
|
||||||
import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket;
|
import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket;
|
||||||
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
|
import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
|
||||||
@ -54,7 +63,6 @@ import org.geysermc.geyser.inventory.Inventory;
|
|||||||
import org.geysermc.geyser.inventory.PlayerInventory;
|
import org.geysermc.geyser.inventory.PlayerInventory;
|
||||||
import org.geysermc.geyser.inventory.click.Click;
|
import org.geysermc.geyser.inventory.click.Click;
|
||||||
import org.geysermc.geyser.level.block.BlockStateValues;
|
import org.geysermc.geyser.level.block.BlockStateValues;
|
||||||
import org.geysermc.geyser.network.GameProtocol;
|
|
||||||
import org.geysermc.geyser.registry.BlockRegistries;
|
import org.geysermc.geyser.registry.BlockRegistries;
|
||||||
import org.geysermc.geyser.registry.type.ItemMapping;
|
import org.geysermc.geyser.registry.type.ItemMapping;
|
||||||
import org.geysermc.geyser.registry.type.ItemMappings;
|
import org.geysermc.geyser.registry.type.ItemMappings;
|
||||||
@ -63,7 +71,11 @@ import org.geysermc.geyser.translator.inventory.InventoryTranslator;
|
|||||||
import org.geysermc.geyser.translator.inventory.item.ItemTranslator;
|
import org.geysermc.geyser.translator.inventory.item.ItemTranslator;
|
||||||
import org.geysermc.geyser.translator.protocol.PacketTranslator;
|
import org.geysermc.geyser.translator.protocol.PacketTranslator;
|
||||||
import org.geysermc.geyser.translator.protocol.Translator;
|
import org.geysermc.geyser.translator.protocol.Translator;
|
||||||
import org.geysermc.geyser.util.*;
|
import org.geysermc.geyser.util.BlockUtils;
|
||||||
|
import org.geysermc.geyser.util.CooldownUtils;
|
||||||
|
import org.geysermc.geyser.util.EntityUtils;
|
||||||
|
import org.geysermc.geyser.util.InteractionResult;
|
||||||
|
import org.geysermc.geyser.util.InventoryUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
@ -464,12 +476,10 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
|
|||||||
InteractAction.ATTACK, session.isSneaking());
|
InteractAction.ATTACK, session.isSneaking());
|
||||||
session.sendDownstreamPacket(attackPacket);
|
session.sendDownstreamPacket(attackPacket);
|
||||||
|
|
||||||
if (GameProtocol.supports1_19_10(session)) {
|
|
||||||
// Since 1.19.10, LevelSoundEventPackets are no longer sent by the client when attacking entities
|
// Since 1.19.10, LevelSoundEventPackets are no longer sent by the client when attacking entities
|
||||||
CooldownUtils.sendCooldown(session);
|
CooldownUtils.sendCooldown(session);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ public class JavaPlayerCombatKillTranslator extends PacketTranslator<Clientbound
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void translate(GeyserSession session, ClientboundPlayerCombatKillPacket packet) {
|
public void translate(GeyserSession session, ClientboundPlayerCombatKillPacket packet) {
|
||||||
if (packet.getPlayerId() == session.getPlayerEntity().getEntityId() && GameProtocol.supports1_19_10(session)) {
|
if (packet.getPlayerId() == session.getPlayerEntity().getEntityId()) {
|
||||||
Component deathMessage = packet.getMessage();
|
Component deathMessage = packet.getMessage();
|
||||||
// TODO - could inject score in, but as of 1.19.10 newlines don't center and start at the left of the first text
|
// TODO - could inject score in, but as of 1.19.10 newlines don't center and start at the left of the first text
|
||||||
DeathInfoPacket deathInfoPacket = new DeathInfoPacket();
|
DeathInfoPacket deathInfoPacket = new DeathInfoPacket();
|
||||||
|
@ -27,12 +27,16 @@ package org.geysermc.geyser.util;
|
|||||||
|
|
||||||
import com.github.steveice10.mc.protocol.data.game.entity.Effect;
|
import com.github.steveice10.mc.protocol.data.game.entity.Effect;
|
||||||
import com.nukkitx.math.vector.Vector3f;
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
|
import com.nukkitx.math.vector.Vector3i;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.PlayerActionType;
|
||||||
import com.nukkitx.protocol.bedrock.packet.ChangeDimensionPacket;
|
import com.nukkitx.protocol.bedrock.packet.ChangeDimensionPacket;
|
||||||
import com.nukkitx.protocol.bedrock.packet.ChunkRadiusUpdatedPacket;
|
import com.nukkitx.protocol.bedrock.packet.ChunkRadiusUpdatedPacket;
|
||||||
import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
|
import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket;
|
||||||
import com.nukkitx.protocol.bedrock.packet.StopSoundPacket;
|
import com.nukkitx.protocol.bedrock.packet.StopSoundPacket;
|
||||||
import org.geysermc.geyser.entity.type.Entity;
|
import org.geysermc.geyser.entity.type.Entity;
|
||||||
import org.geysermc.geyser.level.BedrockDimension;
|
import org.geysermc.geyser.level.BedrockDimension;
|
||||||
|
import org.geysermc.geyser.network.GameProtocol;
|
||||||
import org.geysermc.geyser.session.GeyserSession;
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -94,8 +98,10 @@ public class DimensionUtils {
|
|||||||
changeDimensionPacket.setRespawn(true);
|
changeDimensionPacket.setRespawn(true);
|
||||||
changeDimensionPacket.setPosition(pos);
|
changeDimensionPacket.setPosition(pos);
|
||||||
session.sendUpstreamPacket(changeDimensionPacket);
|
session.sendUpstreamPacket(changeDimensionPacket);
|
||||||
|
|
||||||
session.setDimension(javaDimension);
|
session.setDimension(javaDimension);
|
||||||
setBedrockDimension(session, javaDimension);
|
setBedrockDimension(session, javaDimension);
|
||||||
|
|
||||||
player.setPosition(pos);
|
player.setPosition(pos);
|
||||||
session.setSpawned(false);
|
session.setSpawned(false);
|
||||||
session.setLastChunkPosition(null);
|
session.setLastChunkPosition(null);
|
||||||
@ -131,6 +137,18 @@ public class DimensionUtils {
|
|||||||
session.removeFog("minecraft:fog_hell");
|
session.removeFog("minecraft:fog_hell");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Kind of silly but Bedrock 1.19.50 requires an acknowledgement after the
|
||||||
|
// initial chunks are sent, prior to the client acknowledgement
|
||||||
|
if (GameProtocol.supports1_19_50(session)) {
|
||||||
|
PlayerActionPacket ackPacket = new PlayerActionPacket();
|
||||||
|
ackPacket.setRuntimeEntityId(player.getGeyserId());
|
||||||
|
ackPacket.setAction(PlayerActionType.DIMENSION_CHANGE_SUCCESS);
|
||||||
|
ackPacket.setBlockPosition(Vector3i.ZERO);
|
||||||
|
ackPacket.setResultPosition(Vector3i.ZERO);
|
||||||
|
ackPacket.setFace(0);
|
||||||
|
session.sendUpstreamPacket(ackPacket);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setBedrockDimension(GeyserSession session, String javaDimension) {
|
public static void setBedrockDimension(GeyserSession session, String javaDimension) {
|
||||||
|
Binäre Datei nicht angezeigt.
BIN
core/src/main/resources/bedrock/block_palette.1_19_50.nbt
Normale Datei
BIN
core/src/main/resources/bedrock/block_palette.1_19_50.nbt
Normale Datei
Binäre Datei nicht angezeigt.
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
@ -9,7 +9,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:acacia_chest_boat",
|
"name" : "minecraft:acacia_chest_boat",
|
||||||
"id" : 642
|
"id" : 645
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:acacia_door",
|
"name" : "minecraft:acacia_door",
|
||||||
@ -19,6 +19,10 @@
|
|||||||
"name" : "minecraft:acacia_fence_gate",
|
"name" : "minecraft:acacia_fence_gate",
|
||||||
"id" : 187
|
"id" : 187
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:acacia_hanging_sign",
|
||||||
|
"id" : -504
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:acacia_pressure_plate",
|
"name" : "minecraft:acacia_pressure_plate",
|
||||||
"id" : -150
|
"id" : -150
|
||||||
@ -131,17 +135,97 @@
|
|||||||
"name" : "minecraft:bamboo",
|
"name" : "minecraft:bamboo",
|
||||||
"id" : -163
|
"id" : -163
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_button",
|
||||||
|
"id" : -511
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_chest_raft",
|
||||||
|
"id" : 648
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_door",
|
||||||
|
"id" : -517
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_double_slab",
|
||||||
|
"id" : -521
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_fence",
|
||||||
|
"id" : -515
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_fence_gate",
|
||||||
|
"id" : -516
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_hanging_sign",
|
||||||
|
"id" : -522
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_mosaic",
|
||||||
|
"id" : -509
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_mosaic_double_slab",
|
||||||
|
"id" : -525
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_mosaic_slab",
|
||||||
|
"id" : -524
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_mosaic_stairs",
|
||||||
|
"id" : -523
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_planks",
|
||||||
|
"id" : -510
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_pressure_plate",
|
||||||
|
"id" : -514
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_raft",
|
||||||
|
"id" : 638
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:bamboo_sapling",
|
"name" : "minecraft:bamboo_sapling",
|
||||||
"id" : -164
|
"id" : -164
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_sign",
|
||||||
|
"id" : 637
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_slab",
|
||||||
|
"id" : -513
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_stairs",
|
||||||
|
"id" : -512
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_standing_sign",
|
||||||
|
"id" : -518
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_trapdoor",
|
||||||
|
"id" : -520
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:bamboo_wall_sign",
|
||||||
|
"id" : -519
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:banner",
|
"name" : "minecraft:banner",
|
||||||
"id" : 567
|
"id" : 567
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:banner_pattern",
|
"name" : "minecraft:banner_pattern",
|
||||||
"id" : 651
|
"id" : 655
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:barrel",
|
"name" : "minecraft:barrel",
|
||||||
@ -217,7 +301,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:birch_chest_boat",
|
"name" : "minecraft:birch_chest_boat",
|
||||||
"id" : 639
|
"id" : 642
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:birch_door",
|
"name" : "minecraft:birch_door",
|
||||||
@ -227,6 +311,10 @@
|
|||||||
"name" : "minecraft:birch_fence_gate",
|
"name" : "minecraft:birch_fence_gate",
|
||||||
"id" : 184
|
"id" : 184
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:birch_hanging_sign",
|
||||||
|
"id" : -502
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:birch_pressure_plate",
|
"name" : "minecraft:birch_pressure_plate",
|
||||||
"id" : -151
|
"id" : -151
|
||||||
@ -329,7 +417,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:boat",
|
"name" : "minecraft:boat",
|
||||||
"id" : 649
|
"id" : 653
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:bone",
|
"name" : "minecraft:bone",
|
||||||
@ -435,6 +523,10 @@
|
|||||||
"name" : "minecraft:calcite",
|
"name" : "minecraft:calcite",
|
||||||
"id" : -326
|
"id" : -326
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:camel_spawn_egg",
|
||||||
|
"id" : 633
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:camera",
|
"name" : "minecraft:camera",
|
||||||
"id" : 593
|
"id" : 593
|
||||||
@ -541,7 +633,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:chest_boat",
|
"name" : "minecraft:chest_boat",
|
||||||
"id" : 645
|
"id" : 649
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:chest_minecart",
|
"name" : "minecraft:chest_minecart",
|
||||||
@ -555,6 +647,10 @@
|
|||||||
"name" : "minecraft:chicken_spawn_egg",
|
"name" : "minecraft:chicken_spawn_egg",
|
||||||
"id" : 435
|
"id" : 435
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:chiseled_bookshelf",
|
||||||
|
"id" : -526
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:chiseled_deepslate",
|
"name" : "minecraft:chiseled_deepslate",
|
||||||
"id" : -395
|
"id" : -395
|
||||||
@ -827,6 +923,10 @@
|
|||||||
"name" : "minecraft:crimson_fungus",
|
"name" : "minecraft:crimson_fungus",
|
||||||
"id" : -228
|
"id" : -228
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:crimson_hanging_sign",
|
||||||
|
"id" : -506
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:crimson_hyphae",
|
"name" : "minecraft:crimson_hyphae",
|
||||||
"id" : -299
|
"id" : -299
|
||||||
@ -921,7 +1021,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:dark_oak_chest_boat",
|
"name" : "minecraft:dark_oak_chest_boat",
|
||||||
"id" : 643
|
"id" : 646
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:dark_oak_door",
|
"name" : "minecraft:dark_oak_door",
|
||||||
@ -931,6 +1031,10 @@
|
|||||||
"name" : "minecraft:dark_oak_fence_gate",
|
"name" : "minecraft:dark_oak_fence_gate",
|
||||||
"id" : 186
|
"id" : 186
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:dark_oak_hanging_sign",
|
||||||
|
"id" : -505
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:dark_oak_pressure_plate",
|
"name" : "minecraft:dark_oak_pressure_plate",
|
||||||
"id" : -152
|
"id" : -152
|
||||||
@ -1121,7 +1225,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:disc_fragment_5",
|
"name" : "minecraft:disc_fragment_5",
|
||||||
"id" : 637
|
"id" : 640
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:dispenser",
|
"name" : "minecraft:dispenser",
|
||||||
@ -1193,11 +1297,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:dye",
|
"name" : "minecraft:dye",
|
||||||
"id" : 650
|
"id" : 654
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:echo_shard",
|
"name" : "minecraft:echo_shard",
|
||||||
"id" : 647
|
"id" : 651
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:egg",
|
"name" : "minecraft:egg",
|
||||||
@ -1725,7 +1829,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:end_crystal",
|
"name" : "minecraft:end_crystal",
|
||||||
"id" : 653
|
"id" : 657
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:end_gateway",
|
"name" : "minecraft:end_gateway",
|
||||||
@ -1933,7 +2037,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:glow_berries",
|
"name" : "minecraft:glow_berries",
|
||||||
"id" : 654
|
"id" : 658
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:glow_frame",
|
"name" : "minecraft:glow_frame",
|
||||||
@ -2405,7 +2509,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:jungle_chest_boat",
|
"name" : "minecraft:jungle_chest_boat",
|
||||||
"id" : 640
|
"id" : 643
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:jungle_door",
|
"name" : "minecraft:jungle_door",
|
||||||
@ -2415,6 +2519,10 @@
|
|||||||
"name" : "minecraft:jungle_fence_gate",
|
"name" : "minecraft:jungle_fence_gate",
|
||||||
"id" : 185
|
"id" : 185
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:jungle_hanging_sign",
|
||||||
|
"id" : -503
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:jungle_pressure_plate",
|
"name" : "minecraft:jungle_pressure_plate",
|
||||||
"id" : -153
|
"id" : -153
|
||||||
@ -2665,7 +2773,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_boat",
|
"name" : "minecraft:mangrove_boat",
|
||||||
"id" : 635
|
"id" : 636
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_button",
|
"name" : "minecraft:mangrove_button",
|
||||||
@ -2673,11 +2781,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_chest_boat",
|
"name" : "minecraft:mangrove_chest_boat",
|
||||||
"id" : 644
|
"id" : 647
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_door",
|
"name" : "minecraft:mangrove_door",
|
||||||
"id" : 633
|
"id" : 634
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_double_slab",
|
"name" : "minecraft:mangrove_double_slab",
|
||||||
@ -2691,6 +2799,10 @@
|
|||||||
"name" : "minecraft:mangrove_fence_gate",
|
"name" : "minecraft:mangrove_fence_gate",
|
||||||
"id" : -492
|
"id" : -492
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:mangrove_hanging_sign",
|
||||||
|
"id" : -508
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_leaves",
|
"name" : "minecraft:mangrove_leaves",
|
||||||
"id" : -472
|
"id" : -472
|
||||||
@ -2717,7 +2829,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_sign",
|
"name" : "minecraft:mangrove_sign",
|
||||||
"id" : 634
|
"id" : 635
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:mangrove_slab",
|
"name" : "minecraft:mangrove_slab",
|
||||||
@ -2861,7 +2973,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:music_disc_5",
|
"name" : "minecraft:music_disc_5",
|
||||||
"id" : 636
|
"id" : 639
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:music_disc_blocks",
|
"name" : "minecraft:music_disc_blocks",
|
||||||
@ -3037,7 +3149,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:oak_chest_boat",
|
"name" : "minecraft:oak_chest_boat",
|
||||||
"id" : 638
|
"id" : 641
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:oak_hanging_sign",
|
||||||
|
"id" : -500
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:oak_sign",
|
"name" : "minecraft:oak_sign",
|
||||||
@ -3473,7 +3589,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:recovery_compass",
|
"name" : "minecraft:recovery_compass",
|
||||||
"id" : 646
|
"id" : 650
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:red_candle",
|
"name" : "minecraft:red_candle",
|
||||||
@ -3781,7 +3897,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:spawn_egg",
|
"name" : "minecraft:spawn_egg",
|
||||||
"id" : 652
|
"id" : 656
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:spider_eye",
|
"name" : "minecraft:spider_eye",
|
||||||
@ -3813,7 +3929,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:spruce_chest_boat",
|
"name" : "minecraft:spruce_chest_boat",
|
||||||
"id" : 641
|
"id" : 644
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:spruce_door",
|
"name" : "minecraft:spruce_door",
|
||||||
@ -3823,6 +3939,10 @@
|
|||||||
"name" : "minecraft:spruce_fence_gate",
|
"name" : "minecraft:spruce_fence_gate",
|
||||||
"id" : 183
|
"id" : 183
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:spruce_hanging_sign",
|
||||||
|
"id" : -501
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:spruce_pressure_plate",
|
"name" : "minecraft:spruce_pressure_plate",
|
||||||
"id" : -154
|
"id" : -154
|
||||||
@ -4081,7 +4201,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:trader_llama_spawn_egg",
|
"name" : "minecraft:trader_llama_spawn_egg",
|
||||||
"id" : 648
|
"id" : 652
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:trapdoor",
|
"name" : "minecraft:trapdoor",
|
||||||
@ -4223,6 +4343,10 @@
|
|||||||
"name" : "minecraft:warped_fungus_on_a_stick",
|
"name" : "minecraft:warped_fungus_on_a_stick",
|
||||||
"id" : 618
|
"id" : 618
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name" : "minecraft:warped_hanging_sign",
|
||||||
|
"id" : -507
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name" : "minecraft:warped_hyphae",
|
"name" : "minecraft:warped_hyphae",
|
||||||
"id" : -298
|
"id" : -298
|
@ -5,7 +5,7 @@ netty = "4.1.80.Final"
|
|||||||
guava = "29.0-jre"
|
guava = "29.0-jre"
|
||||||
gson = "2.3.1" # Provided by Spigot 1.8.8
|
gson = "2.3.1" # Provided by Spigot 1.8.8
|
||||||
websocket = "1.5.1"
|
websocket = "1.5.1"
|
||||||
protocol = "2.9.14-20221025.193624-1"
|
protocol = "2.9.14-20221129.013131-3"
|
||||||
raknet = "1.6.28-20220125.214016-6"
|
raknet = "1.6.28-20220125.214016-6"
|
||||||
mcauthlib = "d9d773e"
|
mcauthlib = "d9d773e"
|
||||||
mcprotocollib = "9f78bd5"
|
mcprotocollib = "9f78bd5"
|
||||||
@ -82,7 +82,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
|
|||||||
mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" }
|
mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" }
|
||||||
mcprotocollib = { group = "com.github.GeyserMC", name = "MCProtocolLib", version.ref = "mcprotocollib" }
|
mcprotocollib = { group = "com.github.GeyserMC", name = "MCProtocolLib", version.ref = "mcprotocollib" }
|
||||||
packetlib = { group = "com.github.steveice10", name = "packetlib", version.ref = "packetlib" }
|
packetlib = { group = "com.github.steveice10", name = "packetlib", version.ref = "packetlib" }
|
||||||
protocol = { group = "com.nukkitx.protocol", name = "bedrock-v557", version.ref = "protocol" }
|
protocol = { group = "com.nukkitx.protocol", name = "bedrock-v560", version.ref = "protocol" }
|
||||||
raknet = { group = "com.nukkitx.network", name = "raknet", version.ref = "raknet" }
|
raknet = { group = "com.nukkitx.network", name = "raknet", version.ref = "raknet" }
|
||||||
sponge-api = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" }
|
sponge-api = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" }
|
||||||
terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" }
|
terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" }
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren