From cdbe10b7d9261cf014b001da24fd97edf3349b66 Mon Sep 17 00:00:00 2001 From: TheCricket Date: Sun, 30 Nov 2014 18:02:58 -0500 Subject: [PATCH] Added Waterstone --- .../info/jbcs/minecraft/chisel/Crafting.java | 28 ++++++++----------- .../chisel/block/BlockWaterstone.java | 15 ++++++++++ .../jbcs/minecraft/chisel/init/ModBlocks.java | 17 ++++++++++- .../resources/assets/chisel/lang/en_US.lang | 10 +++++++ 4 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index f19ef538..b194cc22 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -12,20 +12,17 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -public class Crafting -{ +public class Crafting { - public static void init() - { + public static void init() { Block concreteRecipeBlock = Block.getBlockFromName(Configurations.config.get("tweaks", "concrete recipe block", "gravel", "Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)").getString()); - if(concreteRecipeBlock == null) concreteRecipeBlock = Blocks.gravel; + if (concreteRecipeBlock == null) concreteRecipeBlock = Blocks.gravel; FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ModBlocks.concrete), 0.1F); GameRegistry.addRecipe(new ItemStack(ModBlocks.sandstoneScribbles, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 8),}); - for(int meta = 0; meta < 16; meta++) - { + for (int meta = 0; meta < 16; meta++) { GameRegistry.addRecipe(new ItemStack(ModBlocks.marbleSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.marble, 1, meta)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.limestoneSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.limestone, 1, meta)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillarSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.marblePillar, 1, meta)}); @@ -51,24 +48,24 @@ public class Crafting GameRegistry.addRecipe(new ItemStack(ModBlocks.holystone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.lavastone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.waterstone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.water_bucket, 1)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.fantasy, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.tyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.temple, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4)}); GameRegistry.addRecipe(new ItemStack(ModBlocks.factory, 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(ModBlocks.voidstone, 8, 1), new Object[]{"xxx", "xyx", "xxx", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_pearl, 1)}); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.roadLine, 8, 0), new Object[]{"wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone})); - if(Configurations.chiselRecipe) - { + if (Configurations.chiselRecipe) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot})); - } else - { + } else { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot})); } - if(Configurations.featureEnabled("ballOfMoss")) + if (Configurations.featureEnabled("ballOfMoss")) GameRegistry.addRecipe(new ItemStack(ModItems.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick}); - if(Configurations.featureEnabled("cloud")) + if (Configurations.featureEnabled("cloud")) GameRegistry.addRecipe(new ItemStack(ModItems.itemCloudInABottle, 1), new Object[]{"X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz}); if (Configurations.featureEnabled("smashingrock")) GameRegistry.addShapelessRecipe(new ItemStack(ModItems.smashingRock, 16), new Object[]{new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1), new ItemStack(Items.stone_shovel)}); @@ -82,8 +79,7 @@ public class Crafting "Brown", "Green", "Red", "Black" }; - for(int i = 0; i < 16; i++) - { + for (int i = 0; i < 16; i++) { OreDictionary.registerOre("stainedClay" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.stained_hardened_clay, 1, i)); OreDictionary.registerOre("blockWool" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, i)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.woolenClay, 2, i), new Object[]{"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")})); @@ -91,6 +87,6 @@ public class Crafting GameRegistry.addRecipe(new ItemStack(ModBlocks.laboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.autoChisel, 1),new Object[]{"XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'), ModItems.chisel})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.autoChisel, 1), new Object[]{"XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'), ModItems.chisel})); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java new file mode 100644 index 00000000..58bee7dd --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java @@ -0,0 +1,15 @@ +package info.jbcs.minecraft.chisel.block; + +import net.minecraft.block.material.Material; + +public class BlockWaterstone extends BlockMarbleTexturedOre { + public BlockWaterstone(Material mat, String baseIcon) { + super(mat, baseIcon); + } + + + @Override + public boolean renderAsNormalBlock() { + return true; + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java index b8e59df9..02d332ce 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -52,6 +52,7 @@ public class ModBlocks { public static BlockCarvablePowered redstone; public static BlockHolystone holystone; public static BlockLavastone lavastone; + public static BlockWaterstone waterstone; public static BlockCarvable leaf; public static BlockCarvable fantasy; public static BlockCarvable carpet; @@ -1312,7 +1313,7 @@ public class ModBlocks { //TODO: will be done at winter time present = (BlockPresent) new BlockPresent().setHardness(2.5F).setStepSound(Block.soundTypeWood); Carving.chisel.addVariation("chest", Blocks.chest, 0, 0); - present.carverHelper.addVariation(StatCollector.translateToLocal("tile.presetnt.1.desc"), 1, present, 1); + present.carverHelper.addVariation(StatCollector.translateToLocal("tile.present.1.desc"), 1, present, 1); present.carverHelper.register(present, "present"); Carving.chisel.registerOre("chest", "chest"); } @@ -1337,5 +1338,19 @@ public class ModBlocks { voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar"); Carving.chisel.registerOre("voidstonePillar", "voidstonePillar"); } + + if (Configurations.featureEnabled("waterstone")) { + waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_flow").setHardness(2.0F).setResistance(10.0F); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.0.desc"), 0, "waterstone/cobble"); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.1.desc"), 1, "waterstone/black"); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.2.desc"), 2, "waterstone/tiles"); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.3.desc"), 3, "waterstone/chaotic"); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.4.desc"), 4, "waterstone/creeper"); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.5.desc"), 5, "waterstone/panel"); + waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.6.desc"), 6, "waterstone/panel-ornate"); + waterstone.carverHelper.register(waterstone, "waterstone"); + OreDictionary.registerOre("blockWaterstone", new ItemStack(waterstone, 1, OreDictionary.WILDCARD_VALUE)); + Carving.chisel.registerOre("waterstone", "blockWaterstone"); + } } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 447e1a01..792cc121 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -38,6 +38,16 @@ tile.voidstone.15.desc=Beveled void stone tile.voidstonePillar.name=Void Stone Pillar tile.voidstonePillar.0.desc=Striped Void Stone Pillar +#Waterstone +tile.waterstone.name=Waterstone +tile.waterstone.0.desc=Waterstone bricks +tile.waterstone.1.desc=Black waterstone +tile.waterstone.2.desc=Waterstone tiles +tile.waterstone.3.desc=Chaotic waterstone bricks +tile.waterstone.4.desc=Water creeper in tiles +tile.waterstone.5.desc=Water panel +tile.waterstone.6.desc=Ornate water panel + #Chisel 1 #Cobblestone Blocks