diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 415eeb4d..f8ff591c 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2454,6 +2454,21 @@ public enum Features { } }, + VALENTINES { + @Override void addBlocks() { + BlockCarvable valentines = (BlockCarvable) new BlockCarvable(Material.wood).setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2F) + .setResistance(10F); + valentines.carverHelper.addVariation("tile.valentines.0.desc", 0, "valentines/bricks"); + valentines.carverHelper.addVariation("tile.valentines.1.desc", 1, "valentines/companion"); + valentines.carverHelper.registerAll(valentines, "valentines"); + Carving.chisel.registerOre("valentines", "blockValentines"); + } + + @Override void addRecipes() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.valentines, 8, 0), "***", "*X*", "***", '*', "stone", 'X', new ItemStack(Items.dye, 1, 9))); + } + }, + VOIDSTONE { @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 49d0e78a..808de56b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -1,40 +1,9 @@ package com.cricketcraft.chisel.init; -import net.minecraft.block.Block; - import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.block.BlockCarvableGlass; -import com.cricketcraft.chisel.block.BlockCarvableGlowstone; -import com.cricketcraft.chisel.block.BlockCarvableIce; -import com.cricketcraft.chisel.block.BlockCarvableIcePillar; -import com.cricketcraft.chisel.block.BlockCarvableIceStairs; -import com.cricketcraft.chisel.block.BlockCarvableLayered; -import com.cricketcraft.chisel.block.BlockCarvablePackedIce; -import com.cricketcraft.chisel.block.BlockCarvablePackedIcePillar; -import com.cricketcraft.chisel.block.BlockCarvablePackedIceStairs; -import com.cricketcraft.chisel.block.BlockCarvablePane; -import com.cricketcraft.chisel.block.BlockCarvablePillar; -import com.cricketcraft.chisel.block.BlockCarvablePowered; -import com.cricketcraft.chisel.block.BlockCarvablePumpkin; -import com.cricketcraft.chisel.block.BlockCarvableSlab; -import com.cricketcraft.chisel.block.BlockCarvableStairs; -import com.cricketcraft.chisel.block.BlockCarvableTorch; -import com.cricketcraft.chisel.block.BlockCloud; -import com.cricketcraft.chisel.block.BlockConcrete; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.block.BlockLavastone; -import com.cricketcraft.chisel.block.BlockMarbleCarpet; -import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; -import com.cricketcraft.chisel.block.BlockMarbleWall; -import com.cricketcraft.chisel.block.BlockPresent; -import com.cricketcraft.chisel.block.BlockRoadLine; -import com.cricketcraft.chisel.block.BlockSnakestone; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.block.BlockWaterstone; - +import com.cricketcraft.chisel.block.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraft.block.Block; @ObjectHolder(Chisel.MOD_ID) public final class ChiselBlocks { @@ -122,6 +91,8 @@ public final class ChiselBlocks { public static final BlockCarvable bloodRune = null; public static final BlockCarvable bloodBrick = null; + // Holidays + public static final BlockCarvable valentines = null; public static final BlockPresent present = null; // Arrays can't be final because of how @ObjectHolder works diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 782950ee..c7265062 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -29,6 +29,11 @@ item.upgrade_stack.desc=Allows it to manufacture stacks at a time #Chisel 2 +#Valentines +tile.chisel.valentines.name=Valentines Block +tile.valentines.0.desc=Valentines Bricks +tile.valentines.1.desc=If it speaks, I wouldn't touch it + #AntiBlocks tile.chisel.antiBlock.name=Anti Block tile.antiBlock.black.desc=Black Anti Block diff --git a/src/main/resources/assets/chisel/textures/blocks/valentines/bricks.png b/src/main/resources/assets/chisel/textures/blocks/valentines/bricks.png new file mode 100644 index 00000000..57f3a838 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/valentines/bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/valentines/companion.png b/src/main/resources/assets/chisel/textures/blocks/valentines/companion.png new file mode 100644 index 00000000..d322a1b9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/valentines/companion.png differ