From 530239fd7254fde71c13e1f149fa47efcf575b02 Mon Sep 17 00:00:00 2001 From: Cricket Date: Thu, 19 Feb 2015 17:13:16 -0500 Subject: [PATCH] Dev stuff is complete --- .../com/cricketcraft/chisel/Features.java | 527 +++++------------- .../chisel/client/GeneralChiselClient.java | 13 +- .../chisel/client/player/PlayerSpecials.java | 80 ++- .../chisel/config/Configurations.java | 24 +- .../chisel/entity/fx/EntityCricketFX.java | 106 ---- .../cricketcraft/chisel/init/ChiselItems.java | 2 +- .../chisel/item/chisel/ItemChisel.java | 32 +- .../chisel/proxy/ClientProxy.java | 4 + .../resources/assets/chisel/lang/en_US.lang | 1 + 9 files changed, 259 insertions(+), 530 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/chisel/entity/fx/EntityCricketFX.java diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index ab5452fe..09f51489 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -40,9 +40,7 @@ import static com.cricketcraft.chisel.utils.General.sGNames; public enum Features { AE_CERTUS_QUARTZ("appliedenergistics2") { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0, 0); Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzPillar"), 0, 1); Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzChiseled"), 0, 2); @@ -51,9 +49,7 @@ public enum Features { }, AE_SKY_STONE("appliedenergistics2") { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 1, 0); Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 2, 1); Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 3, 2); @@ -62,9 +58,7 @@ public enum Features { }, AMBER("Thaumcraft") { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable amber = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 0, 0); Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 1, 1); @@ -74,9 +68,7 @@ public enum Features { }, ANDESITE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); andesite.carverHelper.setChiselBlockName("andesite"); andesite.carverHelper.addVariation("tile.andesite.0.desc", 0, "andesite/andesite"); @@ -88,9 +80,7 @@ public enum Features { }, ANTIBLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable antiBlock = (BlockCarvable) new BlockCarvableAntiBlock().setCreativeTab(ChiselTabs.tabOtherChiselBlocks); antiBlock.carverHelper.setChiselBlockName("Anti Block"); antiBlock.carverHelper.forbidChiseling = true; @@ -103,8 +93,7 @@ public enum Features { OreDictionary.registerOre("antiBlock", antiBlock); } - @Override - void addRecipes() { + @Override void addRecipes() { if (meta == 0) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, 15), "SSS", "SGS", "SSS", 'S', "stone", 'G', "dustGlowstone")); } @@ -112,16 +101,13 @@ public enum Features { 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); } - @Override - boolean needsMetaRecipes() { + @Override boolean needsMetaRecipes() { return true; } }, ARCANE("Thaumcraft") { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable arcane = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); @@ -139,30 +125,24 @@ public enum Features { }, AUTO_CHISEL { - - @Override - void addBlocks() { + @Override void addBlocks() { Block autoChisel = new BlockAutoChisel().setBlockTextureName(Chisel.MOD_ID + ":autoChisel/autoChisel").setCreativeTab(ChiselTabs.tabChisel).setBlockName("autoChisel"); GameRegistry.registerBlock(autoChisel, "autoChisel"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.autoChisel, 1), new Object[] { "XXX", " Y ", "YYY", Character.valueOf('X'), Blocks.stone_slab, Character.valueOf('Y'), "ingotIron" })); } }, AUTO_CHISEL_UPGRADES(AUTO_CHISEL) { - - @Override - void addItems() { + @Override void addItems() { ItemUpgrade upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ChiselTabs.tabChisel); GameRegistry.registerItem(upgrade, "upgrade"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.upgrade, 1, 0), new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', Items.redstone, 'U', Items.sugar })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.upgrade, 1, 1), new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', Items.redstone, 'U', @@ -173,24 +153,19 @@ public enum Features { }, BALL_OF_MOSS { - - @Override - void addItems() { + @Override void addItems() { ItemBallOMoss ballomoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(ChiselTabs.tabChisel); EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true); GameRegistry.registerItem(ballomoss, "ballomoss"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselItems.ballomoss, 1), "XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick); } }, BLOOD_RUNE("AWWayofTime") { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayofTime", "AlchemicalWizardrybloodRune"), 0, 0); bloodRune.carverHelper.addVariation("tile.bloodRune.0.desc", 0, "bloodMagic/bloodRuneArranged"); @@ -205,9 +180,7 @@ public enum Features { }, BLOOD_BLOCK("AWWayofTime") { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable bloodBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "largeBloodStoneBrick"), 0, 0); Carving.chisel.addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "bloodStoneBrick"), 0, 1); @@ -217,9 +190,7 @@ public enum Features { }, BOOKSHELF { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable bookshelf = (BlockCarvable) new BlockCarvableBookshelf().setHardness(1.5F).setCreativeTab(ChiselTabs.tabWoodChiselBlocks).setStepSound(Block.soundTypeWood); Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); bookshelf.carverHelper.addVariation("tile.bookshelf.1.desc", 1, "bookshelf/rainbow"); @@ -237,9 +208,7 @@ public enum Features { }, BRICK_CUSTOM { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable brickCustom = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); Carving.chisel.addVariation("brickCustom", Blocks.brick_block, 0, 0); brickCustom.carverHelper.addVariation("tile.brickCustom.1.desc", 1, "brickCustom/large"); @@ -255,9 +224,7 @@ public enum Features { }, CARPET { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable carpet_block = (BlockCarvable) new BlockCarvable(Material.cloth).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Block.soundTypeCloth); carpet_block.carverHelper.setChiselBlockName("Carpet Block"); @@ -282,21 +249,17 @@ public enum Features { OreDictionary.registerOre("blockCarpet", carpet_block); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.carpet_block, 8, meta), "YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta)); } - @Override - boolean needsMetaRecipes() { + @Override boolean needsMetaRecipes() { return true; } }, CARPET_FLOOR { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockMarbleCarpet carpet = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Block.soundTypeCloth); carpet.carverHelper.setChiselBlockName("Carpet"); @@ -331,43 +294,40 @@ public enum Features { OreDictionary.registerOre("carpet", carpet); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.carpet, 3, meta), "XX", 'X', new ItemStack(ChiselBlocks.carpet_block, 1, meta)); } - @Override - boolean needsMetaRecipes() { + @Override boolean needsMetaRecipes() { return true; } }, CHISEL { - - @Override - void addItems() { + @Override void addItems() { ItemChisel chisel = (ItemChisel) new ItemChisel(ChiselType.IRON).setCreativeTab(ChiselTabs.tabChisel); ItemChisel diamondChisel = (ItemChisel) new ItemChisel(ChiselType.DIAMOND).setCreativeTab(ChiselTabs.tabChisel); + ItemChisel obsidianChisel = (ItemChisel) new ItemChisel(ChiselType.OBSIDIAN).setCreativeTab(ChiselTabs.tabChisel); GameRegistry.registerItem(chisel, "chisel"); GameRegistry.registerItem(diamondChisel, "diamondChisel"); + GameRegistry.registerItem(obsidianChisel, "obsidianChisel"); } - @Override - void addRecipes() { + @Override void addRecipes() { if (Configurations.chiselRecipe) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel), " YY", " YY", "X ", 'X', "stickWood", 'Y', "ingotIron")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.diamondChisel), " YY", " YY", "x ", 'x', "stickWood", 'Y', "gemDiamond")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.obsidianChisel), " YY", " YY", "x ", 'x', "stickWood", 'Y', Blocks.obsidian)); } else { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel), " Y", "X ", 'X', "stickWood", 'Y', "ingotIron")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.diamondChisel), " Y", "X ", 'X', "stickWood", 'Y', "gemDiamond")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.obsidianChisel), " Y", "X ", 'X', "stickWood", 'Y', Blocks.obsidian)); } } }, CLOUD { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable cloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightOpacity(3).setStepSound(Block.soundTypeCloth); cloud.carverHelper.addVariation("tile.cloud.0.desc", 0, "cloud/cloud"); cloud.carverHelper.addVariation("tile.cloud.1.desc", 1, "cloud/large"); @@ -379,23 +339,19 @@ public enum Features { Carving.chisel.registerOre("cloud", "cloud"); } - @Override - void addItems() { + @Override void addItems() { ItemCloudInABottle itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ChiselTabs.tabChisel); EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true); GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselItems.cloudinabottle, 1), "X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz); } }, COBBLESTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable cobblestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("cobblestone", Blocks.cobblestone, 0, 0); @@ -420,9 +376,7 @@ public enum Features { }, COBBLESTONE_MOSSY { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable mossy_cobblestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F) .setStepSound(Block.soundTypeStone); @@ -448,9 +402,7 @@ public enum Features { }, CONCRETE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable concrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F); concrete.carverHelper.addVariation("tile.concrete.0.desc", 0, "concrete/default"); concrete.carverHelper.addVariation("tile.concrete.1.desc", 1, "concrete/block"); @@ -468,8 +420,7 @@ public enum Features { Carving.chisel.registerOre("concrete", "concrete"); } - @Override - void addRecipes() { + @Override void addRecipes() { 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) @@ -479,20 +430,15 @@ public enum Features { } }, - COPPER - { - - @Override - void addBlocks() { + COPPER { + @Override void addBlocks() { Carving.chisel.addGroup(new CarvingGroup("copperblock")); Carving.chisel.registerOre("copperblock", "blockCopper"); } }, DIAMOND_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable diamond_block = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); @@ -514,9 +460,7 @@ public enum Features { }, DIORITE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable diorite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); diorite.carverHelper.setChiselBlockName("diorite"); diorite.carverHelper.addVariation("tile.diorite.0.desc", 0, "diorite/diorite"); @@ -528,9 +472,7 @@ public enum Features { }, DIRT { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable dirt = (BlockCarvable) new BlockCarvable(Material.ground).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setStepSound(Block.soundTypeGravel) .setBlockName("dirt.default"); Carving.chisel.addVariation("dirt", Blocks.dirt, 0, 0); @@ -557,9 +499,7 @@ public enum Features { }, EMERALD_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable emerald_block = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F) .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); @@ -580,9 +520,7 @@ public enum Features { }, FACTORY { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable factoryblock = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Chisel.soundMetalFootstep); factoryblock.carverHelper.setChiselBlockName("factoryblock"); @@ -606,17 +544,14 @@ public enum Features { Carving.chisel.registerOre("factoryblock", "factoryblock"); } - @Override - void addRecipes() { + @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) }); } }, FANTASY { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable fantasyblock = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); fantasyblock.carverHelper.setChiselBlockName("Fantasy Block"); fantasyblock.carverHelper.addVariation("tile.fantasyblock.0.desc", 0, "fantasy/brick"); @@ -659,18 +594,15 @@ public enum Features { Carving.chisel.registerOre("fantasyblock2", "fantasy2"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.fantasyblock, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.fantasyblock2, 8, 0), "***", "*X*", "***", '*', new ItemStack(ChiselBlocks.fantasyblock, 1), 'X', "dyeWhite")); } }, FUTURA { - // TODO Overlay is WIP - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock/* * , "futura/screenOverlay-ctm" */).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); @@ -682,16 +614,13 @@ public enum Features { Carving.chisel.registerOre("futura", "futura"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.futura, 8, 0), "SBS", "BGB", "SBS", 'S', "stone", 'G', "dustRedstone", 'B', new ItemStack(Blocks.stonebrick, 1))); } }, GLASS { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvableGlass glass = (BlockCarvableGlass) new BlockCarvableGlass().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); glass.carverHelper.addVariation("tile.glass.1.desc", 1, "glass/terrain-glassbubble"); @@ -715,9 +644,7 @@ public enum Features { }, GLASS_PANE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvablePane glass_pane = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F) .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass_pane", Blocks.glass_pane, 0, 0); @@ -735,9 +662,7 @@ public enum Features { }, GLASS_STAINED { - - @Override - void addBlocks() { + @Override void addBlocks() { for (int i = 0; i < 16; i++) { final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "").toLowerCase(); String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); @@ -765,9 +690,7 @@ public enum Features { }, GLASS_STAINED_PANE { - - @Override - void addBlocks() { + @Override void addBlocks() { for (int i = 0; i < 16; i++) { final String blockName = "stained_glass_pane_" + sGNames[i].replaceAll(" ", "").toLowerCase(); String oreName = "stainedGlassPane" + sGNames[i].replaceAll(" ", ""); @@ -799,9 +722,7 @@ public enum Features { }, GLOWSTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvableGlowstone glowstone = (BlockCarvableGlowstone) new BlockCarvableGlowstone().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F) .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); @@ -826,9 +747,7 @@ public enum Features { }, GOLD_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable gold_block = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); gold_block.carverHelper.addVariation("tile.gold.1.desc", 1, "gold/terrain-gold-largeingot"); @@ -851,9 +770,7 @@ public enum Features { }, GRANITE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable granite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); granite.carverHelper.setChiselBlockName("granite"); granite.carverHelper.addVariation("tile.granite.0.desc", 0, "granite/granite"); @@ -865,9 +782,7 @@ public enum Features { }, GRIMSTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable grimstone = (BlockGrimstone) new BlockGrimstone(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); grimstone.carverHelper.addVariation("tile.grimstone.0.desc", 0, "grimstone/grimstone"); grimstone.carverHelper.addVariation("tile.grimstone.1.desc", 1, "grimstone/smooth"); @@ -888,16 +803,13 @@ public enum Features { Carving.chisel.registerOre("grimstone", "grimstone"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.grimstone, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.coal, 1)); } }, HEX_PLATING { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("hexPlating/hexAnim").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); @@ -906,16 +818,13 @@ public enum Features { Carving.chisel.registerOre("hexPlating", "hexPlating"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.hexPlating, 8, 0), "XXX", "XYX", "XXX", 'X', "stone", 'Y', "blockCoal")); } }, HOLYSTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable holystone = (BlockHolystone) new BlockHolystone(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Chisel.soundHolystoneFootstep); holystone.carverHelper.addVariation("tile.holystone.0.desc", 0, "holystone/holystone"); @@ -937,16 +846,13 @@ public enum Features { Carving.chisel.registerOre("holystone", "holystone"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.holystone, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1)); } }, ICE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvableIce ice = (BlockCarvableIce) new BlockCarvableIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); ice.carverHelper.addVariation("tile.ice.1.desc", 1, "ice/a1-ice-light"); @@ -968,16 +874,13 @@ public enum Features { Carving.chisel.registerOre("ice", "ice"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice, 4, 1), "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice_pillar, 1, OreDictionary.WILDCARD_VALUE)); } }, ICE_PILLAR(ICE) { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvableIcePillar ice_pillar = (BlockCarvableIcePillar) new BlockCarvableIcePillar(Material.ice).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) .setStepSound(Block.soundTypeGlass); ice_pillar.carverHelper.setChiselBlockName("Ice Pillar"); @@ -991,16 +894,13 @@ public enum Features { ice_pillar.carverHelper.registerAll(ice_pillar, "ice_pillar"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice_pillar, 6, 1), "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice, 1, OreDictionary.WILDCARD_VALUE)); } }, ICE_STAIRS(ICE) { - - @Override - void addBlocks() { + @Override void addBlocks() { CarvableStairsMaker makerIceStairs = new CarvableStairsMaker(Blocks.ice); makerIceStairs.carverHelper.setChiselBlockName("Ice Stairs"); makerIceStairs.carverHelper.addVariation("tile.iceStairs.0.desc", 0, Blocks.ice); @@ -1031,9 +931,7 @@ public enum Features { }, IRON_BARS { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvablePane iron_bars = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F) .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron_bars", Blocks.iron_bars, 0, 0); @@ -1052,9 +950,7 @@ public enum Features { }, IRON_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable iron_block = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); @@ -1079,9 +975,7 @@ public enum Features { }, JACKOLANTERN { - - @Override - void addBlocks() { + @Override void addBlocks() { for (int metadata = 0; metadata < 16; metadata++) { jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("litpumpkin") .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightLevel(1.0f); @@ -1095,9 +989,7 @@ public enum Features { }, LABORATORY { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable laboratoryblock = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Chisel.soundMetalFootstep); laboratoryblock.carverHelper.setChiselBlockName("laboratoryblock"); @@ -1121,16 +1013,13 @@ public enum Features { Carving.chisel.registerOre("laboratoryblock", "laboratoryblock"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.laboratoryblock, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)); } }, LAPIS_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable lapis_block = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(3F).setResistance(5F) .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); @@ -1148,9 +1037,7 @@ public enum Features { }, LAVASTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockLavastone lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_flow").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); lavastone.carverHelper.addVariation("tile.lavastone.0.desc", 0, "lavastone/cobble"); lavastone.carverHelper.addVariation("tile.lavastone.1.desc", 1, "lavastone/black"); @@ -1165,16 +1052,13 @@ public enum Features { Carving.chisel.registerOre("lavastone", "lavastone"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.lavastone, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)); } }, LEAVES { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockLeaf leaves = (BlockLeaf) new BlockLeaf(Material.leaves).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.2F).setStepSound(Block.soundTypeGrass); Carving.chisel.addGroup(new CarvingGroup("leaves") { @@ -1222,9 +1106,7 @@ public enum Features { }, LIMESTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable limestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Block.soundTypeStone); limestone.carverHelper.setChiselBlockName("Limestone"); @@ -1292,16 +1174,13 @@ public enum Features { Carving.chisel.registerOre("limestone_stairs", "limestone_stairs"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.limestone_slab, 6, 0), "***", '*', new ItemStack(ChiselBlocks.limestone, 1, OreDictionary.WILDCARD_VALUE)); } }, MARBLE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable marble = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Block.soundTypeStone); marble.carverHelper.setChiselBlockName("Marble"); @@ -1369,17 +1248,14 @@ public enum Features { makerMarbleStairs.create("marble_stairs", ChiselBlocks.marbleStairs); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_slab, 6, 0), "***", '*', new ItemStack(ChiselBlocks.marble, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble, 4), "XX", "XX", 'X', new ItemStack(ChiselBlocks.marble_pillar, 1, OreDictionary.WILDCARD_VALUE)); } }, MARBLE_PILLAR(MARBLE) { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable marble_pillar; if (Configurations.oldPillars) { @@ -1467,17 +1343,14 @@ public enum Features { registerSlabTop(marble_pillar_slab, marble_pillar_slab.top); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_pillar, 6), "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.marble, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_pillar_slab, 6, 0), "***", '*', new ItemStack(ChiselBlocks.marble_pillar, 1, OreDictionary.WILDCARD_VALUE)); } }, NETHER_BRICK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable nether_brick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F) .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("nether_brick", Blocks.nether_brick, 0, 0); @@ -1504,9 +1377,7 @@ public enum Features { }, NETHER_RACK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable netherrack = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.4F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("netherrack", Blocks.netherrack, 0, 0); @@ -1530,9 +1401,7 @@ public enum Features { }, OBSIDIAN { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable obsidian = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(50.0F).setResistance(2000.0F) .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); @@ -1557,9 +1426,7 @@ public enum Features { }, PACKEDICE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvablePackedIce packedice = (BlockCarvablePackedIce) new BlockCarvablePackedIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("packedice", Blocks.packed_ice, 0, 0); @@ -1584,9 +1451,7 @@ public enum Features { }, PACKEDICE_PILLAR { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvablePackedIcePillar packedice_pillar = (BlockCarvablePackedIcePillar) new BlockCarvablePackedIcePillar(Material.ice).setCreativeTab(ChiselTabs.tabOtherChiselBlocks) .setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); packedice_pillar.carverHelper.setChiselBlockName("Packed Ice Pillar"); @@ -1602,9 +1467,7 @@ public enum Features { }, PACKEDICE_STAIRS { - - @Override - void addBlocks() { + @Override void addBlocks() { CarvableStairsMaker makerPackedIceStairs = new CarvableStairsMaker(Blocks.packed_ice); makerPackedIceStairs.carverHelper.setChiselBlockName("Packed Ice Stairs"); makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.0.desc", 0, Blocks.packed_ice); @@ -1635,9 +1498,7 @@ public enum Features { }, PAPER_WALL { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvablePane paperwall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setResistance(0.5F); paperwall.carverHelper.setChiselBlockName("Paper Wall"); paperwall.carverHelper.addVariation("tile.paperwall.0.desc", 0, "paper/box"); @@ -1669,17 +1530,14 @@ public enum Features { Carving.chisel.registerOre("paperwall_block", "paperwall_block"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall, 8), "ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall_block, 4), "pp", "pp", ('p'), ChiselBlocks.paperwall)); } }, PRESENT { - - @Override - void addBlocks() { + @Override void addBlocks() { for (int x = 0; x < 16; x++) { present[x] = (BlockPresent) new BlockPresent(x).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10.0F).setBlockName("present"); GameRegistry.registerBlock(present[x], "chest" + x); @@ -1688,21 +1546,17 @@ public enum Features { Carving.chisel.registerOre("present", "chest"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.present[meta]), new ItemStack(Blocks.chest, 1), dyeOres[meta])); } - @Override - boolean needsMetaRecipes() { + @Override boolean needsMetaRecipes() { return true; } }, PUMPKIN { - - @Override - void addBlocks() { + @Override void addBlocks() { for (int metadata = 0; metadata < 16; metadata++) { pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("pumpkin") .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); @@ -1714,21 +1568,17 @@ public enum Features { Carving.chisel.registerOre("pumpkin", "pumpkin"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.jackolantern[meta]), new ItemStack(ChiselBlocks.pumpkin[meta], 1), new ItemStack(Item.getItemFromBlock(Blocks.torch), 1)); } - @Override - boolean needsMetaRecipes() { + @Override boolean needsMetaRecipes() { return true; } }, QUARTZ { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("quartz", Blocks.quartz_block, 0, 0); Carving.chisel.addVariation("quartz", Blocks.quartz_block, 1, 0); Carving.chisel.addVariation("quartz", Blocks.quartz_block, 2, 0); @@ -1742,9 +1592,7 @@ public enum Features { RAILCRAFT("Railcraft"), RC_ABYSSAL_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCAbyssalBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"), 0, 0); Carving.chisel.addVariation("RCAbyssalBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"), 1, 1); Carving.chisel.addVariation("RCAbyssalBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"), 2, 2); @@ -1752,12 +1600,12 @@ public enum Features { Carving.chisel.addVariation("RCAbyssalBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"), 4, 4); Carving.chisel.addVariation("RCAbyssalBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"), 5, 5); Carving.chisel.registerOre("RCAbyssalBlock", "RCAbyssalBlock"); - }; + } + + ; }, RC_BLEACHED_BONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 0, 0); Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 1, 1); Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 2, 2); @@ -1769,9 +1617,7 @@ public enum Features { }, RC_BLOOD_STAINED(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 0, 0); Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 1, 1); Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 2, 2); @@ -1783,9 +1629,7 @@ public enum Features { }, RC_FROST_BOUND_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 0, 0); Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 1, 1); Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 2, 2); @@ -1797,9 +1641,7 @@ public enum Features { }, RC_INFERNAL_STONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 0, 0); Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 1, 1); Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 2, 2); @@ -1811,9 +1653,7 @@ public enum Features { }, RC_QUARRIED_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 0, 0); Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 1, 1); Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 2, 2); @@ -1821,13 +1661,13 @@ public enum Features { Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 4, 4); Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 5, 5); Carving.chisel.registerOre("RCQuarriedBlock", "RCQuarriedBlock"); - }; + } + + ; }, RC_SANDY_STONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 0, 0); Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 1, 1); Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 2, 2); @@ -1839,9 +1679,7 @@ public enum Features { }, REDSTONE_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable redstone_block = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F) .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("redstone_block", Blocks.redstone_block, 0, 0); @@ -1866,9 +1704,7 @@ public enum Features { }, ROAD_LINE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) .setBlockName("roadLine"); road_line.carverHelper.addVariation("tile.roadLine.0.desc", 0, "line-marking/white-center"); @@ -1879,16 +1715,13 @@ public enum Features { Carving.chisel.registerOre("road_line", "roadLine"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.road_line, 8, 0), "wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone)); } }, SANDSTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable sandstone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, 0); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 1, 1); @@ -1910,8 +1743,7 @@ public enum Features { Carving.chisel.registerOre("sandstone", "sandstone"); } - @Override - void addRecipes() { + @Override void addRecipes() { if (meta == 0) { // The following recipe is due to bugs with Chisel 1.5.1 to // 1.5.6a @@ -1924,9 +1756,7 @@ public enum Features { }, SANDSTONE_SCRIBBLES { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable sandstone_scribbles = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 0, "sandstone-scribbles/scribbles-0"); sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 1, "sandstone-scribbles/scribbles-1"); @@ -1948,32 +1778,26 @@ public enum Features { Carving.chisel.registerOre("sandstone_scribbles", "sandstone_scribbles"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.sandstone_scribbles, 1), "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 8)); } }, SMASHING_ROCK { - - @Override - void addItems() { + @Override void addItems() { ItemSmashingRock smashingrock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(ChiselTabs.tabChisel); EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 3, Chisel.instance, 40, 1, true); GameRegistry.registerItem(smashingrock, "smashingrock"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addShapelessRecipe(new ItemStack(ChiselItems.smashingrock, 16), new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1), new ItemStack(Items.stone_shovel) }); } }, SNAKE_SANDSTONE(SANDSTONE) { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockSnakestone sand_snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setBlockName("snakestoneSand"); GameRegistry.registerBlock(sand_snakestone, ItemCarvable.class, "sand_snakestone"); // TODO- eat me! @@ -1988,9 +1812,7 @@ public enum Features { }, SNAKESTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockSnakestone stone_snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone").setCreativeTab(ChiselTabs.tabStoneChiselBlocks); GameRegistry.registerBlock(stone_snakestone, ItemCarvable.class, "stone_snakestone"); // LanguageRegistry.addName(new ItemStack(snakestone, 1, 1), @@ -2004,9 +1826,7 @@ public enum Features { }, SNAKESTONE_OBSIDIAN { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockSnakestoneObsidian obsidian_snakestone = (BlockSnakestoneObsidian) new BlockSnakestoneObsidian("Chisel:snakestone/obsidian/").setBlockName("obsidianSnakestone").setHardness(50.0F) .setResistance(2000.0F); GameRegistry.registerBlock(obsidian_snakestone, ItemCarvable.class, "obsidian_snakestone"); @@ -2018,9 +1838,7 @@ public enum Features { }, STONE_BRICK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable stonebricksmooth = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(1.5F).setResistance(10.0F) .setStepSound(Block.soundTypeStone); if (Configurations.allowSmoothStone) { @@ -2052,9 +1870,7 @@ public enum Features { }, TALLOW("Thaumcraft") { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow); Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 5, 0); tallow.carverHelper.addVariation("tile.tallow.0.desc", 0, "tallow/smooth"); @@ -2065,9 +1881,7 @@ public enum Features { }, TECHNICAL { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable technical = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); technical.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffold"); technical.carverHelper.addVariation("tile.technical.1.desc", 1, "technical/cautiontape"); @@ -2096,8 +1910,7 @@ public enum Features { Carving.chisel.registerOre("technical", "technical"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y', Items.iron_ingot })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', @@ -2106,9 +1919,7 @@ public enum Features { }, TEMPLE_BLOCK { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F) .setStepSound(Chisel.soundTempleFootstep); templeblock.carverHelper.setChiselBlockName("Temple Block"); @@ -2132,16 +1943,13 @@ public enum Features { Carving.chisel.registerOre("templeblock", "templeblock"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.templeblock, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', dyeOres[4])); } }, TEMPLE_BLOCK_MOSSY { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable mossy_templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F) .setStepSound(Chisel.soundTempleFootstep); mossy_templeblock.carverHelper.setChiselBlockName("Mossy Temple Block"); @@ -2163,7 +1971,9 @@ public enum Features { mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.15.desc", 15, "templemossy/smalltiles-light"); mossy_templeblock.carverHelper.registerAll(mossy_templeblock, "mossy_templeblock"); Carving.chisel.registerOre("mossy_templeblock", "mossy_templeblock"); - }; + } + + ; }, /** @@ -2172,9 +1982,7 @@ public enum Features { TWILGHT_FOREST("TwilightForest"), TF_MAZESTONE(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); @@ -2188,9 +1996,7 @@ public enum Features { }, TF_TOWERSTONE(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 0, 0); Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 1, 1); Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 2, 2); @@ -2200,9 +2006,7 @@ public enum Features { }, TF_UNDER_BRICK(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 0, 0); Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 1, 1); Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 2, 2); @@ -2211,9 +2015,7 @@ public enum Features { }, THAUMIUM("Thaumcraft") { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0); thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate"); @@ -2226,9 +2028,7 @@ public enum Features { }, TORCH { - - @Override - void addBlocks() { + @Override void addBlocks() { Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); for (int type = 0; type < 10; type++) { if (type == 8 || type == 9) @@ -2245,9 +2045,7 @@ public enum Features { }, TYRIAN { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable tyrian = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(5.0F).setResistance(10.0F) .setStepSound(Block.soundTypeMetal); tyrian.carverHelper.setChiselBlockName("Futuristic Armor Plating Block"); @@ -2272,16 +2070,13 @@ public enum Features { Carving.chisel.registerOre("tyrian", "tyrian"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.tyrian, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)); } }, VOIDSTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable voidstone = (BlockCarvable) new BlockCarvable().setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone) .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); voidstone.carverHelper.addVariation("tile.voidstone.0.desc", 0, "voidstone/raw"); @@ -2311,8 +2106,7 @@ public enum Features { Carving.chisel.registerOre("voidstone2", "voidstone2"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstone, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_pearl, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstone2, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_eye, 1), 'o', @@ -2321,9 +2115,7 @@ public enum Features { }, VOIDSTONE_PILLARS(VOIDSTONE) { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvablePillar voidstonePillar = (BlockCarvablePillar) new BlockCarvablePillar(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone); voidstonePillar.carverHelper.addVariation("tile.voidstonePillar.0.desc", 0, "voidstone/pillar"); voidstonePillar.carverHelper.registerAll(voidstonePillar, "voidstonePillar"); @@ -2335,17 +2127,14 @@ public enum Features { Carving.chisel.registerOre("voidstonePillar2", "voidstonePillar2"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstonePillar, 4, 0), "xx", "xx", 'x', new ItemStack(ChiselBlocks.voidstone, 1)); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstonePillar2, 4, 0), "xx", "xx", 'x', new ItemStack(ChiselBlocks.voidstone2, 1)); } }, WARNING_SIGN { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvableLayered warningSign = (BlockCarvableLayered) new BlockCarvableLayered(Material.iron, "warning/base").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F) .setResistance(10.0F); warningSign.carverHelper.addVariation("tile.warningSign.0.desc", 0, "warning/rad"); @@ -2367,16 +2156,13 @@ public enum Features { Carving.chisel.registerOre("warningSign", "warningSign"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.warningSign, 4, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign })); } }, WATERSTONE { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockWaterstone waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_flow").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F); waterstone.carverHelper.addVariation("tile.waterstone.0.desc", 0, "waterstone/cobble"); waterstone.carverHelper.addVariation("tile.waterstone.1.desc", 1, "waterstone/black"); @@ -2390,16 +2176,13 @@ public enum Features { Carving.chisel.registerOre("waterstone", "blockWaterstone"); } - @Override - void addRecipes() { + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.waterstone, 8, 0), "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.water_bucket, 1)); } }, WOOD { - - @Override - void addBlocks() { + @Override void addBlocks() { String[] plank_names = { "oak", "spruce", "birch", "jungle", "acacia", "dark-oak" }; String[] plank_ucnames = { "Oak", "Spruce", "Birch", "Jungle", "Acacia", "Dark Oak" }; for (int i = 0; i < plank_names.length; i++) { @@ -2434,9 +2217,7 @@ public enum Features { }, WOOLEN_CLAY { - - @Override - void addBlocks() { + @Override void addBlocks() { BlockCarvable woolen_clay = (BlockCarvable) new BlockCarvable(Material.clay).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2F).setResistance(10F); woolen_clay.carverHelper.setChiselBlockName("Woolen Clay"); @@ -2447,21 +2228,17 @@ public enum Features { Carving.chisel.registerOre("woolen_clay", "woolen_clay"); } - @Override - void addRecipes() { + @Override void addRecipes() { OreDictionary.registerOre("stainedClay" + sGNames[meta].replaceAll(" ", ""), new ItemStack(Blocks.stained_hardened_clay, 1, meta)); OreDictionary.registerOre("blockWool" + sGNames[meta].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, meta)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.woolen_clay, 2, meta), new Object[] { "blockWool" + sGNames[meta].replaceAll(" ", ""), "stainedClay" + sGNames[meta].replaceAll(" ", "") })); } - @Override - boolean needsMetaRecipes() { + @Override boolean needsMetaRecipes() { return true; } - }, - - ; + },; private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; diff --git a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java b/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java index cf9d103d..85ffdbfe 100644 --- a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java @@ -7,7 +7,10 @@ import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.fx.*; +import com.cricketcraft.chisel.entity.fx.EntityBallOMossFX; +import com.cricketcraft.chisel.entity.fx.EntityGrimstoneFX; +import com.cricketcraft.chisel.entity.fx.EntityHolystoneFX; +import com.cricketcraft.chisel.entity.fx.EntitySnakestoneObsidianFX; import com.cricketcraft.chisel.utils.GeneralClient; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -167,11 +170,6 @@ public class GeneralChiselClient { } } - public static void spawnCricketFX(World world, double x, double y, double z) { - EntityCricketFX cricket = new EntityCricketFX(world, x, y, z); - Minecraft.getMinecraft().effectRenderer.addEffect(cricket); - } - public static void spawnBallOMossFX(World world, double x, double y, double z) { if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) { EntityBallOMossFX res = new EntityBallOMossFX(world, x, y, z); @@ -260,7 +258,8 @@ public class GeneralChiselClient { public static void spawnAutoChiselFX(TileEntityAutoChisel te, ItemStack base) { if (base != null) { for (int i = 0; i < 10; i++) { - EntityDiggingFX particle = new EntityDiggingFX(te.getWorldObj(), te.xCoord + 0.5, te.yCoord + 0.95, te.zCoord + 0.5, 0, 0, 0, Block.getBlockFromItem(base.getItem()), base.getItemDamage()); + EntityDiggingFX particle = new EntityDiggingFX(te.getWorldObj(), te.xCoord + 0.5, te.yCoord + 0.95, te.zCoord + 0.5, 0, 0, 0, Block.getBlockFromItem(base.getItem()), + base.getItemDamage()); particle.setVelocity((te.getWorldObj().rand.nextDouble() / 4) - 0.125, te.getWorldObj().rand.nextDouble() / 8, (te.getWorldObj().rand.nextDouble() / 4) - 0.125); Minecraft.getMinecraft().effectRenderer.addEffect(particle); } diff --git a/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java b/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java index da7cf4c3..a5749cb2 100644 --- a/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java +++ b/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java @@ -1,38 +1,84 @@ package com.cricketcraft.chisel.client.player; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import cpw.mods.fml.common.FMLCommonHandler; +import com.cricketcraft.chisel.init.ChiselItems; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraftforge.client.event.RenderLivingEvent; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; +import java.util.ArrayList; +import java.util.List; + @SideOnly(Side.CLIENT) public class PlayerSpecials { + private List names = new ArrayList(); + private boolean resetRender; + public PlayerSpecials() { - FMLCommonHandler.instance().bus().register(this); + names.add("Cricket"); + names.add("Drullkus"); } @SubscribeEvent(priority = EventPriority.HIGHEST) - public void renderCricket(RenderPlayerEvent event) { - if (!"TheCricket26".equals(event.entityPlayer.getDisplayName())) { - return; + public void renderItem(RenderPlayerEvent.Specials.Post event) { + EntityPlayer player = event.entityPlayer; + + for (int x = 0; x < names.size(); x++) { + if (player.getCommandSenderName().equals(names.get(x))) { + GL11.glPushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + if (player.isSneaking()) { + GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); + } + boolean armor = player.getCurrentArmor(1) != null; + GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.25F, -0.85F, armor ? 0.2F : 0.28F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glColor3f(1.0F, 1.0F, 1.0F); + int light = 15728880; + int lightmapX = light % 65536; + int lightmapY = light / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); + + IIcon icon = ChiselItems.obsidianChisel.getIcon(new ItemStack(ChiselItems.obsidianChisel, 1, 0), 1); + ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 1.0F / 16.0F); + GL11.glPopMatrix(); + } } - if (event.entityPlayer.isInvisible()) { - return; + } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void renderDev(RenderLivingEvent.Pre event) { + for (int x = 0; x < names.size(); x++) { + if (EnumChatFormatting.getTextWithoutFormattingCodes(event.entity.getCommandSenderName()).equals(names.get(x))) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); + GL11.glEnable(3042); + GL11.glBlendFunc(770, 771); + resetRender = true; + } } + } - ModelRenderer body = null; - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glPushMatrix(); - - GeneralChiselClient.spawnCricketFX(event.entityPlayer.getEntityWorld(), event.entityPlayer.posX, event.entityPlayer.posY, event.entityPlayer.posZ); - - GL11.glPopMatrix(); + @SubscribeEvent + public void entityColorRender(RenderLivingEvent.Post event) { + if (this.resetRender) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(3042); + resetRender = false; + } } } diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java index 266f9917..75001f50 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -1,12 +1,10 @@ package com.cricketcraft.chisel.config; -import java.util.Locale; - +import com.cricketcraft.chisel.Features; import net.minecraftforge.common.config.Configuration; - import org.apache.commons.lang3.StringUtils; -import com.cricketcraft.chisel.Features; +import java.util.Locale; public class Configurations { @@ -39,10 +37,12 @@ public class Configurations { public static boolean allowChiselDamage; public static int ironChiselMaxDamage; public static int diamondChiselMaxDamage; + public static int obsidianChiselMaxDamage; public static boolean ironChiselCanLeftClick; public static boolean ironChiselHasModes; public static int ironChiselAttackDamage; public static int diamondChiselAttackDamage; + public static int obsidianChiselAttackDamage; public static boolean useRoadLineTool; public static String getRoadLineTool; @@ -63,7 +63,8 @@ public class Configurations { chiselRecipe = config.get(category, "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel").getBoolean(false); enableFMP = config.get(category, "enableFMP", true, "Do you want to enable FMP").getBoolean(true); chiselStoneToCobbleBricks = config.get(category, "chiselStoneToCobbleBricks", true, "Chisel stone to cobblestone and bricks by left clicking.").getBoolean(false); - chiselBackToVanillaLeaves = config.get(category, "chiselBackToVanillaLeaves", false, "If this is true, you can chisel from the chisel leaves back to vanilla ones. If it is false, you cannot.").getBoolean(false); + chiselBackToVanillaLeaves = config.get(category, "chiselBackToVanillaLeaves", false, "If this is true, you can chisel from the chisel leaves back to vanilla ones. If it is false, you cannot.") + .getBoolean(false); /* worldgen */ category = "worldgen"; @@ -87,10 +88,15 @@ public class Configurations { allowChiselDamage = config.get(category, "allowChiselDamage", true, "Should the chisel be damageable and take damage when it chisels something.").getBoolean(); ironChiselMaxDamage = config.get(category, "ironChiselMaxDamage", 500, "The max damage of the standard iron chisel. Default: 500.").getInt(); diamondChiselMaxDamage = config.get(category, "diamondChiselMaxDamage", 5000, "The max damage of the diamond chisel. Default: 5000").getInt(); + obsidianChiselMaxDamage = config.get(category, "obsidianChiselMaxDamage", 50000, "The max damage of the obsidian chisel. Default: 50000").getInt(); ironChiselCanLeftClick = config.get(category, "ironChiselCanLeftClick", true, "If this is true, the iron chisel can left click chisel blocks. If false, it cannot.").getBoolean(); ironChiselHasModes = config.get(category, "ironChiselHasModes", false, "If this is true, the iron chisel can change its chisel mode just as the diamond chisel can.").getBoolean(); - ironChiselAttackDamage = config.get(category, "ironChiselAttackDamage", 2, "The extra attack damage points (in half hearts) that the iron chisel inflicts when it is used to attack an entity.").getInt(); - diamondChiselAttackDamage = config.get(category, "diamondChiselAttackDamage", 2, "The extra attack damage points (in half hearts) that the diamond chisel inflicts when it is used to attack an entity.").getInt(); + ironChiselAttackDamage = config.get(category, "ironChiselAttackDamage", 2, "The extra attack damage points (in half hearts) that the iron chisel inflicts when it is used to attack an entity.") + .getInt(); + diamondChiselAttackDamage = config + .get(category, "diamondChiselAttackDamage", 2, "The extra attack damage points (in half hearts) that the diamond chisel inflicts when it is used to attack an entity.").getInt(); + obsidianChiselAttackDamage = config + .get(category, "obsidianChiselAttackDamage", 4, "The extra attack damage points (in half hearts) that the obsidian chisel inflicts when it is used to attack an entity.").getInt(); /* block */ category = "block"; @@ -110,7 +116,9 @@ public class Configurations { return config.get("features", featureName(feature), true).getBoolean(true) && refreshConfig(); } - /** Makes the old camelCase names from the new CONSTANT_CASE names */ + /** + * Makes the old camelCase names from the new CONSTANT_CASE names + */ public static String featureName(Features feature) { String[] words = feature.name().toLowerCase(Locale.ENGLISH).split("_"); if (words.length == 1) { diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityCricketFX.java b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityCricketFX.java deleted file mode 100644 index f8e9a177..00000000 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityCricketFX.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.cricketcraft.chisel.entity.fx; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.utils.General; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - -public class EntityCricketFX extends EntityFX { - - private double tx, ty, tz, speed; - - public EntityCricketFX(World world, double x, double y, double z) { - super(world, x + 1, y + 1, z + 1); - particleScale = 0.5F + 0.5F * General.rand.nextFloat(); - speed = 0.04 + 0.04 * General.rand.nextDouble(); - - particleMaxAge = (int) (Math.random() * 10.0D) + 40; - - tx = x + General.rand.nextDouble(); - ty = y + General.rand.nextDouble(); - tz = z + General.rand.nextDouble(); - - switch (General.rand.nextInt(6)) { - case 0: - tx = x; - break; - case 1: - tx = x + 1; - break; - case 2: - ty = y; - break; - case 3: - ty = y + 1; - break; - case 4: - tz = z; - break; - case 5: - tz = z + 1; - break; - } - - double dx = (tx - posX) * 3; - double dy = (ty - posY) * 3; - double dz = (tz - posZ) * 3; - - setPosition(posX + dx, posY + dy + 8, posZ + dz); - prevPosX = posX; - prevPosY = posY; - prevPosZ = posZ; - - noClip = true; - } - - @Override - public int getFXLayer() { - return 1; - } - - @Override - public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) { - super.renderParticle(tessellator, partialTick, rotX, rotXZ, rotZ, rotYZ, rotXY); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(Chisel.MOD_ID + ":/assets/chisel/blocks/snakestone/obsidian/particles/" + General.rand.nextInt(8) + ".png")); - if (particleAge++ >= particleMaxAge) { - setDead(); - return; - } - - double dx = tx - posX; - double dy = ty - posY; - double dz = tz - posZ; - - double distance = Math.sqrt(dx * dx + dy * dy + dz * dz); - - if (distance == 0) { - setDead(); - return; - } - - if (distance < 0.4) { - particleAlpha = (float) (distance / 0.4); - } else if (particleAge < 20) { - particleAlpha = 1.0F * particleAge / 20; - } else { - particleAlpha = 1.0F; - } - - if (distance < speed) { - speed = distance; - } - - prevPosX = posX; - prevPosY = posY; - prevPosZ = posZ; - - double px = posX + dx / distance * speed; - double py = posY + dy / distance * speed; - double pz = posZ + dz / distance * speed; - - setPosition(px, py, pz); - } -} diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java b/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java index df71049d..8ca3cf86 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java @@ -6,7 +6,6 @@ import com.cricketcraft.chisel.item.ItemCloudInABottle; import com.cricketcraft.chisel.item.ItemSmashingRock; import com.cricketcraft.chisel.item.ItemUpgrade; import com.cricketcraft.chisel.item.chisel.ItemChisel; - import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) @@ -14,6 +13,7 @@ public final class ChiselItems { public static final ItemChisel chisel = null; public static final ItemChisel diamondChisel = null; + public static final ItemChisel obsidianChisel = null; public static final ItemCloudInABottle cloudinabottle = null; public static final ItemBallOMoss ballomoss = null; public static final ItemSmashingRock smashingrock = null; diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java index 4d9e68aa..fb0ffa38 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java @@ -1,7 +1,13 @@ package com.cricketcraft.chisel.item.chisel; -import java.util.List; - +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.carving.ICarvingRegistry; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.carving.Carving; +import com.cricketcraft.chisel.config.Configurations; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; @@ -13,20 +19,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.carving.ICarvingRegistry; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.config.Configurations; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.List; public class ItemChisel extends Item implements IChiselItem { public enum ChiselType { IRON(Configurations.ironChiselMaxDamage, Configurations.ironChiselAttackDamage), - DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage); + DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage), + OBSIDIAN(Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage); final int maxDamage; final int attackDamage; @@ -71,11 +71,11 @@ public class ItemChisel extends Item implements IChiselItem { String lc2 = I18n.format(base + "lc2"); String modes = I18n.format(base + "modes"); list.add(gui); - if (type == ChiselType.DIAMOND || Configurations.ironChiselCanLeftClick) { + if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselCanLeftClick) { list.add(lc1); list.add(lc2); } - if (type == ChiselType.DIAMOND || Configurations.ironChiselHasModes) { + if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselHasModes) { list.add(""); list.add(modes); } @@ -99,7 +99,7 @@ public class ItemChisel extends Item implements IChiselItem { stack.damageItem(1, attacker); return super.hitEntity(stack, attacker, target); } - + @Override public boolean canOpenGui(World world, EntityPlayer player, ItemStack chisel) { return true; @@ -117,11 +117,11 @@ public class ItemChisel extends Item implements IChiselItem { @Override public boolean canChiselBlock(World world, EntityPlayer player, int x, int y, int z, Block block, int metadata) { - return type == ChiselType.DIAMOND || Configurations.ironChiselCanLeftClick; + return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselCanLeftClick; } @Override public boolean hasModes(ItemStack chisel) { - return type == ChiselType.DIAMOND || Configurations.ironChiselHasModes; + return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN || Configurations.ironChiselHasModes; } } \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index d634fd6d..e3ea6086 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -2,6 +2,7 @@ package com.cricketcraft.chisel.proxy; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; +import com.cricketcraft.chisel.client.player.PlayerSpecials; import com.cricketcraft.chisel.client.render.*; import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer; import com.cricketcraft.chisel.client.render.item.ItemPresentRenderer; @@ -20,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { @@ -63,6 +65,8 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer); MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer); + + MinecraftForge.EVENT_BUS.register(new PlayerSpecials()); } @Override diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index a5c6a5d2..44ce4b45 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -9,6 +9,7 @@ item.chisel.chisel.desc.lc2=Can target a block by leaving it in the inventory item.chisel.chisel.desc.modes=Has multiple modes for chiseling. item.chisel.chisel_diamond.name=Diamond Chisel +item.chisel.chisel_obsidian.name=Obsidian Chisel item.ballMoss.name=Ball O' Moss item.ballMoss.desc=Right-Click to throw. This will turn Cobblestone to Moss Stone on impact.