Merge remote-tracking branch 'origin/master' into five

EngineHub · Jun 29, 2023 · 72a57dd · 72a57dd
2 parents 5cd0bb1 + 6a10e04
commit 72a57dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/BonemealTerraformer.java b/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/BonemealTerraformer.java
@@ -253,6 +253,8 @@ && isSameSapling(sapling, sapling.getRelative(i1 + 1, 0, j1 + 1))) {
             treeType = TreeType.ACACIA;
         } else if (data == Material.DARK_OAK_SAPLING) {
             treeType = TreeType.DARK_OAK;
+        } else if (data == Material.AZALEA || data == Material.FLOWERING_AZALEA) {
+            treeType = TreeType.AZALEA;
         } else {
             treeType = TreeType.TREE;
             if (random.nextInt(10) == 0) {

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/ItemUtil.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/ItemUtil.java
@@ -545,6 +545,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
             case DEEPSLATE_DIAMOND_ORE:
                 return new ItemStack(Material.DIAMOND);
             case SAND:
+            case RED_SAND:
                 return new ItemStack(Material.GLASS);
             case CLAY_BALL:
                 return new ItemStack(Material.BRICK);
@@ -556,6 +557,8 @@ public static ItemStack getSmeltedResult(ItemStack item) {
                 return new ItemStack(Material.QUARTZ);
             case STONE_BRICKS:
                 return new ItemStack(Material.CRACKED_STONE_BRICKS);
+            case NETHER_BRICKS:
+                return new ItemStack(Material.CRACKED_NETHER_BRICKS);
             case WET_SPONGE:
                 return new ItemStack(Material.SPONGE);
             case WHITE_TERRACOTTA: