adapt: endstone recipes

PowerNukkitX · Jul 14, 2024 · 7d38ba1 · 7d38ba1
1 parent 2529637
commit 7d38ba1
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 158 deletions.
diff --git a/src/main/java/cn/nukkit/block/BlockChest.java b/src/main/java/cn/nukkit/block/BlockChest.java
@@ -271,10 +271,15 @@ public boolean canBePulled() {
     }
 
     /**
-     * TODO: 大箱子在PNX不能推动
+     * TODO: Double chests cannot be moved
      */
     protected boolean canMove() {
         var blockEntity = this.getBlockEntity();
         return blockEntity == null || !blockEntity.isPaired();
     }
+
+    @Override
+    public Item[] getDrops(Item item) {
+        return new Item[]{toItem()};
+    }
 }
diff --git a/src/main/java/cn/nukkit/item/Item.java b/src/main/java/cn/nukkit/item/Item.java
@@ -757,7 +757,11 @@ public static CompoundTag parseCompoundTag(byte[] tag) {
         try {
             return NBTIO.read(tag, ByteOrder.LITTLE_ENDIAN);
         } catch (IOException e) {
-            throw new UncheckedIOException(e);
+            try {
+                return NBTIO.read(tag, ByteOrder.BIG_ENDIAN);
+            } catch (IOException ee) {
+                throw new UncheckedIOException(ee);
+            }
         }
     }
 
@@ -766,7 +770,7 @@ public byte[] writeCompoundTag(CompoundTag tag) {
             return EmptyArrays.EMPTY_BYTES;
         }
         try {
-            return NBTIO.write(tag, ByteOrder.LITTLE_ENDIAN);
+            return NBTIO.write(tag, ByteOrder.BIG_ENDIAN);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }

diff --git a/src/main/java/cn/nukkit/recipe/BlastFurnaceRecipe.java b/src/main/java/cn/nukkit/recipe/BlastFurnaceRecipe.java
@@ -28,8 +28,6 @@ public boolean match(Input input) {
 
     @Override
     public RecipeType getType() {
-        if (this.getInput() instanceof DefaultDescriptor des) {
-            return des.getItem().hasMeta() ? RecipeType.BLAST_FURNACE_DATA : RecipeType.BLAST_FURNACE;
-        } else return RecipeType.BLAST_FURNACE;
+        return RecipeType.BLAST_FURNACE;
     }
 }
diff --git a/src/main/java/cn/nukkit/recipe/CampfireRecipe.java b/src/main/java/cn/nukkit/recipe/CampfireRecipe.java
@@ -28,6 +28,6 @@ public boolean match(Input input) {
 
     @Override
     public RecipeType getType() {
-        return this.getInput().toItem().hasMeta() ? RecipeType.CAMPFIRE_DATA : RecipeType.CAMPFIRE;
+        return RecipeType.CAMPFIRE;
     }
 }
diff --git a/src/main/java/cn/nukkit/recipe/FurnaceRecipe.java b/src/main/java/cn/nukkit/recipe/FurnaceRecipe.java
@@ -31,6 +31,6 @@ public boolean match(Input input) {
 
     @Override
     public RecipeType getType() {
-        return this.getInput().toItem().hasMeta() ? RecipeType.FURNACE_DATA : RecipeType.FURNACE;
+        return RecipeType.FURNACE;
     }
 }
diff --git a/src/main/java/cn/nukkit/recipe/SmokerRecipe.java b/src/main/java/cn/nukkit/recipe/SmokerRecipe.java
@@ -29,6 +29,6 @@ public boolean match(Input input) {
 
     @Override
     public RecipeType getType() {
-        return this.getResult().hasMeta() ? RecipeType.SMOKER_DATA : RecipeType.SMOKER;
+        return RecipeType.SMOKER;
     }
 }
diff --git a/src/main/java/cn/nukkit/recipe/SoulCampfireRecipe.java b/src/main/java/cn/nukkit/recipe/SoulCampfireRecipe.java
@@ -20,6 +20,6 @@ public SoulCampfireRecipe(String recipeId, Item result, Item ingredient) {
 
     @Override
     public RecipeType getType() {
-        return this.getInput().toItem().hasMeta() ? RecipeType.SOUL_CAMPFIRE_DATA : RecipeType.SOUL_CAMPFIRE;
+        return RecipeType.SOUL_CAMPFIRE;
     }
 }
diff --git a/src/main/java/cn/nukkit/registry/RecipeRegistry.java b/src/main/java/cn/nukkit/registry/RecipeRegistry.java