From 54b15038e2f8251165ea8d14143b20e1325886ee Mon Sep 17 00:00:00 2001 From: SavaletDev <73446695+SavaletDev@users.noreply.github.com> Date: Sun, 31 Oct 2021 01:56:51 +0200 Subject: [PATCH] Add Planks Add blue, red, pink, purple planks. --- .../java/fr/savalet/arkiadeco/ModBlocks.java | 5 ++++- .../arkiadeco/blockstates/blue_planks.json | 7 +++++++ .../arkiadeco/blockstates/blue_wood.json | 7 ------- .../arkiadeco/blockstates/pink_planks.json | 7 +++++++ .../arkiadeco/blockstates/purple_planks.json | 7 +++++++ .../arkiadeco/blockstates/red_planks.json | 7 +++++++ .../assets/arkiadeco/lang/en_us.json | 5 ++++- .../assets/arkiadeco/lang/fr_fr.json | 5 ++++- .../arkiadeco/models/block/blue_planks.json | 6 ++++++ .../arkiadeco/models/block/pink_planks.json | 6 ++++++ .../arkiadeco/models/block/purple_planks.json | 6 ++++++ .../block/{blue_wood.json => red_planks.json} | 2 +- .../arkiadeco/models/item/blue_planks.json | 3 +++ .../arkiadeco/models/item/blue_wood.json | 3 --- .../arkiadeco/models/item/pink_planks.json | 3 +++ .../arkiadeco/models/item/purple_planks.json | 3 +++ .../arkiadeco/models/item/red_planks.json | 3 +++ .../arkiadeco/textures/block/blue_planks.png | Bin 0 -> 256 bytes .../arkiadeco/textures/block/blue_wood.png | Bin 463 -> 0 bytes .../arkiadeco/textures/block/oak_planks.png | Bin 0 -> 268 bytes .../arkiadeco/textures/block/pink_planks.png | Bin 0 -> 256 bytes .../textures/block/purple_planks.png | Bin 0 -> 256 bytes .../arkiadeco/textures/block/red_planks.png | Bin 0 -> 256 bytes .../loot_tables/blocks/blue_planks.json | 19 ++++++++++++++++++ .../loot_tables/blocks/pink_planks.json | 19 ++++++++++++++++++ .../loot_tables/blocks/purple_planks.json | 19 ++++++++++++++++++ .../{blue_wood.json => red_planks.json} | 2 +- 27 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/arkiadeco/blockstates/blue_planks.json delete mode 100644 src/main/resources/assets/arkiadeco/blockstates/blue_wood.json create mode 100644 src/main/resources/assets/arkiadeco/blockstates/pink_planks.json create mode 100644 src/main/resources/assets/arkiadeco/blockstates/purple_planks.json create mode 100644 src/main/resources/assets/arkiadeco/blockstates/red_planks.json create mode 100644 src/main/resources/assets/arkiadeco/models/block/blue_planks.json create mode 100644 src/main/resources/assets/arkiadeco/models/block/pink_planks.json create mode 100644 src/main/resources/assets/arkiadeco/models/block/purple_planks.json rename src/main/resources/assets/arkiadeco/models/block/{blue_wood.json => red_planks.json} (56%) create mode 100644 src/main/resources/assets/arkiadeco/models/item/blue_planks.json delete mode 100644 src/main/resources/assets/arkiadeco/models/item/blue_wood.json create mode 100644 src/main/resources/assets/arkiadeco/models/item/pink_planks.json create mode 100644 src/main/resources/assets/arkiadeco/models/item/purple_planks.json create mode 100644 src/main/resources/assets/arkiadeco/models/item/red_planks.json create mode 100644 src/main/resources/assets/arkiadeco/textures/block/blue_planks.png delete mode 100644 src/main/resources/assets/arkiadeco/textures/block/blue_wood.png create mode 100644 src/main/resources/assets/arkiadeco/textures/block/oak_planks.png create mode 100644 src/main/resources/assets/arkiadeco/textures/block/pink_planks.png create mode 100644 src/main/resources/assets/arkiadeco/textures/block/purple_planks.png create mode 100644 src/main/resources/assets/arkiadeco/textures/block/red_planks.png create mode 100644 src/main/resources/data/arkiadeco/loot_tables/blocks/blue_planks.json create mode 100644 src/main/resources/data/arkiadeco/loot_tables/blocks/pink_planks.json create mode 100644 src/main/resources/data/arkiadeco/loot_tables/blocks/purple_planks.json rename src/main/resources/data/arkiadeco/loot_tables/blocks/{blue_wood.json => red_planks.json} (86%) diff --git a/src/main/java/fr/savalet/arkiadeco/ModBlocks.java b/src/main/java/fr/savalet/arkiadeco/ModBlocks.java index 6710daa..5347638 100644 --- a/src/main/java/fr/savalet/arkiadeco/ModBlocks.java +++ b/src/main/java/fr/savalet/arkiadeco/ModBlocks.java @@ -16,7 +16,10 @@ public class ModBlocks { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ArkiaDeco.MODID); - public static final RegistryObject BLUE_WOOD = createBlock("blue_wood", () -> new Block(AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(3f, 15f).harvestTool(ToolType.PICKAXE).harvestLevel(1).setRequiresTool())); + public static final RegistryObject BLUE_PLANKS = createBlock("blue_planks", () -> new Block(AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(3f, 15f).harvestTool(ToolType.AXE).harvestLevel(0).setRequiresTool())); + public static final RegistryObject RED_PLANKS = createBlock("red_planks", () -> new Block(AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(3f, 15f).harvestTool(ToolType.AXE).harvestLevel(0).setRequiresTool())); + public static final RegistryObject PINK_PLANKS = createBlock("pink_planks", () -> new Block(AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(3f, 15f).harvestTool(ToolType.AXE).harvestLevel(0).setRequiresTool())); + public static final RegistryObject PURPLE_PLANKS = createBlock("purple_planks", () -> new Block(AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(3f, 15f).harvestTool(ToolType.AXE).harvestLevel(0).setRequiresTool())); public static RegistryObject createBlock(String name, Supplier supplier) { RegistryObject block = BLOCKS.register(name, supplier); diff --git a/src/main/resources/assets/arkiadeco/blockstates/blue_planks.json b/src/main/resources/assets/arkiadeco/blockstates/blue_planks.json new file mode 100644 index 0000000..ef5f60a --- /dev/null +++ b/src/main/resources/assets/arkiadeco/blockstates/blue_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "arkiadeco:block/blue_planks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/blockstates/blue_wood.json b/src/main/resources/assets/arkiadeco/blockstates/blue_wood.json deleted file mode 100644 index 21a8e74..0000000 --- a/src/main/resources/assets/arkiadeco/blockstates/blue_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "arkiadeco:block/blue_wood" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/blockstates/pink_planks.json b/src/main/resources/assets/arkiadeco/blockstates/pink_planks.json new file mode 100644 index 0000000..75b9dce --- /dev/null +++ b/src/main/resources/assets/arkiadeco/blockstates/pink_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "arkiadeco:block/pink_planks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/blockstates/purple_planks.json b/src/main/resources/assets/arkiadeco/blockstates/purple_planks.json new file mode 100644 index 0000000..a8cc1ab --- /dev/null +++ b/src/main/resources/assets/arkiadeco/blockstates/purple_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "arkiadeco:block/purple_planks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/blockstates/red_planks.json b/src/main/resources/assets/arkiadeco/blockstates/red_planks.json new file mode 100644 index 0000000..8c07a6e --- /dev/null +++ b/src/main/resources/assets/arkiadeco/blockstates/red_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "arkiadeco:block/red_planks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/lang/en_us.json b/src/main/resources/assets/arkiadeco/lang/en_us.json index cfe5f25..27bd336 100644 --- a/src/main/resources/assets/arkiadeco/lang/en_us.json +++ b/src/main/resources/assets/arkiadeco/lang/en_us.json @@ -1,5 +1,8 @@ { "item.arkiadeco.test_item": "Test Item", "item.arkiadeco.test_stick": "Test Stick", - "block.arkiadeco.blue_wood": "Blue Wood" + "block.arkiadeco.blue_planks": "Blue Planks", + "block.arkiadeco.red_planks": "Red Planks", + "block.arkiadeco.pink_planks": "Pink Planks", + "block.arkiadeco.purple_planks": "Purple Planks" } \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/lang/fr_fr.json b/src/main/resources/assets/arkiadeco/lang/fr_fr.json index e040af8..ac83cb7 100644 --- a/src/main/resources/assets/arkiadeco/lang/fr_fr.json +++ b/src/main/resources/assets/arkiadeco/lang/fr_fr.json @@ -1,5 +1,8 @@ { "item.arkiadeco.test_item": "Item de Test", "item.arkiadeco.test_stick": "Bâton de Test", - "block.arkiadeco.blue_wood": "Bois Bleu" + "block.arkiadeco.blue_planks": "Planche Bleu", + "block.arkiadeco.red_planks": "Planche Rouge", + "block.arkiadeco.pink_planks": "Planche Rose", + "block.arkiadeco.purple_planks": "Planche Violette" } \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/block/blue_planks.json b/src/main/resources/assets/arkiadeco/models/block/blue_planks.json new file mode 100644 index 0000000..9fc1279 --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/block/blue_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "arkiadeco:block/blue_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/block/pink_planks.json b/src/main/resources/assets/arkiadeco/models/block/pink_planks.json new file mode 100644 index 0000000..c1eb0a9 --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/block/pink_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "arkiadeco:block/pink_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/block/purple_planks.json b/src/main/resources/assets/arkiadeco/models/block/purple_planks.json new file mode 100644 index 0000000..2553ae3 --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/block/purple_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "arkiadeco:block/purple_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/block/blue_wood.json b/src/main/resources/assets/arkiadeco/models/block/red_planks.json similarity index 56% rename from src/main/resources/assets/arkiadeco/models/block/blue_wood.json rename to src/main/resources/assets/arkiadeco/models/block/red_planks.json index cb99cbf..54cb3e4 100644 --- a/src/main/resources/assets/arkiadeco/models/block/blue_wood.json +++ b/src/main/resources/assets/arkiadeco/models/block/red_planks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "arkiadeco:block/blue_wood" + "all": "arkiadeco:block/red_planks" } } \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/item/blue_planks.json b/src/main/resources/assets/arkiadeco/models/item/blue_planks.json new file mode 100644 index 0000000..e5aac43 --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/item/blue_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "arkiadeco:block/blue_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/item/blue_wood.json b/src/main/resources/assets/arkiadeco/models/item/blue_wood.json deleted file mode 100644 index 061ddf1..0000000 --- a/src/main/resources/assets/arkiadeco/models/item/blue_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "arkiadeco:block/blue_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/item/pink_planks.json b/src/main/resources/assets/arkiadeco/models/item/pink_planks.json new file mode 100644 index 0000000..1fbc93a --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/item/pink_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "arkiadeco:block/pink_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/item/purple_planks.json b/src/main/resources/assets/arkiadeco/models/item/purple_planks.json new file mode 100644 index 0000000..ce7cd6f --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/item/purple_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "arkiadeco:block/purple_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/models/item/red_planks.json b/src/main/resources/assets/arkiadeco/models/item/red_planks.json new file mode 100644 index 0000000..8edd78e --- /dev/null +++ b/src/main/resources/assets/arkiadeco/models/item/red_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "arkiadeco:block/red_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/arkiadeco/textures/block/blue_planks.png b/src/main/resources/assets/arkiadeco/textures/block/blue_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..2c90316c2d19362bd36ed123fe2d69b31df6b298 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFPZUz=l}lW3eAEy1)$3#fpzz$3Dlfr0NZ2s0kf zUy%Y7Eb(-443W4j+Ix|gS&_$CwvSQBlzBl1Z`8m3NxXg=7;o0M1ik+I^CX+<=EJNf z+7$~7BKCf6{kCO>wb-TWt3-DmyyBiNFy|?2koy@i!}*UzHcqbbTCti>q)_~0kA?N_ vwGO_j(YoLEU!3i+VD7Ptvej?PZwuN7_=^0tSiw~Uw4cG#)z4*}Q$iB}B70cZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/arkiadeco/textures/block/blue_wood.png b/src/main/resources/assets/arkiadeco/textures/block/blue_wood.png deleted file mode 100644 index 14c5d7103f49322be12e6f81f406fc996dccbe0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmV;=0WkiFP)1@@ z*-`>Q429u-AYot@24MuZTc1r3WdOBs-!6SZzn-?JN?o=U-t($ zbc@k0NSdC0h?b*WbMeg|jUOFV^2gI>)?EIO6CoWtC`FRW^0EcS2c{K=rJRUx`Vkaq zxq&F0Fk zfTbKW7%$LZhmZ`du*N>cnu?(S3*EUuA8P;r002ovPDHLk FV1g}B)Gq)4 diff --git a/src/main/resources/assets/arkiadeco/textures/block/oak_planks.png b/src/main/resources/assets/arkiadeco/textures/block/oak_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..5de38610602e3601a4a45948d5adac0df927af07 GIT binary patch literal 268 zcmV+n0rUQeP)d}))YiJcst*L_5hXWb9mRfl3ayPp=~$O_3b zeNKfj-ajZPAnST0RprC^c?Aht3F*2Zxuymg&m8!iy-GFv)T4Lcqsw-4gl?q~Ds`*b zXMA+v9IHL>nD2xD%{#SFg=#N67r%Bq+s!o>;EDMk_#RaH3=NW->*1PI`|$>T?sCRx SFZvV!0000ImhEE{GG$)S!5j6je-f|X2F9E9EkUpU{yfR1y7@5c ziFU;TgNVJKTfc3YVJ&v)`YO?#2d}uN3(R@S8svUP%y9l=k&TmUyjHB{6Dbt`*kfV6 wd#!`7YP9aR{TF9@ESP)jqHOis^4o&;0lp%?Emm+90qtk-boFyt=akR{0Arh4q5uE@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/arkiadeco/textures/block/purple_planks.png b/src/main/resources/assets/arkiadeco/textures/block/purple_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..4c8c658679fcab0d999ee9bb57cb7e6298edeee4 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF3|8zISrQv@+j@nuv}x$I5WiB9BFjK*n+wctjR6Fz_7)VaDV6 zD^h@hC7v#hArhBGdoS`bEAlwY_Av^XGB4=hjr!L=iPvufq8aD^~M~6pDZBv9R8~ v*1=abTKC)ji?clz%sqBdw)$=PZ9)40UyO>_%)r10Wb++n zJf6QI1t?hJ>Eak7aapwYA}_NdkF#taqmU`{f)3uOfBlnq{WdV(tZxZ={rBfdHr36C zSx>Yp78peA{oML(%M5F=OV?M4?mT$KJzZeVQ`R8&Gh&AGAB$|9T;sK3HJ?bK_{Sa# x>)mS|d{v`$zwN&`+hf7pV;5zs-