Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-11-03 14:50:19 +01:00
Merge branch 'master' into plugin
Dieser Commit ist enthalten in:
RednedEpic
Commit
d062e36fae
@ -4,7 +4,7 @@
|
||||
|
||||
[](LICENSE)
|
||||
[](https://ci.nukkitx.com/job/Geyser/job/master/)
|
||||
[](http://discord.geysermc.org/)
|
||||
[](http://discord.geysermc.org/)
|
||||
[](http://hits.dwyl.io/Geyser/GeyserMC)
|
||||
|
||||
Geyser is a bridge between Minecraft: Bedrock Edition and Minecraft: Java Edition, closing the gap from those wanting to play true cross-platform.
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.steveice10</groupId>
|
||||
<artifactId>mcprotocollib</artifactId>
|
||||
<version>1.14.4-2-SNAPSHOT</version>
|
||||
<version>1.15.1-1-SNAPSHOT</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
|
||||
@ -63,6 +63,7 @@ import java.util.concurrent.TimeUnit;
|
||||
public class GeyserConnector implements Connector {
|
||||
|
||||
public static final BedrockPacketCodec BEDROCK_PACKET_CODEC = Bedrock_v388.V388_CODEC;
|
||||
public static final int BEDROCK_1_14_PROTOCOL_VERSION = 389;
|
||||
|
||||
public static final String NAME = "Geyser";
|
||||
public static final String VERSION = "1.0-SNAPSHOT";
|
||||
|
||||
@ -27,7 +27,6 @@ package org.geysermc.connector.entity.living;
|
||||
|
||||
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
|
||||
import com.nukkitx.math.vector.Vector3f;
|
||||
import com.nukkitx.protocol.bedrock.data.EntityData;
|
||||
import org.geysermc.connector.entity.type.EntityType;
|
||||
import org.geysermc.connector.network.session.GeyserSession;
|
||||
|
||||
@ -39,10 +38,6 @@ public class AbstractHorseEntity extends AnimalEntity {
|
||||
|
||||
@Override
|
||||
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
||||
if (entityMetadata.getId() == 17) {
|
||||
metadata.put(EntityData.VARIANT, (int) entityMetadata.getValue());
|
||||
}
|
||||
|
||||
super.updateBedrockMetadata(entityMetadata, session);
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
package org.geysermc.connector.entity.living;
|
||||
|
||||
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
|
||||
import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
|
||||
import com.nukkitx.math.vector.Vector3f;
|
||||
import com.nukkitx.protocol.bedrock.data.EntityFlag;
|
||||
import org.geysermc.connector.entity.type.EntityType;
|
||||
@ -39,7 +40,7 @@ public class AgeableEntity extends CreatureEntity {
|
||||
|
||||
@Override
|
||||
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
||||
if (entityMetadata.getId() == 14) {
|
||||
if (entityMetadata.getId() == 15) {
|
||||
metadata.getFlags().setFlag(EntityFlag.BABY, (boolean) entityMetadata.getValue());
|
||||
}
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ public class InsentientEntity extends LivingEntity {
|
||||
|
||||
@Override
|
||||
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
||||
if (entityMetadata.getId() == 13 && entityMetadata.getType() == MetadataType.BYTE) {
|
||||
if (entityMetadata.getId() == 14 && entityMetadata.getType() == MetadataType.BYTE) {
|
||||
byte xd = (byte) entityMetadata.getValue();
|
||||
metadata.getFlags().setFlag(EntityFlag.NO_AI, (xd & 0x01) == 0x01);
|
||||
}
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright (c) 2019 GeyserMC. http://geysermc.org
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
* @author GeyserMC
|
||||
* @link https://github.com/GeyserMC/Geyser
|
||||
*/
|
||||
|
||||
package org.geysermc.connector.entity.living.horse;
|
||||
|
||||
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
|
||||
import com.nukkitx.math.vector.Vector3f;
|
||||
import com.nukkitx.protocol.bedrock.data.EntityData;
|
||||
import org.geysermc.connector.entity.living.AbstractHorseEntity;
|
||||
import org.geysermc.connector.entity.type.EntityType;
|
||||
import org.geysermc.connector.network.session.GeyserSession;
|
||||
|
||||
public class HorseEntity extends AbstractHorseEntity {
|
||||
|
||||
public HorseEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
|
||||
super(entityId, geyserId, entityType, position, motion, rotation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
||||
if (entityMetadata.getId() == 18) {
|
||||
metadata.put(EntityData.VARIANT, (int) entityMetadata.getValue());
|
||||
}
|
||||
|
||||
super.updateBedrockMetadata(entityMetadata, session);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* Copyright (c) 2019 GeyserMC. http://geysermc.org
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
* @author GeyserMC
|
||||
* @link https://github.com/GeyserMC/Geyser
|
||||
*/
|
||||
|
||||
package org.geysermc.connector.entity.living.horse;
|
||||
|
||||
import com.nukkitx.math.vector.Vector3f;
|
||||
import org.geysermc.connector.entity.living.ChestedHorseEntity;
|
||||
import org.geysermc.connector.entity.type.EntityType;
|
||||
|
||||
public class LlamaEntity extends ChestedHorseEntity {
|
||||
|
||||
public LlamaEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
|
||||
super(entityId, geyserId, entityType, position, motion, rotation);
|
||||
}
|
||||
}
|
||||
@ -41,7 +41,7 @@ public class GuardianEntity extends MonsterEntity {
|
||||
|
||||
@Override
|
||||
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
||||
if (entityMetadata.getId() == 15) {
|
||||
if (entityMetadata.getId() == 16) {
|
||||
Entity entity = session.getEntityCache().getEntityByJavaId((int) entityMetadata.getValue());
|
||||
if (entity != null) {
|
||||
metadata.put(EntityData.TARGET_EID, entity.getGeyserId());
|
||||
|
||||
@ -28,6 +28,8 @@ package org.geysermc.connector.entity.type;
|
||||
import lombok.Getter;
|
||||
import org.geysermc.connector.entity.*;
|
||||
import org.geysermc.connector.entity.living.*;
|
||||
import org.geysermc.connector.entity.living.horse.HorseEntity;
|
||||
import org.geysermc.connector.entity.living.horse.LlamaEntity;
|
||||
import org.geysermc.connector.entity.living.monster.GuardianEntity;
|
||||
import org.geysermc.connector.entity.living.monster.ZombieEntity;
|
||||
|
||||
@ -46,14 +48,15 @@ public enum EntityType {
|
||||
BAT(AmbientEntity.class, 19, 0.9f, 0.5f),
|
||||
IRON_GOLEM(GolemEntity.class, 20, 2.7f, 1.4f),
|
||||
SNOW_GOLEM(GolemEntity.class, 21, 1.9f, 0.7f),
|
||||
OCELOT(TameableEntity.class, 22, 0.35f, 0.3f),
|
||||
HORSE(AbstractHorseEntity.class, 23, 1.6f, 1.3965f),
|
||||
OCELOT(AgeableEntity.class, 22, 0.35f, 0.3f),
|
||||
HORSE(HorseEntity.class, 23, 1.6f, 1.3965f),
|
||||
DONKEY(ChestedHorseEntity.class, 24, 1.6f, 1.3965f),
|
||||
MULE(ChestedHorseEntity.class, 25, 1.6f, 1.3965f),
|
||||
SKELETON_HORSE(AbstractHorseEntity.class, 26, 1.6f, 1.3965f),
|
||||
ZOMBIE_HORSE(AbstractHorseEntity.class, 27, 1.6f, 1.3965f),
|
||||
POLAR_BEAR(AnimalEntity.class, 28, 1.4f, 1.3f),
|
||||
LLAMA(ChestedHorseEntity.class, 29, 1.87f, 0.9f),
|
||||
LLAMA(LlamaEntity.class, 29, 1.87f, 0.9f),
|
||||
TRADER_LLAMA(LlamaEntity.class, 29, 1.187f, 0.9f),
|
||||
PARROT(TameableEntity.class, 30, 0.9f, 0.5f),
|
||||
DOLPHIN(WaterEntity.class, 31, 0.6f, 0.9f),
|
||||
ZOMBIE(ZombieEntity.class, 32, 1.8f, 0.6f, 0.6f, 1.62f),
|
||||
@ -101,8 +104,7 @@ public enum EntityType {
|
||||
FIREWORK_ROCKET(Entity.class, 72, 0f),
|
||||
TRIDENT(ArrowEntity.class, 73, 0f),
|
||||
TURTLE(AnimalEntity.class, 74, 0.4f, 1.2f),
|
||||
// TODO CAT (need to figure out how to deal with baby cats) https://github.com/NukkitX/Nukkit/blob/master/src/main/java/cn/nukkit/entity/passive/EntityCat.java
|
||||
|
||||
CAT(TameableEntity.class, 75, 0.35f, 0.3f),
|
||||
SHULKER_BULLET(Entity.class, 76, 0f),
|
||||
FISHING_BOBBER(Entity.class, 77, 0f),
|
||||
CHALKBOARD(Entity.class, 78, 0f),
|
||||
@ -140,7 +142,8 @@ public enum EntityType {
|
||||
TROPICAL_FISH(AbstractFishEntity.class, 111, 0.6f, 0.6f),
|
||||
COD(AbstractFishEntity.class, 112, 0.25f, 0.5f),
|
||||
PANDA(AnimalEntity.class, 113, 1.25f, 1.125f, 1.825f),
|
||||
FOX(AnimalEntity.class, 121, 0.5f, 1.25f);
|
||||
FOX(AnimalEntity.class, 121, 0.5f, 1.25f),
|
||||
BEE(InsentientEntity.class, 122, 0.6f, 0.6f);
|
||||
|
||||
private Class<? extends Entity> entityClass;
|
||||
private final int type;
|
||||
|
||||
@ -45,8 +45,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
|
||||
|
||||
@Override
|
||||
public boolean handle(LoginPacket loginPacket) {
|
||||
if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) {
|
||||
connector.getLogger().debug("unsupported");
|
||||
if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_1_14_PROTOCOL_VERSION) {
|
||||
session.getUpstream().disconnect("Unsupported Bedrock version. Are you running an outdated version?");
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -44,13 +44,7 @@ import com.nukkitx.nbt.tag.CompoundTag;
|
||||
import com.nukkitx.protocol.bedrock.BedrockServerSession;
|
||||
import com.nukkitx.protocol.bedrock.data.GamePublishSetting;
|
||||
import com.nukkitx.protocol.bedrock.data.GameRule;
|
||||
import com.nukkitx.protocol.bedrock.packet.AvailableEntityIdentifiersPacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.BiomeDefinitionListPacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.LevelChunkPacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.NetworkChunkPublisherUpdatePacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.TextPacket;
|
||||
import com.nukkitx.protocol.bedrock.packet.*;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.geysermc.api.Player;
|
||||
@ -295,7 +289,7 @@ public class GeyserSession implements Player {
|
||||
startGamePacket.setLevelGamemode(0);
|
||||
startGamePacket.setDifficulty(1);
|
||||
startGamePacket.setDefaultSpawn(Vector3i.ZERO);
|
||||
startGamePacket.setAcheivementsDisabled(true);
|
||||
startGamePacket.setAchievementsDisabled(true);
|
||||
startGamePacket.setTime(-1);
|
||||
startGamePacket.setEduEditionOffers(0);
|
||||
startGamePacket.setEduFeaturesEnabled(false);
|
||||
|
||||
@ -64,7 +64,7 @@ public class BedrockMovePlayerTranslator extends PacketTranslator<MovePlayerPack
|
||||
double javaY = packet.getPosition().getY() - EntityType.PLAYER.getOffset();
|
||||
|
||||
ClientPlayerPositionRotationPacket playerPositionRotationPacket = new ClientPlayerPositionRotationPacket(
|
||||
packet.isOnGround(), packet.getPosition().getX(), Math.ceil(javaY * 2) / 2,
|
||||
packet.isOnGround(), packet.getPosition().getX(), javaY,
|
||||
packet.getPosition().getZ(), packet.getRotation().getY(), packet.getRotation().getX()
|
||||
);
|
||||
|
||||
|
||||
@ -165,10 +165,10 @@ public class SkinProvider {
|
||||
Geyser.getLogger().debug("Downloaded " + imageUrl);
|
||||
|
||||
if (cape) {
|
||||
image = image.getWidth() > 64 ? scale(image) : image;
|
||||
BufferedImage newImage = new BufferedImage(64, 32, BufferedImage.TYPE_INT_RGB);
|
||||
|
||||
Graphics g = newImage.createGraphics();
|
||||
g.drawImage(image, 0, 0, 64, 32, null);
|
||||
g.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null);
|
||||
g.dispose();
|
||||
image = newImage;
|
||||
}
|
||||
@ -193,6 +193,15 @@ public class SkinProvider {
|
||||
}
|
||||
}
|
||||
|
||||
private static BufferedImage scale (BufferedImage bufferedImage) {
|
||||
BufferedImage resized = new BufferedImage(bufferedImage.getWidth() / 2, bufferedImage.getHeight() / 2, BufferedImage.TYPE_INT_RGB);
|
||||
Graphics2D g2 = resized.createGraphics();
|
||||
g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
|
||||
g2.drawImage(bufferedImage, 0, 0, bufferedImage.getWidth() / 2, bufferedImage.getHeight() / 2, null);
|
||||
g2.dispose();
|
||||
return resized;
|
||||
}
|
||||
|
||||
public static <T> T getOrDefault(CompletableFuture<T> future, T defaultValue, int timeoutInSeconds) {
|
||||
try {
|
||||
return future.get(timeoutInSeconds, TimeUnit.SECONDS);
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
[
|
||||
{
|
||||
"items" : [
|
||||
{
|
||||
"id" : 5
|
||||
},
|
||||
@ -638,6 +639,12 @@
|
||||
{
|
||||
"id" : 165
|
||||
},
|
||||
{
|
||||
"id" : -220
|
||||
},
|
||||
{
|
||||
"id" : -221
|
||||
},
|
||||
{
|
||||
"id" : 170
|
||||
},
|
||||
@ -1244,6 +1251,9 @@
|
||||
"id" : 6,
|
||||
"damage" : 5
|
||||
},
|
||||
{
|
||||
"id" : -218
|
||||
},
|
||||
{
|
||||
"id" : 295
|
||||
},
|
||||
@ -1304,6 +1314,9 @@
|
||||
{
|
||||
"id" : 91
|
||||
},
|
||||
{
|
||||
"id" : 736
|
||||
},
|
||||
{
|
||||
"id" : 31,
|
||||
"damage" : 2
|
||||
@ -1678,6 +1691,10 @@
|
||||
"id" : 383,
|
||||
"damage" : 10
|
||||
},
|
||||
{
|
||||
"id" : 383,
|
||||
"damage" : 122
|
||||
},
|
||||
{
|
||||
"id" : 383,
|
||||
"damage" : 11
|
||||
@ -2976,6 +2993,9 @@
|
||||
{
|
||||
"id" : -202
|
||||
},
|
||||
{
|
||||
"id" : -219
|
||||
},
|
||||
{
|
||||
"id" : 720
|
||||
},
|
||||
@ -2988,6 +3008,21 @@
|
||||
{
|
||||
"id" : -198
|
||||
},
|
||||
{
|
||||
"id" : 238,
|
||||
"damage" : 8
|
||||
},
|
||||
{
|
||||
"id" : 238
|
||||
},
|
||||
{
|
||||
"id" : 238,
|
||||
"damage" : 12
|
||||
},
|
||||
{
|
||||
"id" : 238,
|
||||
"damage" : 4
|
||||
},
|
||||
{
|
||||
"id" : 379
|
||||
},
|
||||
@ -3179,6 +3214,9 @@
|
||||
{
|
||||
"id" : 389
|
||||
},
|
||||
{
|
||||
"id" : 737
|
||||
},
|
||||
{
|
||||
"id" : 390
|
||||
},
|
||||
@ -3381,6 +3419,363 @@
|
||||
{
|
||||
"id" : 386
|
||||
},
|
||||
{
|
||||
"id" : 36
|
||||
},
|
||||
{
|
||||
"id" : -12
|
||||
},
|
||||
{
|
||||
"id" : -13
|
||||
},
|
||||
{
|
||||
"id" : -14
|
||||
},
|
||||
{
|
||||
"id" : -15
|
||||
},
|
||||
{
|
||||
"id" : -16
|
||||
},
|
||||
{
|
||||
"id" : -17
|
||||
},
|
||||
{
|
||||
"id" : -18
|
||||
},
|
||||
{
|
||||
"id" : -19
|
||||
},
|
||||
{
|
||||
"id" : -20
|
||||
},
|
||||
{
|
||||
"id" : -21
|
||||
},
|
||||
{
|
||||
"id" : -22
|
||||
},
|
||||
{
|
||||
"id" : -23
|
||||
},
|
||||
{
|
||||
"id" : -24
|
||||
},
|
||||
{
|
||||
"id" : -25
|
||||
},
|
||||
{
|
||||
"id" : -26
|
||||
},
|
||||
{
|
||||
"id" : -27
|
||||
},
|
||||
{
|
||||
"id" : -28
|
||||
},
|
||||
{
|
||||
"id" : -29
|
||||
},
|
||||
{
|
||||
"id" : -30
|
||||
},
|
||||
{
|
||||
"id" : -31
|
||||
},
|
||||
{
|
||||
"id" : -32
|
||||
},
|
||||
{
|
||||
"id" : -33
|
||||
},
|
||||
{
|
||||
"id" : -34
|
||||
},
|
||||
{
|
||||
"id" : -35
|
||||
},
|
||||
{
|
||||
"id" : -36
|
||||
},
|
||||
{
|
||||
"id" : -37
|
||||
},
|
||||
{
|
||||
"id" : -38
|
||||
},
|
||||
{
|
||||
"id" : -39
|
||||
},
|
||||
{
|
||||
"id" : -40
|
||||
},
|
||||
{
|
||||
"id" : -41
|
||||
},
|
||||
{
|
||||
"id" : -42
|
||||
},
|
||||
{
|
||||
"id" : -43
|
||||
},
|
||||
{
|
||||
"id" : -44
|
||||
},
|
||||
{
|
||||
"id" : -45
|
||||
},
|
||||
{
|
||||
"id" : -46
|
||||
},
|
||||
{
|
||||
"id" : -47
|
||||
},
|
||||
{
|
||||
"id" : -48
|
||||
},
|
||||
{
|
||||
"id" : -49
|
||||
},
|
||||
{
|
||||
"id" : -50
|
||||
},
|
||||
{
|
||||
"id" : -51
|
||||
},
|
||||
{
|
||||
"id" : -52
|
||||
},
|
||||
{
|
||||
"id" : -53
|
||||
},
|
||||
{
|
||||
"id" : -54
|
||||
},
|
||||
{
|
||||
"id" : -55
|
||||
},
|
||||
{
|
||||
"id" : -56
|
||||
},
|
||||
{
|
||||
"id" : -57
|
||||
},
|
||||
{
|
||||
"id" : -58
|
||||
},
|
||||
{
|
||||
"id" : -59
|
||||
},
|
||||
{
|
||||
"id" : -60
|
||||
},
|
||||
{
|
||||
"id" : -61
|
||||
},
|
||||
{
|
||||
"id" : -62
|
||||
},
|
||||
{
|
||||
"id" : -63
|
||||
},
|
||||
{
|
||||
"id" : -64
|
||||
},
|
||||
{
|
||||
"id" : -65
|
||||
},
|
||||
{
|
||||
"id" : -66
|
||||
},
|
||||
{
|
||||
"id" : -67
|
||||
},
|
||||
{
|
||||
"id" : -68
|
||||
},
|
||||
{
|
||||
"id" : -69
|
||||
},
|
||||
{
|
||||
"id" : -70
|
||||
},
|
||||
{
|
||||
"id" : -71
|
||||
},
|
||||
{
|
||||
"id" : -72
|
||||
},
|
||||
{
|
||||
"id" : -73
|
||||
},
|
||||
{
|
||||
"id" : -74
|
||||
},
|
||||
{
|
||||
"id" : -75
|
||||
},
|
||||
{
|
||||
"id" : -76
|
||||
},
|
||||
{
|
||||
"id" : -77
|
||||
},
|
||||
{
|
||||
"id" : -78
|
||||
},
|
||||
{
|
||||
"id" : -79
|
||||
},
|
||||
{
|
||||
"id" : -80
|
||||
},
|
||||
{
|
||||
"id" : -81
|
||||
},
|
||||
{
|
||||
"id" : -82
|
||||
},
|
||||
{
|
||||
"id" : -83
|
||||
},
|
||||
{
|
||||
"id" : -84
|
||||
},
|
||||
{
|
||||
"id" : -85
|
||||
},
|
||||
{
|
||||
"id" : -86
|
||||
},
|
||||
{
|
||||
"id" : -87
|
||||
},
|
||||
{
|
||||
"id" : -88
|
||||
},
|
||||
{
|
||||
"id" : -89
|
||||
},
|
||||
{
|
||||
"id" : -90
|
||||
},
|
||||
{
|
||||
"id" : -91
|
||||
},
|
||||
{
|
||||
"id" : -92
|
||||
},
|
||||
{
|
||||
"id" : -93
|
||||
},
|
||||
{
|
||||
"id" : -94
|
||||
},
|
||||
{
|
||||
"id" : -95
|
||||
},
|
||||
{
|
||||
"id" : -96
|
||||
},
|
||||
{
|
||||
"id" : -97
|
||||
},
|
||||
{
|
||||
"id" : -98
|
||||
},
|
||||
{
|
||||
"id" : -99
|
||||
},
|
||||
{
|
||||
"id" : -100
|
||||
},
|
||||
{
|
||||
"id" : -101
|
||||
},
|
||||
{
|
||||
"id" : -102
|
||||
},
|
||||
{
|
||||
"id" : -103
|
||||
},
|
||||
{
|
||||
"id" : -104
|
||||
},
|
||||
{
|
||||
"id" : -105
|
||||
},
|
||||
{
|
||||
"id" : -106
|
||||
},
|
||||
{
|
||||
"id" : -107
|
||||
},
|
||||
{
|
||||
"id" : -108
|
||||
},
|
||||
{
|
||||
"id" : -109
|
||||
},
|
||||
{
|
||||
"id" : -110
|
||||
},
|
||||
{
|
||||
"id" : -111
|
||||
},
|
||||
{
|
||||
"id" : -112
|
||||
},
|
||||
{
|
||||
"id" : -113
|
||||
},
|
||||
{
|
||||
"id" : -114
|
||||
},
|
||||
{
|
||||
"id" : -115
|
||||
},
|
||||
{
|
||||
"id" : -116
|
||||
},
|
||||
{
|
||||
"id" : -117
|
||||
},
|
||||
{
|
||||
"id" : -118
|
||||
},
|
||||
{
|
||||
"id" : -119
|
||||
},
|
||||
{
|
||||
"id" : -120
|
||||
},
|
||||
{
|
||||
"id" : -121
|
||||
},
|
||||
{
|
||||
"id" : -122
|
||||
},
|
||||
{
|
||||
"id" : -123
|
||||
},
|
||||
{
|
||||
"id" : -124
|
||||
},
|
||||
{
|
||||
"id" : -125
|
||||
},
|
||||
{
|
||||
"id" : -126
|
||||
},
|
||||
{
|
||||
"id" : -127
|
||||
},
|
||||
{
|
||||
"id" : -128
|
||||
},
|
||||
{
|
||||
"id" : -129
|
||||
},
|
||||
{
|
||||
"id" : 403,
|
||||
"nbt_b64" : "CgAACQQAZW5jaAoBAAAAAgMAbHZsAQACAgBpZAAAAAA="
|
||||
@ -4177,4 +4572,5 @@
|
||||
"damage" : 6,
|
||||
"nbt_b64" : "CgAAAwsAY3VzdG9tQ29sb3KcnBb/Cg0ARmlyZXdvcmtzSXRlbQcNAEZpcmV3b3JrQ29sb3IBAAAABgEMAEZpcmV3b3JrVHlwZQAHDABGaXJld29ya0ZhZGUAAAAAAQ0ARmlyZXdvcmtUcmFpbAABDwBGaXJld29ya0ZsaWNrZXIAAAA="
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
BIN
connector/src/main/resources/bedrock/runtime_block_states-1.14.dat
Normale Datei
BIN
connector/src/main/resources/bedrock/runtime_block_states-1.14.dat
Normale Datei
Binäre Datei nicht angezeigt.
@ -1 +1 @@
|
||||
Subproject commit 3d4147f001266d01eae6b8479428ca77bb5bf0c3
|
||||
Subproject commit 0f3d65b65076b16fc7dc9226230b31291b8f2cde
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren