Fixed scaffolding issues. Closes #260

TeamMetallurgy · May 22, 2021 · 4eb862d · 4eb862d
1 parent 86cd003
commit 4eb862d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/com/teammetallurgy/atum/init/AtumBlocks.java b/src/main/java/com/teammetallurgy/atum/init/AtumBlocks.java
@@ -553,6 +553,8 @@ public static void setBlockInfo() {
         fire.setFireInfo(PALM_STAIRS, 5, 20);
         fire.setFireInfo(DEADWOOD_STAIRS, 5, 20);
         fire.setFireInfo(EMMER_BLOCK, 60, 20);
+        fire.setFireInfo(PALM_SCAFFOLDING, 60, 60);
+        fire.setFireInfo(DEADWOOD_SCAFFOLDING, 60, 60);
     }
 
     public static StainedGlassBlock createStainedGlassFromColor(DyeColor color) {

diff --git a/src/main/java/com/teammetallurgy/atum/misc/event/FurnaceFuel.java b/src/main/java/com/teammetallurgy/atum/misc/event/FurnaceFuel.java
@@ -3,9 +3,11 @@
 import com.teammetallurgy.atum.Atum;
 import com.teammetallurgy.atum.blocks.linen.LinenBlock;
 import com.teammetallurgy.atum.blocks.linen.LinenCarpetBlock;
+import com.teammetallurgy.atum.blocks.wood.AtumScaffoldingBlock;
 import com.teammetallurgy.atum.init.AtumBlocks;
 import com.teammetallurgy.atum.init.AtumItems;
 import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -17,14 +19,18 @@ public class FurnaceFuel {
     @SubscribeEvent
     public static void fuel(FurnaceFuelBurnTimeEvent event) {
         ItemStack stack = event.getItemStack();
-        if (stack.getItem() == AtumBlocks.DEADWOOD_LADDER.asItem() || stack.getItem() == AtumBlocks.PALM_LADDER.asItem()) {
+        Item item = stack.getItem();
+        Block block = Block.getBlockFromItem(item);
+        if (item == AtumBlocks.DEADWOOD_LADDER.asItem() || item == AtumBlocks.PALM_LADDER.asItem()) {
             event.setBurnTime(300);
-        } else if (Block.getBlockFromItem(stack.getItem()) instanceof LinenBlock && !(Block.getBlockFromItem(stack.getItem()) instanceof LinenCarpetBlock)) {
+        } else if (block instanceof LinenBlock) {
             event.setBurnTime(100);
-        } else if (Block.getBlockFromItem(stack.getItem()) instanceof LinenCarpetBlock) {
+        } else if (block instanceof LinenCarpetBlock) {
             event.setBurnTime(67);
-        } else if (stack.getItem() == AtumItems.PALM_STICK || stack.getItem() == AtumItems.DEADWOOD_STICK) {
+        } else if (item == AtumItems.PALM_STICK || item == AtumItems.DEADWOOD_STICK) {
             event.setBurnTime(100);
+        } else if (block instanceof AtumScaffoldingBlock) {
+            event.setBurnTime(400);
         }
     }
 }
diff --git a/src/main/resources/data/minecraft/tags/blocks/climbable.json b/src/main/resources/data/minecraft/tags/blocks/climbable.json
@@ -4,6 +4,8 @@
     "atum:palm_ladder",
     "atum:deadwood_ladder",
     "atum:bone_ladder",
-    "atum:ophidian_tongue"
+    "atum:ophidian_tongue",
+    "atum:palm_scaffolding",
+    "atum:deadwood_scaffolding"
   ]
 }