From 98a2614b7cf97cd66a3e045fb7095baa0b0b4720 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 29 Jul 2015 12:45:29 -0700 Subject: [PATCH] Added crafting/chiseling for 1.9 content; Will work on new variations for these --- .../com/cricketcraft/chisel/Features.java | 42 +++++++++++++----- .../chisel/init/ChiselBlocks.java | 3 ++ .../resources/assets/chisel/lang/en_US.lang | 2 +- .../{MegaCell-bot.png => MegaCell-bottom.png} | Bin 4 files changed, 34 insertions(+), 13 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/technical/new/{MegaCell-bot.png => MegaCell-bottom.png} (100%) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 2dc3b748..380ee68d 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -136,7 +136,7 @@ public enum Features { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, 15), "SSS", "SGS", "SSS", 'S', "stone", 'G', "dustGlowstone")); } GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, meta), "BBB", "BdB", "BBB", - 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); + 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -622,10 +622,11 @@ public enum Features { @Override void addBlocks() { - //BlockCarvable end_stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - Carving.chisel.addVariation("end_stone", Blocks.end_stone , 0, 0); - //end_stone.carverHelper.registerAll(emerald_block, "endStone"); - Carving.chisel.registerOre("end_stone", "end_stone"); + BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + Carving.chisel.addVariation("end_Stone", Blocks.end_stone , 0, -1); + end_Stone.carverHelper.addVariation("tile.endstone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); + Carving.chisel.registerOre("end_Stone", "end_Stone"); } }, @@ -667,8 +668,8 @@ public enum Features { @Override void addRecipes() { - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', - new ItemStack(Items.iron_ingot, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', + new ItemStack(Items.iron_ingot, 1)}); } }, @@ -1794,11 +1795,11 @@ public enum Features { makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.15.desc", 15, "ice/poison"); makerPackedIceStairs.create(new IStairsCreator() { - @Override - public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { - return new BlockCarvablePackedIceStairs(block, meta, helper); - } - }, "packedice_stairs", ChiselBlocks.packediceStairs); + @Override + public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { + return new BlockCarvablePackedIceStairs(block, meta, helper); + } + }, "packedice_stairs", ChiselBlocks.packediceStairs); Carving.chisel.registerOre("packedice_stairs", "packedIceStairs"); } }, @@ -1894,6 +1895,23 @@ public enum Features { } }, + PURPUR { + @Override + void addBlocks() { + BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + purpur.carverHelper.addVariation("tile.purpur.0.desc", 0, "end_purpur/purpur_block"); + purpur.carverHelper.addVariation("tile.purpur.1.desc", 1, "end_purpur/purpur_pillar"); + + purpur.carverHelper.registerAll(purpur, "purpur"); + Carving.chisel.registerOre("purpur", "purpur"); + } + + @Override + void addRecipes() { + GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.purpur), new ItemStack(Item.getItemFromBlock(Blocks.end_stone), 1), new ItemStack(Items.dye, 1, 5)); + } + }, + QUARTZ { @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index ead9941b..f44edadb 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -128,6 +128,9 @@ public final class ChiselBlocks { public static final BlockCarvable diorite = null; public static final BlockCarvable andesite = null; + // 1.9... drull pls + public static final BlockCarvable purpur = null; + private ChiselBlocks() { } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6991f882..90a98cfb 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -351,7 +351,7 @@ tile.technical3.1.desc=Industrial Armor Plating tile.technical4.0.desc=Corroded Metal Chunks tile.technical4.1.desc=Rusted Metal Chunks tile.technical4.2.desc=Sturdy -tile.technical4.3.desc=MegaCell© +tile.technical4.3.desc=MegaCell™ Battery tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Tape Drive? (I'm too young for this.) diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png rename to src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png