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 0000000..2c90316 Binary files /dev/null and b/src/main/resources/assets/arkiadeco/textures/block/blue_planks.png differ 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 14c5d71..0000000 Binary files a/src/main/resources/assets/arkiadeco/textures/block/blue_wood.png and /dev/null differ 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 0000000..5de3861 Binary files /dev/null and b/src/main/resources/assets/arkiadeco/textures/block/oak_planks.png differ diff --git a/src/main/resources/assets/arkiadeco/textures/block/pink_planks.png b/src/main/resources/assets/arkiadeco/textures/block/pink_planks.png new file mode 100644 index 0000000..9a88b25 Binary files /dev/null and b/src/main/resources/assets/arkiadeco/textures/block/pink_planks.png differ 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 0000000..4c8c658 Binary files /dev/null and b/src/main/resources/assets/arkiadeco/textures/block/purple_planks.png differ diff --git a/src/main/resources/assets/arkiadeco/textures/block/red_planks.png b/src/main/resources/assets/arkiadeco/textures/block/red_planks.png new file mode 100644 index 0000000..a77b2aa Binary files /dev/null and b/src/main/resources/assets/arkiadeco/textures/block/red_planks.png differ diff --git a/src/main/resources/data/arkiadeco/loot_tables/blocks/blue_planks.json b/src/main/resources/data/arkiadeco/loot_tables/blocks/blue_planks.json new file mode 100644 index 0000000..d56e2d1 --- /dev/null +++ b/src/main/resources/data/arkiadeco/loot_tables/blocks/blue_planks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "arkiadeco:blue_planks" + } + ], + "conditions": [ + { + "conditions": "minecraft:survives_explosions" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/arkiadeco/loot_tables/blocks/pink_planks.json b/src/main/resources/data/arkiadeco/loot_tables/blocks/pink_planks.json new file mode 100644 index 0000000..c011b9f --- /dev/null +++ b/src/main/resources/data/arkiadeco/loot_tables/blocks/pink_planks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "arkiadeco:pink_planks" + } + ], + "conditions": [ + { + "conditions": "minecraft:survives_explosions" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/arkiadeco/loot_tables/blocks/purple_planks.json b/src/main/resources/data/arkiadeco/loot_tables/blocks/purple_planks.json new file mode 100644 index 0000000..394dfa0 --- /dev/null +++ b/src/main/resources/data/arkiadeco/loot_tables/blocks/purple_planks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "arkiadeco:purple_planks" + } + ], + "conditions": [ + { + "conditions": "minecraft:survives_explosions" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/arkiadeco/loot_tables/blocks/blue_wood.json b/src/main/resources/data/arkiadeco/loot_tables/blocks/red_planks.json similarity index 86% rename from src/main/resources/data/arkiadeco/loot_tables/blocks/blue_wood.json rename to src/main/resources/data/arkiadeco/loot_tables/blocks/red_planks.json index 800b1d1..51eaf7d 100644 --- a/src/main/resources/data/arkiadeco/loot_tables/blocks/blue_wood.json +++ b/src/main/resources/data/arkiadeco/loot_tables/blocks/red_planks.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "arkiadeco:blue_wool" + "name": "arkiadeco:red_planks" } ], "conditions": [