diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index abdf226f..a39ef933 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1558,6 +1558,38 @@ public enum Features { } }, + NATION { + + @Override + void addBlocks() { + BlockCarvable imperial = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + imperial.carverHelper.addVariation("tile.nation.0.desc", 0, "nation/imperialCamo"); + imperial.carverHelper.addVariation("tile.nation.1.desc", 1, "nation/imperialCamoSecluded"); + imperial.carverHelper.addVariation("tile.nation.2.desc", 2, "nation/imperialPlate"); + imperial.carverHelper.addVariation("tile.nation.3.desc", 3, "nation/imperialCautionWhite"); + imperial.carverHelper.addVariation("tile.nation.4.desc", 4, "nation/imperialCautionOrange"); + imperial.carverHelper.registerBlock(imperial, "imperial"); + imperial.carverHelper.registerAll(imperial, "nation"); + + BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + rebel.carverHelper.addVariation("tile.nation.0.desc", 0, "nation/rebelCamo"); + rebel.carverHelper.addVariation("tile.nation.1.desc", 1, "nation/rebelCamoSecluded"); + rebel.carverHelper.addVariation("tile.nation.2.desc", 2, "nation/rebelPlate"); + rebel.carverHelper.addVariation("tile.nation.3.desc", 3, "nation/rebelCautionWhite"); + rebel.carverHelper.addVariation("tile.nation.4.desc", 4, "nation/rebelCautionRed"); + rebel.carverHelper.registerBlock(rebel, "rebel"); + rebel.carverHelper.registerVariations("nation", rebel); + + Carving.chisel.registerOre("nation", "nation"); + } + + @Override + void addRecipes() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.nation, 32, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', + Items.iron_ingot, 'z', Items.gold_nugget })); + } + }, + NETHER_BRICK { @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 10b8b3cd..340c9e09 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -30,6 +30,7 @@ public final class ChiselBlocks { public static final BlockCarvableGlowstone glowstone = null; public static final BlockCarvable lapis_block = null; public static final BlockCarvable emerald_block = null; + public static final BlockCarvable nation = null; public static final BlockCarvable nether_brick = null; public static final BlockCarvable netherrack = null; public static final BlockCarvable mossy_cobblestone = null; diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 0245eabf..12a74faf 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -30,10 +30,19 @@ item.upgrade_stack.desc=Allows it to manufacture stacks at a time #Chisel 2 +#Nation +tile.chisel.imperial.name=Imperialistic Block +tile.chisel.rebel.name=Rebellious Block +tile.nation.0.desc=Camouflaged +tile.nation.1.desc=Camouflaged (Secluded) +tile.nation.2.desc=Bolted Plate +tile.nation.3.desc=White Caution Tape +tile.nation.4.desc=Teamed Caution Tape + #Shingles -tile.chisel.shingles.name="Shingles" -tile.shingles.0.desc="Red Diagonal" -tile.shingles.1.desc="Red Tiny Squares" +tile.chisel.shingles.name=Shingles +tile.shingles.0.desc=Red Diagonal +tile.shingles.1.desc=Red Tiny Squares #Valentines tile.chisel.valentines.name=Valentines Block @@ -107,7 +116,7 @@ tile.voidstone.7.desc=Beveled Voidstone tile.chisel.voidstonePillar.name=Voidstone Pillar tile.voidstonePillar.0.desc=Striped Voidstone Pillar --#Warning +#Warning tile.chisel.warningSign.name=Warning Sign tile.warningSign.0.desc=Radiation tile.warningSign.1.desc=Biohazard diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialCamo-v4.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCamo-v4.png new file mode 100644 index 00000000..e01a696e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCamo-v4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialCamoSecluded-v4.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCamoSecluded-v4.png new file mode 100644 index 00000000..22c61e90 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCamoSecluded-v4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionOrange-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionOrange-ctm.png new file mode 100644 index 00000000..0efa53d5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionOrange-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionOrange.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionOrange.png new file mode 100644 index 00000000..319cb96b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionOrange.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionWhite-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionWhite-ctm.png new file mode 100644 index 00000000..aee80ece Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionWhite-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionWhite.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionWhite.png new file mode 100644 index 00000000..bf122ac7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialCautionWhite.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/imperialPlate.png b/src/main/resources/assets/chisel/textures/blocks/nation/imperialPlate.png new file mode 100644 index 00000000..0e856d83 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/imperialPlate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelCamo-v4.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCamo-v4.png new file mode 100644 index 00000000..ba65cf73 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCamo-v4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelCamoSecluded-v4.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCamoSecluded-v4.png new file mode 100644 index 00000000..a933e493 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCamoSecluded-v4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionRed-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionRed-ctm.png new file mode 100644 index 00000000..5f0ccdb9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionRed-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionRed.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionRed.png new file mode 100644 index 00000000..b45b641a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionRed.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionWhite-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionWhite-ctm.png new file mode 100644 index 00000000..881e74f9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionWhite-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionWhite.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionWhite.png new file mode 100644 index 00000000..bd52b467 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelCautionWhite.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nation/rebelPlate.png b/src/main/resources/assets/chisel/textures/blocks/nation/rebelPlate.png new file mode 100644 index 00000000..739e8ca5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nation/rebelPlate.png differ