diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 8bb1071ae..4cd9c8027 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -7,6 +7,7 @@ import me.modmuss50.jsonDestroyer.api.IOpaqueBlock; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockPlanks; +import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -37,6 +38,7 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO RebornCore.jsonDestroyer.registerObject(this); this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) .withProperty(DECAYABLE, true)); + Blocks.FIRE.setFireInfo(this, 30, 60); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 08be368e7..b0ba76586 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -14,6 +14,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -47,6 +48,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false)); this.setTickRandomly(true); this.setSoundType(SoundType.WOOD); + Blocks.FIRE.setFireInfo(this, 5, 5); } protected BlockStateContainer createBlockState() @@ -89,7 +91,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock } if (state.getValue(HAS_SAP)) { - tempMeta += 3; + tempMeta += 4; } return tempMeta; } diff --git a/src/main/java/techreborn/blocks/BlockRubberPlank.java b/src/main/java/techreborn/blocks/BlockRubberPlank.java index d6401936f..46bb67e14 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlank.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; @@ -23,6 +24,7 @@ public class BlockRubberPlank extends Block implements ITexturedBlock setCreativeTab(TechRebornCreativeTabMisc.instance); this.setHardness(2.0F); this.setSoundType(SoundType.WOOD); + Blocks.FIRE.setFireInfo(this, 5, 20); } @Override diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index f2b5715aa..44362a787 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -430,7 +430,9 @@ public class ModRecipes new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), ticktime, eutick)); RecipeHandler.addRecipe( new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), ticktime, eutick)); - + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Blocks.NETHERRACK), ItemDusts.getDustByName("netherrack"), ticktime, eutick)); + // TechReborn RecipeHandler.addRecipe( new GrinderRecipe(BlockOre2.getOreByName("copper"), ItemDusts.getDustByName("copper", 2), ticktime, eutick)); @@ -3412,9 +3414,9 @@ public class ModRecipes ItemDusts.getDustByName("chrome", 2), ItemCells.getCellByName("silicon", 3), ItemCells.getCellByName("empty", 6), 480, 120)); - RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("empty", 6), null, - ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5), - ItemCells.getCellByName("empty", 1), null, 100, 30)); +// RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("empty", 6), null, +// ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5), +// ItemCells.getCellByName("empty", 1), null, 100, 30)); RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"), ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));