diff --git a/changelog.txt b/changelog.txt index 176c7552..74039cf9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.0.0-12 +------------------------------------------------------ +- Added recipes and temp textures for path blocks. More path blocks to come. + ------------------------------------------------------ Version 2.0.0-11 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 51223a13..94777769 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -11,7 +11,7 @@ import WayofTime.bloodmagic.block.base.BlockString; public class BlockPath extends BlockString implements IIncensePath { - public static final String[] names = { "wood", "stone", "wornStone" }; + public static final String[] names = { "wood", "stone", "wornstone" }; public BlockPath() { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 1cc65504..f67fbdc8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -76,6 +76,10 @@ public class ModRecipes GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.baseItemFilter, 1, 2), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeGreen", 's', Items.stick)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.baseItemFilter, 1, 3), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyePurple", 's', Items.stick)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.incenseAltar), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(ModItems.orbWeak), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.coal, 1, 1))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(ModItems.orbApprentice))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 1), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(ModItems.orbMagician))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 2), new ItemStack(ModBlocks.pathBlock, 4, 1), new ItemStack(ModBlocks.pathBlock, 4, 1), new ItemStack(ModBlocks.pathBlock, 4, 1), new ItemStack(ModBlocks.pathBlock, 4, 1), OrbRegistry.getOrbStack(ModItems.orbMaster))); } public static void addAltarRecipes() diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockPath.json b/src/main/resources/assets/bloodmagic/blockstates/BlockPath.json index 72aab233..08357780 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockPath.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockPath.json @@ -9,17 +9,17 @@ "type": { "wood": { "textures": { - "all": "bloodmagic:blocks/LargeBloodStoneBrick" + "all": "bloodmagic:blocks/WoodPath" } }, "stone": { "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" + "all": "bloodmagic:blocks/StoneTilePath" } }, - "wornStone": { + "wornstone": { "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" + "all": "bloodmagic:blocks/StoneBrickPath" } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 83c516d8..05fb2128 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -177,6 +177,10 @@ tile.BloodMagic.outputRouting.name=Output Routing Node tile.BloodMagic.inputRouting.name=Input Routing Node tile.BloodMagic.itemRouting.name=Routing Node +tile.BloodMagic.path.wood.name=Wooden Path +tile.BloodMagic.path.stone.name=Stone Tile Path +tile.BloodMagic.path.wornstone.name=Stone Brick Path + # Tooltips tooltip.BloodMagic.orb.desc=Stores raw Life Essence tooltip.BloodMagic.orb.owner=Added by: %s diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json index 03b1e662..c370a2ec 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json @@ -1,7 +1,7 @@ { "parent": "block/cube_all", "textures": { - "all": "bloodmagic:blocks/LargeBloodStoneBrick" + "all": "bloodmagic:blocks/WoodPath" } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json index b969d7f3..92b5df04 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json @@ -1,7 +1,7 @@ { "parent": "block/cube_all", "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" + "all": "bloodmagic:blocks/StoneTilePath" } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json index b969d7f3..dde569d0 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json @@ -1,7 +1,7 @@ { "parent": "block/cube_all", "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" + "all": "bloodmagic:blocks/StoneBrickPath" } } diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png b/src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png new file mode 100644 index 00000000..5d1cb7ca Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/StoneTilePath.png b/src/main/resources/assets/bloodmagic/textures/blocks/StoneTilePath.png new file mode 100644 index 00000000..84e94521 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/blocks/StoneTilePath.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/WoodPath.png b/src/main/resources/assets/bloodmagic/textures/blocks/WoodPath.png new file mode 100644 index 00000000..00f6cfb3 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/blocks/WoodPath.png differ