From 22a0e2b8a989a38740a3080bb4aa6133da391346 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 8 Jan 2016 18:59:30 -0800 Subject: [PATCH] Swap the order of BloodStoneBrick Now matches the Crystal blocks --- .../bloodmagic/block/BlockBloodStoneBrick.java | 2 +- .../java/WayofTime/bloodmagic/registry/ModRecipes.java | 4 ++-- .../bloodmagic/blockstates/BlockBloodStoneBrick.json | 10 +++++----- .../bloodmagic/models/block/BlockBloodStoneBrick0.json | 2 +- .../bloodmagic/models/block/BlockBloodStoneBrick1.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index 611fb6a6..a0221eda 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java @@ -7,7 +7,7 @@ import net.minecraft.block.material.Material; public class BlockBloodStoneBrick extends BlockString { - public static final String[] names = { "normal", "large" }; + public static final String[] names = { "large", "normal" }; public BlockBloodStoneBrick() { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index ee9a271d..0ea7a486 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -47,8 +47,8 @@ public class ModRecipes GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.packSacrifice), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.bucket, 'c', "ingotIron", 'd', Items.leather_chestplate, 'e', ModItems.slate)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ritualDiviner), "dfd", "ase", "dwd", 'f', EnumRuneType.FIRE.getScribeStack(), 'a', EnumRuneType.AIR.getScribeStack(), 'w', EnumRuneType.WATER.getScribeStack(), 'e', EnumRuneType.EARTH.getScribeStack(), 'd', "gemDiamond", 's', "stickWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ritualDiviner, 1, 1), " S ", "tdt", " S ", 'S', new ItemStack(ModItems.slate, 1, 3), 't', EnumRuneType.DUSK.getScribeStack(), 'd', new ItemStack(ModItems.ritualDiviner))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick), "aa", "aa", 'a', new ItemStack(ModBlocks.bloodStoneBrick, 1, 1))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick, 1, 1), "stone", new ItemStack(ModItems.bloodShard))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick, 1, 1), "aa", "aa", 'a', new ItemStack(ModBlocks.bloodStoneBrick))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick), "stone", new ItemStack(ModItems.bloodShard))); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.activationCrystal, 1, 1), new ItemStack(Items.nether_star), OrbRegistry.getOrbStack(ModItems.orbArchmage)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.soulSnare, 4, 0), "sis", "iri", "sis", 's', new ItemStack(Items.string), 'i', "ingotIron", 'r', "dustRedstone")); diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json index c41a74e5..b37270ff 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json @@ -7,15 +7,15 @@ }, "variants": { "type": { - "normal": { - "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" - } - }, "large": { "textures": { "all": "bloodmagic:blocks/LargeBloodStoneBrick" } + }, + "normal": { + "textures": { + "all": "bloodmagic:blocks/BloodStoneBrick" + } } } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json index 081b0b64..362bbd0b 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" + "all": "bloodmagic:blocks/LargeBloodStoneBrick" } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json index 362bbd0b..081b0b64 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "bloodmagic:blocks/LargeBloodStoneBrick" + "all": "bloodmagic:blocks/BloodStoneBrick" } }