diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 94777769..e2fdc06a 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", "woodTile", "stone", "stoneTile", "wornstone", "wornstoneTile", "obsidian", "obsidianTile" }; public BlockPath() { @@ -23,7 +23,15 @@ public class BlockPath extends BlockString implements IIncensePath setHardness(2.0F); setResistance(5.0F); setStepSound(soundTypeStone); - setHarvestLevel("pickaxe", 0); + + setHarvestLevel("axe", 0, getStateFromMeta(0)); + setHarvestLevel("axe", 0, getStateFromMeta(1)); + setHarvestLevel("pickaxe", 0, getStateFromMeta(2)); + setHarvestLevel("pickaxe", 0, getStateFromMeta(3)); + setHarvestLevel("pickaxe", 0, getStateFromMeta(4)); + setHarvestLevel("pickaxe", 0, getStateFromMeta(5)); + setHarvestLevel("pickaxe", 3, getStateFromMeta(6)); + setHarvestLevel("pickaxe", 3, getStateFromMeta(7)); } @Override @@ -33,9 +41,9 @@ public class BlockPath extends BlockString implements IIncensePath { case 0: return 2; - case 1: - return 4; case 2: + return 4; + case 4: return 6; default: return 0; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index 781c7f51..9ab0b64b 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -170,6 +170,11 @@ public class ModBlocks renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 0); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 1); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 2); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 3); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 4); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 5); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 6); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 7); } private static Block registerBlock(Block block, Class itemBlock, String name) diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index e7a609fd..417202f1 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -78,8 +78,13 @@ public class ModRecipes 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))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 1), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(ModItems.orbMagician))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 3), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 4), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), OrbRegistry.getOrbStack(ModItems.orbMagician))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 5), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 6), Blocks.obsidian, Blocks.obsidian, Blocks.obsidian, Blocks.obsidian, OrbRegistry.getOrbStack(ModItems.orbMagician))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 7), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6))); } 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 08357780..4ebe7070 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockPath.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockPath.json @@ -9,17 +9,42 @@ "type": { "wood": { "textures": { - "all": "bloodmagic:blocks/WoodPath" + "all": "bloodmagic:blocks/WoodBrickPath" + } + }, + "woodtile": { + "textures": { + "all": "bloodmagic:blocks/WoodTilePath" } }, "stone": { + "textures": { + "all": "bloodmagic:blocks/StoneBrickPath" + } + }, + "stonetile": { "textures": { "all": "bloodmagic:blocks/StoneTilePath" } }, "wornstone": { "textures": { - "all": "bloodmagic:blocks/StoneBrickPath" + "all": "bloodmagic:blocks/WornStoneBrickPath" + } + }, + "wornstonetile": { + "textures": { + "all": "bloodmagic:blocks/WornStoneTilePath" + } + }, + "obsidian": { + "textures": { + "all": "bloodmagic:blocks/ObsidianBrickPath" + } + }, + "obsidiantile": { + "textures": { + "all": "bloodmagic:blocks/ObsidianTilePath" } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 201bea50..1d3a994e 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -182,8 +182,13 @@ 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 +tile.BloodMagic.path.woodTile.name=Tiled Wooden Path +tile.BloodMagic.path.stone.name=Stone Brick Path +tile.BloodMagic.path.stoneTile.name=Tiled Stone Path +tile.BloodMagic.path.wornstone.name=Worn Stone Brick Path +tile.BloodMagic.path.wornstoneTile.name=Tiled Worn Stone Path +tile.BloodMagic.path.obsidian.name=Obsidian Brick Path +tile.BloodMagic.path.obsidianTile.name=Tiled Obsidian Path # Tooltips tooltip.BloodMagic.orb.desc=Stores raw Life Essence diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json index c370a2ec..2cda0fc9 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/WoodPath" + "all": "bloodmagic:blocks/WoodBrickPath" } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json index 92b5df04..68e93a2e 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/StoneTilePath" + "all": "bloodmagic:blocks/WoodTilePath" } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath3.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath3.json new file mode 100644 index 00000000..92b5df04 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath3.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/StoneTilePath" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath4.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath4.json new file mode 100644 index 00000000..0b3d7b70 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath4.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/WornStoneBrickPath" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath5.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath5.json new file mode 100644 index 00000000..695c4658 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath5.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/WornStoneTilePath" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath6.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath6.json new file mode 100644 index 00000000..4a2f5ebf --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath6.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/ObsidianBrickPath" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath7.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath7.json new file mode 100644 index 00000000..89e8daa1 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockPath7.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/ObsidianTilePath" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath3.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath3.json new file mode 100644 index 00000000..71d76e69 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockPath3.json @@ -0,0 +1,11 @@ +{ + "parent": "bloodmagic:block/BlockPath3", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath4.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath4.json new file mode 100644 index 00000000..65edf404 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockPath4.json @@ -0,0 +1,11 @@ +{ + "parent": "bloodmagic:block/BlockPath4", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath5.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath5.json new file mode 100644 index 00000000..db5f20a7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockPath5.json @@ -0,0 +1,11 @@ +{ + "parent": "bloodmagic:block/BlockPath5", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath6.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath6.json new file mode 100644 index 00000000..e41fd824 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockPath6.json @@ -0,0 +1,11 @@ +{ + "parent": "bloodmagic:block/BlockPath6", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath7.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath7.json new file mode 100644 index 00000000..b7f845bb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockPath7.json @@ -0,0 +1,11 @@ +{ + "parent": "bloodmagic:block/BlockPath7", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} + diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathObsidian.png b/src/main/resources/assets/bloodmagic/textures/blocks/ObsidianBrickPath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/pathObsidian.png rename to src/main/resources/assets/bloodmagic/textures/blocks/ObsidianBrickPath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathObsidianTile.png b/src/main/resources/assets/bloodmagic/textures/blocks/ObsidianTilePath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/pathObsidianTile.png rename to src/main/resources/assets/bloodmagic/textures/blocks/ObsidianTilePath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png b/src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png index 5d1cb7ca..c470ec95 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png 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 index 84e94521..1432c7ca 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/StoneTilePath.png and b/src/main/resources/assets/bloodmagic/textures/blocks/StoneTilePath.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathWood.png b/src/main/resources/assets/bloodmagic/textures/blocks/WoodBrickPath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/pathWood.png rename to src/main/resources/assets/bloodmagic/textures/blocks/WoodBrickPath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathWoodTile.png b/src/main/resources/assets/bloodmagic/textures/blocks/WoodTilePath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/pathWoodTile.png rename to src/main/resources/assets/bloodmagic/textures/blocks/WoodTilePath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathStoneWeathered.png b/src/main/resources/assets/bloodmagic/textures/blocks/WornStoneBrickPath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/pathStoneWeathered.png rename to src/main/resources/assets/bloodmagic/textures/blocks/WornStoneBrickPath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathStoneTileWeathered.png b/src/main/resources/assets/bloodmagic/textures/blocks/WornStoneTilePath.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/blocks/pathStoneTileWeathered.png rename to src/main/resources/assets/bloodmagic/textures/blocks/WornStoneTilePath.png diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathStone.png b/src/main/resources/assets/bloodmagic/textures/blocks/pathStone.png deleted file mode 100644 index c470ec95..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/pathStone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/pathStoneTile.png b/src/main/resources/assets/bloodmagic/textures/blocks/pathStoneTile.png deleted file mode 100644 index 1432c7ca..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/pathStoneTile.png and /dev/null differ