GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

something something mirror

This commit is contained in:
onebeastchris 2024-03-27 23:30:39 +01:00
parent 2aa6dce227
commit edbef93f18
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/geysermc/geyser/translator/level/block/entity/StructureBlockBlockEntityTranslator.java
View File

@ -29,6 +29,7 @@ import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import org.cloudburstmc.math.vector.Vector3i;
import org.cloudburstmc.nbt.NbtMapBuilder;
import org.cloudburstmc.protocol.bedrock.data.structure.StructureMirror;
import org.geysermc.geyser.util.StructureBlockUtils;
@BlockEntity(type = BlockEntityType.STRUCTURE_BLOCK)
@ -56,8 +57,8 @@ public class StructureBlockBlockEntityTranslator extends BlockEntityTranslator {
// Mirror behaves different in Java and Bedrock - it requires modifying the position in space as well
String mirror = getOrDefault(tag.get("mirror"), "");
byte bedrockMirror = switch (mirror) {
case "LEFT_RIGHT" -> 1;
case "FRONT_BACK" -> 2;
case "FRONT_BACK" -> (byte) StructureMirror.X.ordinal();
case "LEFT_RIGHT" -> (byte) StructureMirror.Z.ordinal();
default -> 0; // Or NONE
};
builder.putByte("mirror", bedrockMirror);

4
core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockEntityDataTranslator.java
View File

@ -117,8 +117,8 @@ public class JavaBlockEntityDataTranslator extends PacketTranslator<ClientboundB
String mirror = getOrDefault(map.get("mirror"), "");
byte bedrockMirror = switch (mirror) {
case "LEFT_RIGHT" -> 1;
case "FRONT_BACK" -> 2;
case "FRONT_BACK" -> (byte) StructureMirror.X.ordinal();
case "LEFT_RIGHT" -> (byte) StructureMirror.Z.ordinal();
default -> 0; // Or NONE
};

24
core/src/main/java/org/geysermc/geyser/util/StructureBlockUtils.java
View File

@ -36,8 +36,8 @@ import org.cloudburstmc.protocol.bedrock.data.structure.StructureSettings;
import org.cloudburstmc.protocol.bedrock.data.structure.StructureTemplateResponseType;
import org.cloudburstmc.protocol.bedrock.packet.StructureTemplateDataRequestPacket;
import org.cloudburstmc.protocol.bedrock.packet.StructureTemplateDataResponsePacket;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.text.ChatColor;
public class StructureBlockUtils {
@ -67,7 +67,7 @@ public class StructureBlockUtils {
responsePacket.setName(name);
responsePacket.setSave(true);
responsePacket.setTag(EMPTY_STRUCTURE_DATA.toBuilder()
.putList("size", NbtType.INT, x, y, z)
.putList("size", NbtType.INT, Math.abs(x), y, Math.abs(z)) // Use absolute numbers, Bedrock complains about negatives
.build());
responsePacket.setType(StructureTemplateResponseType.QUERY);
session.sendUpstreamPacket(responsePacket);
@ -77,6 +77,7 @@ public class StructureBlockUtils {
StructureSettings old = session.getStructureSettings();
if (old == null) {
GeyserImpl.getInstance().getLogger().info("old structure null");
return new Vector3i[] {newSettings.getOffset(), newSettings.getSize()};
}
@ -91,15 +92,14 @@ public class StructureBlockUtils {
int originalSizeZ = size.getZ();
switch (old.getMirror()) {
case X -> {
originalSizeX *= -1;
offsetX = offsetX - originalSizeX;
}
case Z -> {
originalSizeZ *= -1;
offsetZ = offsetZ - originalSizeZ;
originalSizeX *= -1;
offsetX = offsetX - originalSizeX - 1;
}
case X -> {
originalSizeZ *= -1;
offsetZ = offsetZ - originalSizeZ - 1;
}
case XZ -> session.sendMessage(ChatColor.RED + "Mirroring on both axis is not possible on Java. Not mirroring!");
}
switch (old.getRotation()) {
@ -145,8 +145,6 @@ public class StructureBlockUtils {
Vector3i originalSize = Vector3i.from(originalSizeX, size.getY(), originalSizeZ);
return new Vector3i[]{originalOffset, originalSize};
}
public static Vector3i[] addOffsets(byte bedrockRotation, byte bedrockMirror,
@ -156,10 +154,10 @@ public class StructureBlockUtils {
// Modify positions if mirrored - Bedrock doesn't have this
if (bedrockMirror == (byte) StructureMirror.Z.ordinal()) {
offsetX = offsetX + sizeX;
offsetX = offsetX + sizeX + 1;
newXStructureSize = sizeX * -1;
} else if (bedrockMirror == (byte) StructureMirror.X.ordinal()) {
offsetZ = offsetZ + sizeZ;
offsetZ = offsetZ + sizeZ + 1;
newZStructureSize = sizeZ * -1;
}