Fix signs (#439)

* Fix signs on everything except Paper

* Fix sign line placement

* Update shulker box block entity

Co-authored-by: James Harrison <james@fasttortoise.co.uk>

connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUpdateTileEntityTranslator.java

@@ -30,19 +30,13 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdate
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
-import org.geysermc.connector.network.translators.world.block.entity.BlockEntity;
 import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
 import org.geysermc.connector.utils.BlockEntityUtils;
 import org.geysermc.connector.utils.ChunkUtils;
 
-import java.util.concurrent.TimeUnit;
-
 @Translator(packet = ServerUpdateTileEntityPacket.class)
 public class JavaUpdateTileEntityTranslator extends PacketTranslator<ServerUpdateTileEntityPacket> {
 
-    // This should be modified if sign text is not showing up
-    private static final int DELAY = 500;
-
     @Override
     public void translate(ServerUpdateTileEntityPacket packet, GeyserSession session) {
         String id = BlockEntityUtils.getBedrockBlockEntityId(packet.getType().name());
@@ -52,11 +46,6 @@ public class JavaUpdateTileEntityTranslator extends PacketTranslator<ServerUpdat
             BlockEntityUtils.updateBlockEntity(session, translator.getBlockEntityTag(id, packet.getNbt(),
                     ChunkUtils.CACHED_BLOCK_ENTITIES.get(packet.getPosition())), packet.getPosition());
             ChunkUtils.CACHED_BLOCK_ENTITIES.remove(packet.getPosition());
-        } else if (translator.getClass().getAnnotation(BlockEntity.class).delay()) {
-            // Delay so chunks can finish sending
-            session.getConnector().getGeneralThreadPool().schedule(() ->
-                            BlockEntityUtils.updateBlockEntity(session, translator.getBlockEntityTag(id, packet.getNbt(), null), packet.getPosition()),
-                    DELAY, TimeUnit.MILLISECONDS);
         } else {
             BlockEntityUtils.updateBlockEntity(session, translator.getBlockEntityTag(id, packet.getNbt(), null), packet.getPosition());
         }

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BannerBlockEntityTranslator.java

@@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.world.block.BlockStateValues;
 import java.util.ArrayList;
 import java.util.List;
 
-@BlockEntity(name = "Banner", delay = false, regex = "banner")
+@BlockEntity(name = "Banner", regex = "banner")
 public class BannerBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
 
     @Override

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BedBlockEntityTranslator.java

@@ -35,7 +35,7 @@ import org.geysermc.connector.network.translators.world.block.BlockStateValues;
 import java.util.ArrayList;
 import java.util.List;
 
-@BlockEntity(name = "Bed", delay = false, regex = "bed")
+@BlockEntity(name = "Bed", regex = "bed")
 public class BedBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
 
     @Override

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/BlockEntity.java

@@ -31,12 +31,6 @@ import java.lang.annotation.RetentionPolicy;
 @Retention(value = RetentionPolicy.RUNTIME)
 public @interface BlockEntity {
 
-    /**
-     * Whether to delay the sending of the block entity
-     * @return the delay for when sending the block entity
-     */
-    boolean delay();
-
     /**
      * The block entity name
      * @return the name of the block entity

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/CampfireBlockEntityTranslator.java

@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-@BlockEntity(name = "Campfire", delay = false, regex = "campfire")
+@BlockEntity(name = "Campfire", regex = "campfire")
 public class CampfireBlockEntityTranslator extends BlockEntityTranslator {
 
     @Override

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EmptyBlockEntityTranslator.java

@@ -32,7 +32,7 @@ import com.nukkitx.nbt.tag.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-@BlockEntity(name = "Empty", delay = false, regex = "")
+@BlockEntity(name = "Empty", regex = "")
 public class EmptyBlockEntityTranslator extends BlockEntityTranslator {
 
     @Override

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/EndGatewayBlockEntityTranslator.java

@@ -36,7 +36,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-@BlockEntity(name = "EndGateway", delay = true, regex = "end_gateway")
+@BlockEntity(name = "EndGateway", regex = "end_gateway")
 public class EndGatewayBlockEntityTranslator extends BlockEntityTranslator {
 
     @Override

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/ShulkerBoxBlockEntityTranslator.java

@@ -36,7 +36,7 @@ import org.geysermc.connector.network.translators.world.block.BlockStateValues;
 import java.util.ArrayList;
 import java.util.List;
 
-@BlockEntity(name = "ShulkerBox", delay = false, regex = "shulker_box")
+@BlockEntity(name = "ShulkerBox", regex = "shulker_box")
 public class ShulkerBoxBlockEntityTranslator extends BlockEntityTranslator {
 
     @Override

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SignBlockEntityTranslator.java

@@ -31,29 +31,35 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.nukkitx.nbt.CompoundTagBuilder;
 import com.nukkitx.nbt.tag.StringTag;
 import com.nukkitx.nbt.tag.Tag;
+import io.netty.util.internal.StringUtil;
 import org.geysermc.connector.utils.MessageUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@BlockEntity(name = "Sign", delay = true, regex = "sign")
+@BlockEntity(name = "Sign", regex = "sign")
 public class SignBlockEntityTranslator extends BlockEntityTranslator {
 
     @Override
     public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
         List<Tag<?>> tags = new ArrayList<>();
 
-        String line1 = getOrDefault(tag.getValue().get("Text1"), "");
+        StringBuilder signText = new StringBuilder();
-        String line2 = getOrDefault(tag.getValue().get("Text2"), "");
+        for(int i = 0; i < 4; i++) {
-        String line3 = getOrDefault(tag.getValue().get("Text3"), "");
+            int currentLine = i+1;
-        String line4 = getOrDefault(tag.getValue().get("Text4"), "");
+            String signLine = getOrDefault(tag.getValue().get("Text" + currentLine), "");
+            signLine = MessageUtils.getBedrockMessage(Message.fromString(signLine));
 
-        tags.add(new StringTag("Text", MessageUtils.getBedrockMessage(Message.fromString(line1))
+            //Java allows up to 16+ characters on certain symbols. 
-                + "\n" + MessageUtils.getBedrockMessage(Message.fromString(line2))
+            if(signLine.length() >= 15 && (signLine.contains("-") || signLine.contains("="))) {
-                + "\n" + MessageUtils.getBedrockMessage(Message.fromString(line3))
+                signLine = signLine.substring(0, 14);
-                + "\n" + MessageUtils.getBedrockMessage(Message.fromString(line4))
+            }
-        ));
 
+            signText.append(signLine);
+            signText.append("\n");
+        }
+
+        tags.add(new StringTag("Text", MessageUtils.getBedrockMessage(Message.fromString(signText.toString()))));
         return tags;
     }
 

connector/src/main/java/org/geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java

@@ -1,71 +1,71 @@
-/*
+/*
- * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2020 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
- * in the Software without restriction, including without limitation the rights
+ * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
+ * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * furnished to do so, subject to the following conditions:
- *
+ *
- * The above copyright notice and this permission notice shall be included in
+ * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * all copies or substantial portions of the Software.
- *
+ *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * 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
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * THE SOFTWARE.
- *
+ *
- * @author GeyserMC
+ * @author GeyserMC
- * @link https://github.com/GeyserMC/Geyser
+ * @link https://github.com/GeyserMC/Geyser
- */
+ */
-
+
-package org.geysermc.connector.network.translators.world.block.entity;
+package org.geysermc.connector.network.translators.world.block.entity;
-
+
-import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
-import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.CompoundTagBuilder;
-import com.nukkitx.nbt.tag.ByteTag;
+import com.nukkitx.nbt.tag.ByteTag;
-import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.nbt.tag.CompoundTag;
-import com.nukkitx.nbt.tag.FloatTag;
+import com.nukkitx.nbt.tag.FloatTag;
-import com.nukkitx.nbt.tag.Tag;
+import com.nukkitx.nbt.tag.Tag;
-import org.geysermc.connector.network.translators.world.block.BlockStateValues;
+import org.geysermc.connector.network.translators.world.block.BlockStateValues;
-
+
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.List;
+import java.util.List;
-
+
-@BlockEntity(name = "Skull", delay = false, regex = "skull")
+@BlockEntity(name = "Skull", regex = "skull")
-public class SkullBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
+public class SkullBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
-
+
-    @Override
+    @Override
-    public boolean isBlock(BlockState blockState) {
+    public boolean isBlock(BlockState blockState) {
-        return BlockStateValues.getSkullVariant(blockState) != -1;
+        return BlockStateValues.getSkullVariant(blockState) != -1;
-    }
+    }
-
+
-    @Override
+    @Override
-    public List<Tag<?>> translateTag(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag, BlockState blockState) {
+    public List<Tag<?>> translateTag(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag, BlockState blockState) {
-        List<Tag<?>> tags = new ArrayList<>();
+        List<Tag<?>> tags = new ArrayList<>();
-        byte skullVariant = BlockStateValues.getSkullVariant(blockState);
+        byte skullVariant = BlockStateValues.getSkullVariant(blockState);
-        float rotation = BlockStateValues.getSkullRotation(blockState) * 22.5f;
+        float rotation = BlockStateValues.getSkullRotation(blockState) * 22.5f;
-        // Just in case...
+        // Just in case...
-        if (skullVariant == -1) skullVariant = 0;
+        if (skullVariant == -1) skullVariant = 0;
-        tags.add(new FloatTag("Rotation", rotation));
+        tags.add(new FloatTag("Rotation", rotation));
-        tags.add(new ByteTag("SkullType", skullVariant));
+        tags.add(new ByteTag("SkullType", skullVariant));
-        return tags;
+        return tags;
-    }
+    }
-
+
-    @Override
+    @Override
-    public com.github.steveice10.opennbt.tag.builtin.CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+    public com.github.steveice10.opennbt.tag.builtin.CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
-        return null;
+        return null;
-    }
+    }
-
+
-    @Override
+    @Override
-    public CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+    public CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
-        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
-        tagBuilder.floatTag("Rotation", 0);
+        tagBuilder.floatTag("Rotation", 0);
-        tagBuilder.byteTag("SkullType", (byte) 0);
+        tagBuilder.byteTag("SkullType", (byte) 0);
-        return tagBuilder.buildRootTag();
+        return tagBuilder.buildRootTag();
-    }
+    }
-}
+}

connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java

@@ -89,21 +89,12 @@ public class ChunkUtils {
 
                         // Check to see if the name is in BlockTranslator.getBlockEntityString, and therefore must be handled differently
                         if (BlockTranslator.getBlockEntityString(blockState) != null) {
-                            // Get the block entity translator
-                            BlockEntityTranslator blockEntityTranslator = BlockEntityUtils.getBlockEntityTranslator(BlockTranslator.getBlockEntityString(blockState));
                             Position pos = new ChunkPosition(column.getX(), column.getZ()).getBlock(x, (chunkY << 4) + y, z);
                             blockEntityPositions.put(pos, blockState);
-                            // If there is a delay required for the block, allow it.
-                            if (blockEntityTranslator.getClass().getAnnotation(BlockEntity.class).delay()) {
-                                chunkData.loadBlockEntitiesLater.put(blockEntityTranslator.getDefaultBedrockTag(BlockEntityUtils.getBedrockBlockEntityId(BlockTranslator.getBlockEntityString(blockState)),
-                                        pos.getX(), pos.getY(), pos.getZ()), blockState.getId());
-                            } else {
-                                section.getBlockStorageArray()[0].setFullBlock(ChunkSection.blockPosition(x, y, z), id);
-                            }
-                        } else {
-                            section.getBlockStorageArray()[0].setFullBlock(ChunkSection.blockPosition(x, y, z), id);
                         }
 
+                        section.getBlockStorageArray()[0].setFullBlock(ChunkSection.blockPosition(x, y, z), id);
+
                         // Check if block is piston or flower - only block entities in Bedrock
                         if (BlockStateValues.getFlowerPotValues().containsKey(blockState.getId()) ||
                                 BlockStateValues.getPistonValues().containsKey(blockState.getId())) {