From 690cf6c4f3da5709b030753ee118df5275e4688a Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 30 Jan 2016 07:58:08 -0500 Subject: [PATCH] Added recipes and block textures to the path blocks. --- changelog.txt | 5 +++++ .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../WayofTime/bloodmagic/registry/ModRecipes.java | 4 ++++ .../assets/bloodmagic/blockstates/BlockPath.json | 8 ++++---- .../resources/assets/bloodmagic/lang/en_US.lang | 4 ++++ .../bloodmagic/models/block/BlockPath0.json | 2 +- .../bloodmagic/models/block/BlockPath1.json | 2 +- .../bloodmagic/models/block/BlockPath2.json | 2 +- .../bloodmagic/textures/blocks/StoneBrickPath.png | Bin 0 -> 669 bytes .../bloodmagic/textures/blocks/StoneTilePath.png | Bin 0 -> 685 bytes .../bloodmagic/textures/blocks/WoodPath.png | Bin 0 -> 741 bytes 11 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/textures/blocks/StoneBrickPath.png create mode 100644 src/main/resources/assets/bloodmagic/textures/blocks/StoneTilePath.png create mode 100644 src/main/resources/assets/bloodmagic/textures/blocks/WoodPath.png 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 0000000000000000000000000000000000000000..5d1cb7cab249358b5619486d5ff370fb267f2ce7 GIT binary patch literal 669 zcmV;O0%HA%P)*2D^Ir!%78y#(`v0y~<2)89%z}zBi842aQ8ECuu@4x-Q z|32P7+&>UNfGvl;?wly>zupESB|+iZ^<$|;=lJKt`?Qs9tD8uHVC1~a0|*dViYK#h z4BJZP1^P6;y1hsMv8K*GajBjiBh1tQNRoS5;9W0poXcK({n9{28_obBAp z4KX=FuAs}P*7H1w$j4#^7DigYbw})3@^xLBCc0D2VODZ!?TF=}dD>iV$(_#L01po! zLCm%n@vv>nPsh<(>$4Lv6A{r=#n-RDLrNHaoyYC@b0q5L$()f$mu8kgU`GhN+L@U6 zhwp#PnH)#iwmB9i42yTazWe3ppOzUDgGaksk(^n&DW6|HH^8$sOd6adZ*wj;*QtO0 z{nxX4v$fpiR>j?PO(sfDk6-d8z5CtEyYo806e7Uwj`ze8B;e!86V zH2tb1Bx-HwTuEr1m&@s-sv=@XyS%MGUtV0yF${hfPK6|>fXThD_qXZKr>9E_fIj$q z?2`iBuoE#pUPgnMVzOwqc?nn%;c|+gLSn%Aum652wUvXiMp40a?M$@SdJ2!v&wrId zsQUi=4nUdtdc8lL|5%sBT9+*%psTgre%>wEZQgCN%rsAX8eH;$I|UFDIKO*twY*Jp zsRdQ_!}|}VRR|zW=4BD#+O~Dyhn#ySGKRU%+cu^^M2=Z*+ufMxfLP6O965(tB{;hN zf8%}>hC?~};oE;NM1;LJqj1#uw(m#ZV{ic0S?7E-V7f75NZd7qFs5h>H~?tU#)lC| zYp;j^q~1AWjL#ub+QxgG72&VmXG3S8!WDvQJM@%eGN-}ko0m`m-w9!>;Q#5OEYSO~3;!CSN$Qaz4+ z-Qy6uc429)k$@{@??glPja9`M(X~-)yR)FGdCaP6FfkoORBLst`r~>Xv(rLxJQ0zI zRc0Yby>dzjAHOfN{?D-mSuK@|Lgg Tsky!?00000NkvXXu0mjfebg}* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..00f6cfb31b91edc954bc00015bec5951b390efe5 GIT binary patch literal 741 zcmVC4H_2U#%%xq03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00K!#L_t(I%O#RMtDIF7 zM%Vs$zwQiaLJUc;SCj}^SO$NFf7DJa>@EfjgrHz|HCiY{b2BsNJ!kK2G5u4l#d_qs zZ>3rqbskJd7&y^_<6K+@Xu=P7@XaTNC+w%dCIMF%iN8O=ybZbv=LBtoL}{mDgfdC; z}E_5}9C(|kz35y}ijCv6!3>8F`AMb=j=}bsh6a^_G^Xhwhm*lJv zP}PutSwW+4PriO!xC9j^SOb6gyRcU>(cAQEb`00000NkvXXu0mjfX*?_4 literal 0 HcmV?d00001