From bafbd0b0769edaec479c5c0a3a2e0fc5f6ed724d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 4 Sep 2016 10:04:46 -0400 Subject: [PATCH] Added more blocks for Yulife to bang his head against --- .../WayofTime/bloodmagic/api/Constants.java | 3 +- .../bloodmagic/registry/ModBlocks.java | 2 + .../blockstates/BlockDemonBricks2.json | 88 +++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/bloodmagic/blockstates/BlockDemonBricks2.json diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index b5fb2f4b..f3b169fe 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -292,7 +292,8 @@ public class Constants BLOOD_TANK("BlockBloodTank"), MIMIC("BlockMimic"), ALCHEMY_TABLE("BlockAlchemyTable"), - DEMON_BRICK_1("BlockDemonBricks1"); + DEMON_BRICK_1("BlockDemonBricks1"), + DEMON_BRICK_2("BlockDemonBricks2"); @Getter private final String regName; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index 973f7c52..7dad7d06 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -116,6 +116,7 @@ public class ModBlocks public static Block mimic; public static Block demonBrick1; + public static Block demonBrick2; public static void init() { @@ -155,6 +156,7 @@ public class ModBlocks mimic = registerBlock(new ItemBlockMimic(new BlockMimic()), Constants.BloodMagicBlock.MIMIC.getRegName()); demonBrick1 = registerBlock(new ItemBlockDemonBase(new BlockDemonBase("bricks1", new String[] { "brick1_raw", "brick1_corrosive", "brick1_destructive", "brick1_vengeful", "brick1_steadfast", "brick2_raw", "brick2_corrosive", "brick2_destructive", "brick2_vengeful", "brick2_steadfast", "brick3_raw", "brick3_corrosive", "brick3_destructive", "brick3_vengeful", "brick3_steadfast" })), Constants.BloodMagicBlock.DEMON_BRICK_1.getRegName()); + demonBrick2 = registerBlock(new ItemBlockDemonBase(new BlockDemonBase("bricks2", new String[] { "smallbrick_raw", "smallbrick_corrosive", "smallbrick_destructive", "smallbrick_vengeful", "smallbrick_steadfast", "tile_raw", "tile_corrosive", "tile_destructive", "tile_vengeful", "tile_steadfast", "tilespecial_raw", "tilespecial_corrosive", "tilespecial_destructive", "tilespecial_vengeful", "tilespecial_steadfast" })), Constants.BloodMagicBlock.DEMON_BRICK_2.getRegName()); // testSpellBlock = registerBlock(new BlockTestSpellBlock()); diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockDemonBricks2.json b/src/main/resources/assets/bloodmagic/blockstates/BlockDemonBricks2.json new file mode 100644 index 00000000..deef552c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockDemonBricks2.json @@ -0,0 +1,88 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { }, + "model": "cube_all", + "uvlock": true + }, + "variants": { + "type": { + "smallbrick_raw": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick" + } + }, + "smallbrick_corrosive": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_c" + } + }, + "smallbrick_destructive": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_d" + } + }, + "smallbrick_vengeful": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_v" + } + }, + "smallbrick_steadfast": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_smallbrick_s" + } + }, + "tile_raw": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tile" + } + }, + "tile_corrosive": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tile_c" + } + }, + "tile_destructive": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tile_d" + } + }, + "tile_vengeful": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tile_v" + } + }, + "tile_steadfast": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tile_s" + } + }, + "tilespecial_raw": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial" + } + }, + "tilespecial_corrosive": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_c" + } + }, + "tilespecial_destructive": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_d" + } + }, + "tilespecial_vengeful": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_v" + } + }, + "tilespecial_steadfast": { + "textures": { + "all": "bloodmagic:blocks/dungeon/dungeon_tilespecial_s" + } + } + } + } +} +