Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-11-08 17:20:20 +01:00
Fixed
Dieser Commit ist enthalten in:
Ursprung
f68f03627b
Commit
1dc6d4fbdc
@ -34,11 +34,7 @@ import com.github.steveice10.mc.protocol.data.game.window.WindowType;
|
|||||||
import com.nukkitx.protocol.bedrock.data.ContainerType;
|
import com.nukkitx.protocol.bedrock.data.ContainerType;
|
||||||
import org.geysermc.connector.GeyserConnector;
|
import org.geysermc.connector.GeyserConnector;
|
||||||
import org.geysermc.connector.network.translators.block.BlockTranslator;
|
import org.geysermc.connector.network.translators.block.BlockTranslator;
|
||||||
import org.geysermc.connector.network.translators.block.entity.BannerBlockEntityTranslator;
|
import org.geysermc.connector.network.translators.block.entity.*;
|
||||||
import org.geysermc.connector.network.translators.block.entity.BlockEntityTranslator;
|
|
||||||
import org.geysermc.connector.network.translators.block.entity.CampfireBlockEntityTranslator;
|
|
||||||
import org.geysermc.connector.network.translators.block.entity.EmptyBlockEntityTranslator;
|
|
||||||
import org.geysermc.connector.network.translators.block.entity.SignBlockEntityTranslator;
|
|
||||||
import org.geysermc.connector.network.translators.inventory.AnvilInventoryTranslator;
|
import org.geysermc.connector.network.translators.inventory.AnvilInventoryTranslator;
|
||||||
import org.geysermc.connector.network.translators.inventory.BlockInventoryTranslator;
|
import org.geysermc.connector.network.translators.inventory.BlockInventoryTranslator;
|
||||||
import org.geysermc.connector.network.translators.inventory.BrewingInventoryTranslator;
|
import org.geysermc.connector.network.translators.inventory.BrewingInventoryTranslator;
|
||||||
@ -132,6 +128,7 @@ public class Translators {
|
|||||||
blockEntityTranslators.put("Sign", new SignBlockEntityTranslator());
|
blockEntityTranslators.put("Sign", new SignBlockEntityTranslator());
|
||||||
blockEntityTranslators.put("Campfire", new CampfireBlockEntityTranslator());
|
blockEntityTranslators.put("Campfire", new CampfireBlockEntityTranslator());
|
||||||
blockEntityTranslators.put("Banner", new BannerBlockEntityTranslator());
|
blockEntityTranslators.put("Banner", new BannerBlockEntityTranslator());
|
||||||
|
blockEntityTranslators.put("EndGateway", new EndGatewayBlockEntityTranslator());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void registerInventoryTranslators() {
|
private static void registerInventoryTranslators() {
|
||||||
|
@ -0,0 +1,53 @@
|
|||||||
|
package org.geysermc.connector.network.translators.block.entity;
|
||||||
|
|
||||||
|
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
|
||||||
|
import com.github.steveice10.opennbt.tag.builtin.LongTag;
|
||||||
|
import com.nukkitx.nbt.CompoundTagBuilder;
|
||||||
|
import com.nukkitx.nbt.tag.IntTag;
|
||||||
|
import com.nukkitx.nbt.tag.Tag;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class EndGatewayBlockEntityTranslator extends BlockEntityTranslator {
|
||||||
|
@Override
|
||||||
|
public List<Tag<?>> translateTag(CompoundTag tag) {
|
||||||
|
System.out.println(tag);
|
||||||
|
List<Tag<?>> tags = new ArrayList<>();
|
||||||
|
tags.add(new IntTag("Age", (int) (long) tag.get("Age").getValue()));
|
||||||
|
// Java sometimes does not provide this tag, but Bedrock crashes if it doesn't exist
|
||||||
|
// Linked coordinates
|
||||||
|
List<IntTag> tagsList = new ArrayList<>();
|
||||||
|
tagsList.add(new IntTag("", getExitPortalCoordinate(tag, "X")));
|
||||||
|
tagsList.add(new IntTag("", getExitPortalCoordinate(tag, "Y")));
|
||||||
|
tagsList.add(new IntTag("", getExitPortalCoordinate(tag, "Z")));
|
||||||
|
com.nukkitx.nbt.tag.ListTag<IntTag> exitPortal =
|
||||||
|
new com.nukkitx.nbt.tag.ListTag<>("ExitPortal", com.nukkitx.nbt.tag.IntTag.class, tagsList);
|
||||||
|
tags.add(exitPortal);
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
|
||||||
|
CompoundTag tag = getConstantJavaTag(javaId, x, y, z);
|
||||||
|
tag.put(new LongTag("Age"));
|
||||||
|
return tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
|
||||||
|
System.out.println("Default Bedrock tag being created");
|
||||||
|
CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
|
||||||
|
tagBuilder.listTag("ExitPortal", IntTag.class, new ArrayList<>());
|
||||||
|
return tagBuilder.buildRootTag();
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getExitPortalCoordinate(CompoundTag tag, String axis) {
|
||||||
|
if (tag.get("ExitPortal").getValue() != null) {
|
||||||
|
LinkedHashMap compoundTag = (LinkedHashMap) tag.get("ExitPortal").getValue();
|
||||||
|
com.github.steveice10.opennbt.tag.builtin.IntTag intTag = (com.github.steveice10.opennbt.tag.builtin.IntTag) compoundTag.get(axis);
|
||||||
|
return intTag.getValue();
|
||||||
|
} return 0;
|
||||||
|
}
|
||||||
|
}
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren