From 4e1de51cf8e68571bbe20d06a12ce4a4d0d67acd Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 8 Feb 2016 00:57:02 -0800 Subject: [PATCH] Implement new path blocks --- .../WayofTime/bloodmagic/block/BlockPath.java | 16 +++++++--- .../bloodmagic/registry/ModBlocks.java | 5 +++ .../bloodmagic/registry/ModRecipes.java | 9 ++++-- .../bloodmagic/blockstates/BlockPath.json | 29 ++++++++++++++++-- .../assets/bloodmagic/lang/en_US.lang | 9 ++++-- .../bloodmagic/models/block/BlockPath0.json | 2 +- .../bloodmagic/models/block/BlockPath1.json | 2 +- .../bloodmagic/models/block/BlockPath3.json | 7 +++++ .../bloodmagic/models/block/BlockPath4.json | 7 +++++ .../bloodmagic/models/block/BlockPath5.json | 7 +++++ .../bloodmagic/models/block/BlockPath6.json | 7 +++++ .../bloodmagic/models/block/BlockPath7.json | 7 +++++ .../bloodmagic/models/item/BlockPath3.json | 11 +++++++ .../bloodmagic/models/item/BlockPath4.json | 11 +++++++ .../bloodmagic/models/item/BlockPath5.json | 11 +++++++ .../bloodmagic/models/item/BlockPath6.json | 11 +++++++ .../bloodmagic/models/item/BlockPath7.json | 11 +++++++ ...pathObsidian.png => ObsidianBrickPath.png} | Bin ...hObsidianTile.png => ObsidianTilePath.png} | Bin .../textures/blocks/StoneBrickPath.png | Bin 669 -> 16221 bytes .../textures/blocks/StoneTilePath.png | Bin 685 -> 15846 bytes .../{pathWood.png => WoodBrickPath.png} | Bin .../{pathWoodTile.png => WoodTilePath.png} | Bin ...neWeathered.png => WornStoneBrickPath.png} | Bin ...ileWeathered.png => WornStoneTilePath.png} | Bin .../bloodmagic/textures/blocks/pathStone.png | Bin 16221 -> 0 bytes .../textures/blocks/pathStoneTile.png | Bin 15846 -> 0 bytes 27 files changed, 150 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockPath3.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockPath4.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockPath5.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockPath6.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockPath7.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockPath3.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockPath4.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockPath5.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockPath6.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockPath7.json rename src/main/resources/assets/bloodmagic/textures/blocks/{pathObsidian.png => ObsidianBrickPath.png} (100%) rename src/main/resources/assets/bloodmagic/textures/blocks/{pathObsidianTile.png => ObsidianTilePath.png} (100%) rename src/main/resources/assets/bloodmagic/textures/blocks/{pathWood.png => WoodBrickPath.png} (100%) rename src/main/resources/assets/bloodmagic/textures/blocks/{pathWoodTile.png => WoodTilePath.png} (100%) rename src/main/resources/assets/bloodmagic/textures/blocks/{pathStoneWeathered.png => WornStoneBrickPath.png} (100%) rename src/main/resources/assets/bloodmagic/textures/blocks/{pathStoneTileWeathered.png => WornStoneTilePath.png} (100%) delete mode 100644 src/main/resources/assets/bloodmagic/textures/blocks/pathStone.png delete mode 100644 src/main/resources/assets/bloodmagic/textures/blocks/pathStoneTile.png 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 5d1cb7cab249358b5619486d5ff370fb267f2ce7..c470ec95ee5908b023b09e91d35599dc9117b14f 100644 GIT binary patch literal 16221 zcmeI3du$ZP8NfHR31CWsgHuAHqRWM*kg&I}d+qA(i0w7l!ABkYz;;7K_V(uND|ffY z?V3BAK4?i>uvFRu>ei6DDpCkSA$>$esa+COw`!{bX$2x`2%*$fTWX%dE_G`{XYYOE z^T=xXBdT_#dwlcF_sz`j`{tY7KXzx++ST(b9;qM*Vtzxt*bILc=$|>W;P*FEop$&$ zH&)-S62!cP`sW^E-%Ae@gljnDYt!1ije@L1EK)%614}XzgT0|{Wilqon}BBWgN{(t zZN4`2me~{vxXrCLFYS%hg3eHVPaL%Lto6w~n`AyG$qbQf)t+gz;=XlnB|nQE0dFxf12Qf3&&f;$FIX@y$<#;Hjg_NjC_bd68F3oK=>jUMl?7AYc{6JAP%MMbcl2VLfEHqWl zC?Mx;VqNiYdTIfg0$~sVQB8$*Oj)~Fr=lrpr!viudG)jd!6&Th4w9j1%ydo0ES(CO2)W=| zh1xifG$rm+l&~k0WlcGRrrO$cR+*NyhN1x_p)Pk(s7WE-1#due1}Fiw(TfQ{s#Ov)Uf9UQ~igEa4= z^vw%h6y}x9jchxNwpC|&bX}gHpW|pdZD$}smYgQn;v3jw|nX2An)Ek$yVJ zk*wY7Ae~kj?i$%i(*fQuGm@NJOBpv)hN=(g3DjL0&vXK{fX$_?g#=1h@R$@=fnJ~7 z=3Ifwm;6jlWHTdO=LAXCYrjX<%LfR!sFK#gwDOj&Oo!0aaLx?D6!YoFNOXcIuKZ+N zrF%{9L{)-XLW+ax4!ALAQW-N|OU+RC<#)+l34|(b`QO6e=Ku(Db}Q+$b2Q1@tt{MC z5<~i(yfqkbI-P!=$%VNnis%yc#S{U~oC28&&ImRpSH6q7Oz)u-<_u1!nZ%$lLAg_k zc7T9~$}KC`fX?W{9JZMi!wi`JE^Nrb`+pF*Ogu{qVy?(eEub#_o=bqm7Zw63UG(5S zn9^3rnN0sSy@-ap()}GQ4KH|S4zH|fu^KgP$D04in507(-{^ivWA&Z6+LaF&#+7@ ze3pTaQB?jpYRd7JKYZ@ypTdgnrdPz5F$e+#FB-V;d=RaH3ju-`4P1CWh}OV`0Ktm} zE<7JZYv4kF;6(!$o)4lma3MhOqJay~2hke15FmKbz=h|7XboHl5WHyM!t+721}+2$ zUNmsw`5;;Y7Xkz?8o2O$5Uqg=0fH9|TzEc+*1&}T!HWhiJRd}B;6i}lMFSU}527`2 zAwck=feX(E(HgiAAb8Qhh3A844O|EiylCLU^Fg!*E(8c(G;rbhAX)<#0t7D_xbS=s zt$_;xf)@>3cs_{Mz=Z(8iv}({A4F^5LV(~!EUt>eo5>&wUq?>B_l{cwJN0**O>%v+ zmmqpRNf6t%6U4+F_~INS|)d0zwxUFuB}2mHS&jviIa~yQj6WY_v|=b>$7~YVZ&QJ5y$;~4PB9;r_ME=xLNV%8?o?_FCF^H z!Jh~FQpdKA9o+x>uWmMd{ORzre-BrSU-`A~)xF=}+uS?JW z$Hp&zR}2p<3P$JppMU44iH+y?5B1x>F?LGq+UI_~OF6Rd@cl1uxO(f!pRE{=xq25f z&n>STzxDyU@W7uw|MjtxZ(MY|@+t9E^ODNS{)Q9cFHVRbCF-~JE?zb_d`r17ulLS{ z^_Ne7`|ZTF_wGGzu3R#3_`QAK+xXJTtz%XFTe@9`8kn1B{|YKEUVVS?xgU*4esC&0 z@Y%srYa-sGLnrUFoZB_>#$)D(&PN=gf23*jk^U63ck@cG>H4MLE=uis@z9I2E8CY} zeJVw(&))mAc;d|dJwJ4R;rj96o$x*I7V-G!{&D;ArQy|^o==(XV_uof+@2gi*Egs= zFo$_~z~1+n)}?)eV}Gd}Ak5X1V^tP_?JSw3wBopKXzt~{sMeM-CFUrniszO E9|ukAWdHyG delta 624 zcmV-$0+0ROew_u7IDY^KbV*G`2jBr73>g+N_+1kK0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0006LNklxbl2-abP zkk|mfm3(4Y11p5YG9+PUGNilf;j+y+_~z{!9c`+yU_|l=w|^yEz}zBi842aQ8ECuu z@4x-Q|32P7+&>UNfGvl;?wly>zupESB|+iZ^<$|;=lJKt`?Qs9tD8uHVC1~a0|*dV ziYK#h4BJZP1^P6;y1hsMv8K*GajBjiBh1tQNRoS5;9W0poXcK({n9{28_ zobBAp4KX=Fu79A*sMhm5h{(rc1{OwIz;#FLS@LyVnkKqa&0$t@Y3+#Rp?TU|Zpod_ z-T)5|AVJKw7xA!d%TLGATI;hDF%uEdRK?e?ze7qGex1kd`Ew-d=gFLrNS9`oKww7* zyxN(V_=oR*%$XcV*|s?rCJc*rzrOqB=bx4t6N5*)T7Qw8S-L5oUp_a$vo%Z_oFs2^ zE;rYyfByZ~vwE|&+~roq-E>VRN>7hp@+Q6e-OIc4I=~bn!0nFr#1bUv(8mRUqxbar z;W6(SAk}@F+R9#1BE*CifbmSWwN}c7vp72C$|;L4b9EF?lE>9bDTn|}QtP2Z5ECju zZ2R7Iv1!@_mQ)CH?sEo&UqjUp5(F`$8Mp+1cLP$?fhe zGqbmQgcFp~@`$lSO$rGqsk|hokwh_7;R^79L@I%ll#hVPnMx{LMU?Y}h=SO&&$+(6 zE__ugsh+CconQa@_wAlf|N1wxf6P!@>+)H(U$3PoYF0~gumk>HYJD!62EXs#9CyQ? znd#;pgQ6~;ZGCE}t=r~O)S@kFxZCUwt&kKgStm!e2&l^?)37&1`4{KXveE}kM+Ee$ zse0%5$Udh-jn+F?x(5D0APG#_kxM30hLo#! z=5-}_ZZ$JbN4|^MSMOYE4e00&wK*Cz9XMQdZd&0u&f)RZaW1dGyB0clmUA(zkKtIF zGD7+qsR_YWO8zv;p$kX zT2NFe$D}iQB0sgL!hi%wf|O~%IIe13I|vh1F6V7MlsP%*p zRcg?IY-)N~(-MI~mbH}-IvN`CS>?E9rJ9OrS>s!N1`VmKcSQ{ZWfKHoKDuEh(gGLe zc!~4Cl%!d&#IiP#LQg~^q(#-(fK7v^Sx=aU8eWOx>>9S7s0Q3WQQ4F)NX6dQrV~}9 zn5HLXGoU8rUcjVNy?&MPBg2SkC7aMBs5pO47FQNz&KpDy(#J!q&%{{l^`mip->;npFel=YTD5 zVfN;0StnRCv9;t#sQH?dmURPIJFebY+H&P0R<2Q2On&D|vSL-UfMRV35cM+?S}W5k zM;61>$qRU4lneT{@Tteh#z6|Vp$by@UQ>%0TFlJKI#}8ZbK*kwdO>w!7%J~)tm>ao zKZk`d@DKkhOVY7!^8I0^2d zVqN?1Ekh-XmAIVh1s5ty zwnylE^(?f)2Xy$~fGPhum{eHH_n*)5q;f@{r7EID20?(}O@a&02k{bI2oStUaN+qN zUV;k&f;R~+JRihMa3MhOCc%a0gLnxp1PI4T@Fu~9 z=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t5?pvbh?n3(fZ$Dn z3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4?K=39OS8e5WTabe9*k<9&w0G~_&V9{Ra_8+&?c%>(du-OP z7k2&V_~?lf`p7|1@ujX?)UKi0;B})- zHUCUC{4wz0)@hl{xwB_qTevHxzy8DP-M@JG`H`)+W&Sd{$k{P>&8a=VZ+>Xwjf>B} z|G~B^Jm=58`SV+ry<+fNLav|wt37*DZ{zc;U%C9&#w;zj6Q0(=Y#Rcl)8o=Un;lr7w&d&%Cqk z-|j!(cSR@{UeGuAK;-^KSH_0<i{ZAjtUcdkK;Z1M6bmG)8X5M3)PL3}5!IwLOE6(kGldGiHkW_wBuT`LFKU v+``RXI{V_CX>@2HM@dakWG-a~0006bNkl; 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 E9|ukAWdHyG 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 1432c7cad74786fb7ad39aa52770c30b62afa587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15846 zcmeI3dyo{x9mnSgRLLoc76~D-4C|uA80O}=uVHU_+}?4QV$XZ*$sN&>+1cLP$?fhe zGqbmQgcFp~@`$lSO$rGqsk|hokwh_7;R^79L@I%ll#hVPnMx{LMU?Y}h=SO&&$+(6 zE__ugsh+CconQa@_wAlf|N1wxf6P!@>+)H(U$3PoYF0~gumk>HYJD!62EXs#9CyQ? znd#;pgQ6~;ZGCE}t=r~O)S@kFxZCUwt&kKgStm!e2&l^?)37&1`4{KXveE}kM+Ee$ zse0%5$Udh-jn+F?x(5D0APG#_kxM30hLo#! z=5-}_ZZ$JbN4|^MSMOYE4e00&wK*Cz9XMQdZd&0u&f)RZaW1dGyB0clmUA(zkKtIF zGD7+qsR_YWO8zv;p$kX zT2NFe$D}iQB0sgL!hi%wf|O~%IIe13I|vh1F6V7MlsP%*p zRcg?IY-)N~(-MI~mbH}-IvN`CS>?E9rJ9OrS>s!N1`VmKcSQ{ZWfKHoKDuEh(gGLe zc!~4Cl%!d&#IiP#LQg~^q(#-(fK7v^Sx=aU8eWOx>>9S7s0Q3WQQ4F)NX6dQrV~}9 zn5HLXGoU8rUcjVNy?&MPBg2SkC7aMBs5pO47FQNz&KpDy(#J!q&%{{l^`mip->;npFel=YTD5 zVfN;0StnRCv9;t#sQH?dmURPIJFebY+H&P0R<2Q2On&D|vSL-UfMRV35cM+?S}W5k zM;61>$qRU4lneT{@Tteh#z6|Vp$by@UQ>%0TFlJKI#}8ZbK*kwdO>w!7%J~)tm>ao zKZk`d@DKkhOVY7!^8I0^2d zVqN?1Ekh-XmAIVh1s5ty zwnylE^(?f)2Xy$~fGPhum{eHH_n*)5q;f@{r7EID20?(}O@a&02k{bI2oStUaN+qN zUV;k&f;R~+JRihMa3MhOCc%a0gLnxp1PI4T@Fu~9 z=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t5?pvbh?n3(fZ$Dn z3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4?K=39OS8e5WTabe9*k<9&w0G~_&V9{Ra_8+&?c%>(du-OP z7k2&V_~?lf`p7|1@ujX?)UKi0;B})- zHUCUC{4wz0)@hl{xwB_qTevHxzy8DP-M@JG`H`)+W&Sd{$k{P>&8a=VZ+>Xwjf>B} z|G~B^Jm=58`SV+ry<+fNLav|wt37*DZ{zc;U%C9&#w;zj6Q0(=Y#Rcl)8o=Un;lr7w&d&%Cqk z-|j!(cSR@{UeGuAK;-^KSH_0<i{ZAjtUcdkK;Z1M6bmG)8X5M3)PL3}5!IwLOE6(kGldGiHkW_wBuT`LFKU v+``RXI{V