Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-10-03 16:31:14 +02:00
Merge branch 'master' into rp
Dieser Commit ist enthalten in:
Commit
61f5294ea0
@ -307,11 +307,11 @@ public final class EntityDefinitions {
|
|||||||
.addTranslator(MetadataType.INT, TNTEntity::setFuseLength)
|
.addTranslator(MetadataType.INT, TNTEntity::setFuseLength)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
EntityDefinition<Entity> displayBase = EntityDefinition.inherited(entityBase.factory(), entityBase)
|
EntityDefinition<DisplayBaseEntity> displayBase = EntityDefinition.inherited(DisplayBaseEntity::new, entityBase)
|
||||||
.addTranslator(null) // Interpolation delay
|
.addTranslator(null) // Interpolation delay
|
||||||
.addTranslator(null) // Transformation interpolation duration
|
.addTranslator(null) // Transformation interpolation duration
|
||||||
.addTranslator(null) // Position/Rotation interpolation duration
|
.addTranslator(null) // Position/Rotation interpolation duration
|
||||||
.addTranslator(null) // Translation
|
.addTranslator(MetadataType.VECTOR3, DisplayBaseEntity::setTranslation) // Translation
|
||||||
.addTranslator(null) // Scale
|
.addTranslator(null) // Scale
|
||||||
.addTranslator(null) // Left rotation
|
.addTranslator(null) // Left rotation
|
||||||
.addTranslator(null) // Right rotation
|
.addTranslator(null) // Right rotation
|
||||||
|
@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2024 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.geyser.entity.type;
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
import org.cloudburstmc.math.vector.Vector3f;
|
||||||
|
import org.geysermc.geyser.entity.EntityDefinition;
|
||||||
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
import org.geysermc.geyser.util.EntityUtils;
|
||||||
|
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
|
||||||
|
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
public class DisplayBaseEntity extends Entity {
|
||||||
|
|
||||||
|
private @Nullable Vector3f baseTranslation;
|
||||||
|
|
||||||
|
public DisplayBaseEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
|
||||||
|
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setDisplayNameVisible(BooleanEntityMetadata entityMetadata) {
|
||||||
|
// Don't allow the display name to be hidden - messes with our armor stand.
|
||||||
|
// On JE: Hiding the display name still shows the display entity text.
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setDisplayName(EntityMetadata<Optional<Component>, ?> entityMetadata) {
|
||||||
|
// This would usually set EntityDataTypes.NAME, but we are instead using NAME for the text display.
|
||||||
|
// On JE: custom name does not override text display.
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTranslation(EntityMetadata<Vector3f, ?> translationMeta){
|
||||||
|
this.baseTranslation = translationMeta.getValue();
|
||||||
|
if (this.baseTranslation == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.vehicle == null) {
|
||||||
|
this.setRiderSeatPosition(this.baseTranslation);
|
||||||
|
this.moveRelative(this.baseTranslation.getX(), this.baseTranslation.getY(), this.baseTranslation.getZ(), yaw, pitch, headYaw, false);
|
||||||
|
} else {
|
||||||
|
EntityUtils.updateMountOffset(this, this.vehicle, true, true, false);
|
||||||
|
this.updateBedrockMetadata();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Vector3f getTranslation() {
|
||||||
|
return baseTranslation;
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2019-2023 GeyserMC. http://geysermc.org
|
* Copyright (c) 2024 GeyserMC. http://geysermc.org
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
@ -32,13 +32,11 @@ import org.geysermc.geyser.entity.EntityDefinition;
|
|||||||
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.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
|
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
|
||||||
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
// Note: 1.19.4 requires that the billboard is set to something in order to show, on Java Edition
|
// Note: 1.19.4 requires that the billboard is set to something in order to show, on Java Edition
|
||||||
public class TextDisplayEntity extends Entity {
|
public class TextDisplayEntity extends DisplayBaseEntity {
|
||||||
public TextDisplayEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
|
public TextDisplayEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
|
||||||
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
|
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
|
||||||
}
|
}
|
||||||
@ -51,18 +49,6 @@ public class TextDisplayEntity extends Entity {
|
|||||||
this.dirtyMetadata.put(EntityDataTypes.NAMETAG_ALWAYS_SHOW, (byte) 1);
|
this.dirtyMetadata.put(EntityDataTypes.NAMETAG_ALWAYS_SHOW, (byte) 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDisplayNameVisible(BooleanEntityMetadata entityMetadata) {
|
|
||||||
// Don't allow the display name to be hidden - messes with our armor stand.
|
|
||||||
// On JE: Hiding the display name still shows the display entity text.
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDisplayName(EntityMetadata<Optional<Component>, ?> entityMetadata) {
|
|
||||||
// This would usually set EntityDataTypes.NAME, but we are instead using NAME for the text display.
|
|
||||||
// On JE: custom name does not override text display.
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setText(EntityMetadata<Component, ?> entityMetadata) {
|
public void setText(EntityMetadata<Component, ?> entityMetadata) {
|
||||||
this.dirtyMetadata.put(EntityDataTypes.NAME, MessageTranslator.convertMessage(entityMetadata.getValue()));
|
this.dirtyMetadata.put(EntityDataTypes.NAME, MessageTranslator.convertMessage(entityMetadata.getValue()));
|
||||||
}
|
}
|
||||||
|
@ -29,15 +29,19 @@ import org.checkerframework.checker.nullness.qual.NonNull;
|
|||||||
import org.cloudburstmc.nbt.NbtMap;
|
import org.cloudburstmc.nbt.NbtMap;
|
||||||
import org.cloudburstmc.nbt.NbtMapBuilder;
|
import org.cloudburstmc.nbt.NbtMapBuilder;
|
||||||
import org.cloudburstmc.nbt.NbtType;
|
import org.cloudburstmc.nbt.NbtType;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
|
||||||
|
import org.geysermc.geyser.inventory.item.Potion;
|
||||||
import org.geysermc.geyser.item.Items;
|
import org.geysermc.geyser.item.Items;
|
||||||
import org.geysermc.geyser.level.block.type.Block;
|
import org.geysermc.geyser.level.block.type.Block;
|
||||||
import org.geysermc.geyser.registry.type.ItemMapping;
|
import org.geysermc.geyser.registry.type.ItemMapping;
|
||||||
import org.geysermc.geyser.session.GeyserSession;
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
import org.geysermc.geyser.translator.item.BedrockItemBuilder;
|
import org.geysermc.geyser.translator.item.BedrockItemBuilder;
|
||||||
|
import org.geysermc.geyser.translator.item.CustomItemTranslator;
|
||||||
import org.geysermc.geyser.translator.item.ItemTranslator;
|
import org.geysermc.geyser.translator.item.ItemTranslator;
|
||||||
import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
|
import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
|
||||||
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
|
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
|
||||||
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
|
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
|
||||||
|
import org.geysermc.mcprotocollib.protocol.data.game.item.component.PotionContents;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -64,12 +68,35 @@ public class ShulkerBoxItem extends BlockItem {
|
|||||||
}
|
}
|
||||||
ItemMapping boxMapping = session.getItemMappings().getMapping(item.getId());
|
ItemMapping boxMapping = session.getItemMappings().getMapping(item.getId());
|
||||||
|
|
||||||
NbtMapBuilder boxItemNbt = BedrockItemBuilder.createItemNbt(boxMapping, item.getAmount(), boxMapping.getBedrockData()); // Final item tag to add to the list
|
int bedrockData = boxMapping.getBedrockData();
|
||||||
|
String bedrockIdentifier = boxMapping.getBedrockIdentifier();
|
||||||
|
DataComponents boxComponents = item.getDataComponents();
|
||||||
|
|
||||||
|
if (boxComponents != null) {
|
||||||
|
// Check for custom items
|
||||||
|
ItemDefinition customItemDefinition = CustomItemTranslator.getCustomItem(boxComponents, boxMapping);
|
||||||
|
if (customItemDefinition != null) {
|
||||||
|
bedrockIdentifier = customItemDefinition.getIdentifier();
|
||||||
|
bedrockData = 0;
|
||||||
|
} else {
|
||||||
|
// Manual checks for potions/tipped arrows
|
||||||
|
if (boxMapping.getJavaItem() instanceof PotionItem || boxMapping.getJavaItem() instanceof ArrowItem) {
|
||||||
|
PotionContents potionContents = boxComponents.get(DataComponentType.POTION_CONTENTS);
|
||||||
|
if (potionContents != null) {
|
||||||
|
Potion potion = Potion.getByJavaId(potionContents.getPotionId());
|
||||||
|
if (potion != null) {
|
||||||
|
bedrockData = potion.getBedrockId();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NbtMapBuilder boxItemNbt = BedrockItemBuilder.createItemNbt(bedrockIdentifier, item.getAmount(), bedrockData); // Final item tag to add to the list
|
||||||
boxItemNbt.putByte("Slot", (byte) slot);
|
boxItemNbt.putByte("Slot", (byte) slot);
|
||||||
boxItemNbt.putByte("WasPickedUp", (byte) 0); // ??? TODO might not be needed
|
boxItemNbt.putByte("WasPickedUp", (byte) 0); // ??? TODO might not be needed
|
||||||
|
|
||||||
// Only the display name is what we have interest in, so just translate that if relevant
|
// Only the display name is what we have interest in, so just translate that if relevant
|
||||||
DataComponents boxComponents = item.getDataComponents();
|
|
||||||
if (boxComponents != null) {
|
if (boxComponents != null) {
|
||||||
String customName = ItemTranslator.getCustomName(session, boxComponents, boxMapping, '7');
|
String customName = ItemTranslator.getCustomName(session, boxComponents, boxMapping, '7');
|
||||||
if (customName != null) {
|
if (customName != null) {
|
||||||
|
@ -40,7 +40,7 @@ public class DoorBlock extends Block {
|
|||||||
// Needed to check whether we must force the client to update the door state.
|
// Needed to check whether we must force the client to update the door state.
|
||||||
String doubleBlockHalf = state.getValue(Properties.DOUBLE_BLOCK_HALF);
|
String doubleBlockHalf = state.getValue(Properties.DOUBLE_BLOCK_HALF);
|
||||||
|
|
||||||
if (doubleBlockHalf.equals("lower")) {
|
if (!session.getGeyser().getWorldManager().hasOwnChunkCache() && doubleBlockHalf.equals("lower")) {
|
||||||
BlockState oldBlockState = session.getGeyser().getWorldManager().blockAt(session, position);
|
BlockState oldBlockState = session.getGeyser().getWorldManager().blockAt(session, position);
|
||||||
// If these are the same, it means that we already updated the lower door block (manually in the workaround below),
|
// If these are the same, it means that we already updated the lower door block (manually in the workaround below),
|
||||||
// and we do not need to update the block in the cache/on the client side using the super.updateBlock() method again.
|
// and we do not need to update the block in the cache/on the client side using the super.updateBlock() method again.
|
||||||
|
@ -43,13 +43,17 @@ import java.util.StringJoiner;
|
|||||||
*/
|
*/
|
||||||
public final class GameProtocol {
|
public final class GameProtocol {
|
||||||
|
|
||||||
|
// Surprise protocol bump WOW
|
||||||
|
private static final BedrockCodec BEDROCK_V686 = Bedrock_v685.CODEC.toBuilder()
|
||||||
|
.protocolVersion(686)
|
||||||
|
.minecraftVersion("1.21.2")
|
||||||
|
.build();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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 BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(Bedrock_v685.CODEC.toBuilder()
|
public static final BedrockCodec DEFAULT_BEDROCK_CODEC = CodecProcessor.processCodec(BEDROCK_V686);
|
||||||
.minecraftVersion("1.21.1")
|
|
||||||
.build());
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of all supported Bedrock versions that can join Geyser
|
* A list of all supported Bedrock versions that can join Geyser
|
||||||
@ -66,9 +70,10 @@ public final class GameProtocol {
|
|||||||
SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(Bedrock_v671.CODEC.toBuilder()
|
SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(Bedrock_v671.CODEC.toBuilder()
|
||||||
.minecraftVersion("1.20.80/1.20.81")
|
.minecraftVersion("1.20.80/1.20.81")
|
||||||
.build()));
|
.build()));
|
||||||
SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(DEFAULT_BEDROCK_CODEC.toBuilder()
|
SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(Bedrock_v685.CODEC.toBuilder()
|
||||||
.minecraftVersion("1.21.0/1.20.1")
|
.minecraftVersion("1.21.0/1.21.1")
|
||||||
.build()));
|
.build()));
|
||||||
|
SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -145,8 +145,15 @@ public final class BedrockItemBuilder {
|
|||||||
* Creates item NBT to nest within NBT with name, count, and damage set.
|
* Creates item NBT to nest within NBT with name, count, and damage set.
|
||||||
*/
|
*/
|
||||||
public static NbtMapBuilder createItemNbt(ItemMapping mapping, int count, int damage) {
|
public static NbtMapBuilder createItemNbt(ItemMapping mapping, int count, int damage) {
|
||||||
|
return createItemNbt(mapping.getBedrockIdentifier(), count, damage);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates item NBT to nest within NBT with name, count, and damage set.
|
||||||
|
*/
|
||||||
|
public static NbtMapBuilder createItemNbt(String bedrockIdentifier, int count, int damage) {
|
||||||
NbtMapBuilder builder = NbtMap.builder();
|
NbtMapBuilder builder = NbtMap.builder();
|
||||||
builder.putString("Name", mapping.getBedrockIdentifier());
|
builder.putString("Name", bedrockIdentifier);
|
||||||
builder.putByte("Count", (byte) count);
|
builder.putByte("Count", (byte) count);
|
||||||
builder.putShort("Damage", (short) damage);
|
builder.putShort("Damage", (short) damage);
|
||||||
return builder;
|
return builder;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
|
* Copyright (c) 2024 GeyserMC. http://geysermc.org
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
@ -32,6 +32,7 @@ import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
|
|||||||
import org.geysermc.geyser.entity.EntityDefinitions;
|
import org.geysermc.geyser.entity.EntityDefinitions;
|
||||||
import org.geysermc.geyser.entity.type.BoatEntity;
|
import org.geysermc.geyser.entity.type.BoatEntity;
|
||||||
import org.geysermc.geyser.entity.type.Entity;
|
import org.geysermc.geyser.entity.type.Entity;
|
||||||
|
import org.geysermc.geyser.entity.type.TextDisplayEntity;
|
||||||
import org.geysermc.geyser.entity.type.living.ArmorStandEntity;
|
import org.geysermc.geyser.entity.type.living.ArmorStandEntity;
|
||||||
import org.geysermc.geyser.entity.type.living.animal.AnimalEntity;
|
import org.geysermc.geyser.entity.type.living.animal.AnimalEntity;
|
||||||
import org.geysermc.geyser.entity.type.living.animal.horse.CamelEntity;
|
import org.geysermc.geyser.entity.type.living.animal.horse.CamelEntity;
|
||||||
@ -172,11 +173,7 @@ public final class EntityUtils {
|
|||||||
case BOAT -> {
|
case BOAT -> {
|
||||||
// Without the X offset, more than one entity on a boat is stacked on top of each other
|
// Without the X offset, more than one entity on a boat is stacked on top of each other
|
||||||
if (moreThanOneEntity) {
|
if (moreThanOneEntity) {
|
||||||
if (rider) {
|
xOffset = rider ? 0.2f : -0.6f;
|
||||||
xOffset = 0.2f;
|
|
||||||
} else {
|
|
||||||
xOffset = -0.6f;
|
|
||||||
}
|
|
||||||
if (passenger instanceof AnimalEntity) {
|
if (passenger instanceof AnimalEntity) {
|
||||||
xOffset += 0.2f;
|
xOffset += 0.2f;
|
||||||
}
|
}
|
||||||
@ -203,6 +200,18 @@ public final class EntityUtils {
|
|||||||
case CHEST_BOAT -> xOffset = 0.15F;
|
case CHEST_BOAT -> xOffset = 0.15F;
|
||||||
case CHICKEN -> zOffset = -0.1f;
|
case CHICKEN -> zOffset = -0.1f;
|
||||||
case TRADER_LLAMA, LLAMA -> zOffset = -0.3f;
|
case TRADER_LLAMA, LLAMA -> zOffset = -0.3f;
|
||||||
|
case TEXT_DISPLAY -> {
|
||||||
|
if (passenger instanceof TextDisplayEntity textDisplay) {
|
||||||
|
Vector3f displayTranslation = textDisplay.getTranslation();
|
||||||
|
if (displayTranslation == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
xOffset = displayTranslation.getX();
|
||||||
|
yOffset = displayTranslation.getY() + 0.2f;
|
||||||
|
zOffset = displayTranslation.getZ();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* Bedrock Differences
|
* Bedrock Differences
|
||||||
@ -228,8 +237,7 @@ public final class EntityUtils {
|
|||||||
if (mount instanceof ArmorStandEntity armorStand) {
|
if (mount instanceof ArmorStandEntity armorStand) {
|
||||||
yOffset -= armorStand.getYOffset();
|
yOffset -= armorStand.getYOffset();
|
||||||
}
|
}
|
||||||
Vector3f offset = Vector3f.from(xOffset, yOffset, zOffset);
|
passenger.setRiderSeatPosition(Vector3f.from(xOffset, yOffset, zOffset));
|
||||||
passenger.setRiderSeatPosition(offset);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ minecraft = "1.21"
|
|||||||
indra = "3.1.3"
|
indra = "3.1.3"
|
||||||
shadow = "8.1.1"
|
shadow = "8.1.1"
|
||||||
architectury-plugin = "3.4-SNAPSHOT"
|
architectury-plugin = "3.4-SNAPSHOT"
|
||||||
architectury-loom = "1.6-SNAPSHOT"
|
architectury-loom = "1.7-SNAPSHOT"
|
||||||
minotaur = "2.8.7"
|
minotaur = "2.8.7"
|
||||||
lombok = "8.4"
|
lombok = "8.4"
|
||||||
blossom = "2.1.0"
|
blossom = "2.1.0"
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binäre Datei nicht angezeigt.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren