Fix campfires

connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java

@@ -45,10 +45,7 @@ import com.nukkitx.protocol.bedrock.packet.*;
 import lombok.Getter;
 import org.geysermc.connector.network.translators.bedrock.*;
 import org.geysermc.connector.network.translators.block.BlockTranslator;
-import org.geysermc.connector.network.translators.block.entity.BlockEntityTranslator;
+import org.geysermc.connector.network.translators.block.entity.*;
-import org.geysermc.connector.network.translators.block.entity.ContainerBlockEntityTranslator;
-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.GenericInventoryTranslator;
 import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
 import org.geysermc.connector.network.translators.item.ItemTranslator;
@@ -177,7 +174,7 @@ public class TranslatorsInit {
     private static void registerBlockEntityTranslators() {
         blockEntityTranslators.put("Empty", new EmptyBlockEntityTranslator("empty", "Empty"));
         blockEntityTranslators.put("Sign", new SignBlockEntityTranslator("minecraft:sign", "Sign"));
-        blockEntityTranslators.put("Campfire", new ContainerBlockEntityTranslator("minecraft:campfire", "Campfire"));
+        blockEntityTranslators.put("Campfire", new CampfireBlockEntityTranslator("minecraft:campfire", "Campfire"));
     }
 
     private static void registerInventoryTranslators() {

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

@@ -0,0 +1,76 @@
+/*
+ * 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.network.translators.block.entity;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.Tag;
+
+import org.geysermc.connector.network.translators.TranslatorsInit;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CampfireBlockEntityTranslator extends BlockEntityTranslator {
+
+    public CampfireBlockEntityTranslator(String javaId, String bedrockId) {
+        super(javaId, bedrockId);
+    }
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag) {
+        List<Tag<?>> tags = new ArrayList<>();
+        ListTag items = tag.get("Items");
+        int i = 1;
+        for (com.github.steveice10.opennbt.tag.builtin.Tag itemTag : items.getValue()) {
+            tags.add(getItem((CompoundTag) itemTag).toBuilder().build("Item" + i));
+            i++;
+        }
+        return tags;
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(int x, int y, int z) {
+        return null;
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(int x, int y, int z) {
+        return null;
+    }
+
+    protected com.nukkitx.nbt.tag.CompoundTag getItem(CompoundTag tag) {
+        ItemEntry entry = TranslatorsInit.getItemTranslator().getItemEntry((String) tag.get("id").getValue());
+        CompoundTagBuilder tagBuilder = CompoundTagBuilder.builder()
+                .shortTag("id", (short) entry.getBedrockId())
+                .byteTag("Count", (byte) tag.get("Count").getValue())
+                .shortTag("Damage", (short) entry.getBedrockData())
+                .tag(CompoundTagBuilder.builder().build("tag"));
+        return tagBuilder.buildRootTag();
+    }
+}

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

@@ -28,14 +28,12 @@ package org.geysermc.connector.network.translators.block.entity;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.nukkitx.nbt.CompoundTagBuilder;
-import com.nukkitx.nbt.tag.IntArrayTag;
 import com.nukkitx.nbt.tag.Tag;
 
 import org.geysermc.connector.network.translators.TranslatorsInit;
 import org.geysermc.connector.network.translators.item.ItemEntry;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class ContainerBlockEntityTranslator extends BlockEntityTranslator {
@@ -53,15 +51,9 @@ public class ContainerBlockEntityTranslator extends BlockEntityTranslator {
             tagsList.add(getItem((CompoundTag) itemTag));
         }
 
-        int[] fakeCookingTime = new int[4];
-        Arrays.fill(fakeCookingTime, 3);
-
         com.nukkitx.nbt.tag.ListTag<com.nukkitx.nbt.tag.CompoundTag> bedrockItems =
                 new com.nukkitx.nbt.tag.ListTag<>("Items", com.nukkitx.nbt.tag.CompoundTag.class, tagsList);
         tags.add(bedrockItems);
-
-        tags.add(new IntArrayTag("CookingTimes", fakeCookingTime));
-        tags.add(new IntArrayTag("CookingTotalTimes", fakeCookingTime));
         return tags;
     }