From 474fd7b966141179ab2e36bea33dda128abd840e Mon Sep 17 00:00:00 2001 From: Cricket Date: Wed, 24 Dec 2014 12:31:21 -0500 Subject: [PATCH] Fixed Hardness and recipe bugs --- .../com/cricketcraft/chisel/Crafting.java | 4 ++++ .../chisel/block/BlockCarvable.java | 20 +++++++++---------- .../cricketcraft/chisel/init/ModBlocks.java | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index a52bccde..d0e058d2 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -144,5 +144,9 @@ public class Crafting { GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.present[x]), new Object[]{new ItemStack(Blocks.chest, 1), new ItemStack(Items.dye, 1, x)}); } } + + if(Configurations.featureEnabled("warningSign")){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.sign, 4, 0), new Object[]{"xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign})); + } } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index 38e6b4cd..29869a91 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -1,7 +1,12 @@ package com.cricketcraft.chisel.block; -import java.util.List; - +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,14 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; public class BlockCarvable extends Block implements ICarvable { public CarvableHelper carverHelper; @@ -30,6 +28,8 @@ public class BlockCarvable extends Block implements ICarvable { public BlockCarvable(Material m) { super(m); carverHelper = new CarvableHelper(); + setResistance(10.0F); + setHardness(2.0F); setCreativeTab(ModTabs.tabChiselBlocks); } diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 2e7a955b..a3f96941 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1545,7 +1545,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("warningSign")) { - sign = (BlockCarvable) new BlockCarvable(Material.iron); + sign = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(2.0F).setResistance(10.0F); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.0.desc"), 0, "warning/rad"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.1.desc"), 1, "warning/bio"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.2.desc"), 2, "warning/fire");