From 217b0b2c3ec2344bba5cdf9ed1e1fce4522e49c1 Mon Sep 17 00:00:00 2001 From: Justin Parsell Date: Fri, 26 Feb 2021 23:08:08 -0500 Subject: [PATCH] introduction of log variants --- .../net/parsell/cherry/core/CherryBlocks.java | 4 ++++ .../net/parsell/cherry/core/CherryItems.java | 3 +++ .../cherry/blockstates/cherry_wood.json | 16 ++++++++++++++ .../blockstates/stripped_cherry_log.json | 16 ++++++++++++++ .../blockstates/stripped_cherry_wood.json | 16 ++++++++++++++ .../resources/assets/cherry/lang/en_us.json | 3 +++ .../cherry/models/block/cherry_wood.json | 7 ++++++ .../models/block/stripped_cherry_log.json | 7 ++++++ .../models/block/stripped_cherry_wood.json | 7 ++++++ .../cherry/models/item/cherry_wood.json | 4 ++++ .../models/item/stripped_cherry_log.json | 4 ++++ .../models/item/stripped_cherry_wood.json | 4 ++++ .../textures/block/stripped_cherry_log.png | Bin 0 -> 14746 bytes .../block/stripped_cherry_log_top.png | Bin 0 -> 14800 bytes .../loot_tables/blocks/cherry_planks.json | 20 ++++++++++++++++++ .../loot_tables/blocks/cherry_wood.json | 20 ++++++++++++++++++ .../blocks/stripped_cherry_log.json | 20 ++++++++++++++++++ .../blocks/stripped_cherry_wood.json | 20 ++++++++++++++++++ .../data/cherry/recipes/cherry_wood.json | 17 +++++++++++++++ .../cherry/recipes/stripped_cherry_wood.json | 17 +++++++++++++++ .../data/cherry/tags/blocks/cherry_logs.json | 5 ++++- .../data/cherry/tags/items/cherry_logs.json | 7 ++++-- 22 files changed, 214 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/cherry/blockstates/cherry_wood.json create mode 100644 src/main/resources/assets/cherry/blockstates/stripped_cherry_log.json create mode 100644 src/main/resources/assets/cherry/blockstates/stripped_cherry_wood.json create mode 100644 src/main/resources/assets/cherry/models/block/cherry_wood.json create mode 100644 src/main/resources/assets/cherry/models/block/stripped_cherry_log.json create mode 100644 src/main/resources/assets/cherry/models/block/stripped_cherry_wood.json create mode 100644 src/main/resources/assets/cherry/models/item/cherry_wood.json create mode 100644 src/main/resources/assets/cherry/models/item/stripped_cherry_log.json create mode 100644 src/main/resources/assets/cherry/models/item/stripped_cherry_wood.json create mode 100644 src/main/resources/assets/cherry/textures/block/stripped_cherry_log.png create mode 100644 src/main/resources/assets/cherry/textures/block/stripped_cherry_log_top.png create mode 100644 src/main/resources/data/cherry/loot_tables/blocks/cherry_planks.json create mode 100644 src/main/resources/data/cherry/loot_tables/blocks/cherry_wood.json create mode 100644 src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_log.json create mode 100644 src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_wood.json create mode 100644 src/main/resources/data/cherry/recipes/cherry_wood.json create mode 100644 src/main/resources/data/cherry/recipes/stripped_cherry_wood.json diff --git a/src/main/java/net/parsell/cherry/core/CherryBlocks.java b/src/main/java/net/parsell/cherry/core/CherryBlocks.java index 751ec15..f014cf4 100644 --- a/src/main/java/net/parsell/cherry/core/CherryBlocks.java +++ b/src/main/java/net/parsell/cherry/core/CherryBlocks.java @@ -7,11 +7,15 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.LeavesBlock; import net.minecraft.block.PillarBlock; +import net.minecraft.item.AxeItem; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class CherryBlocks { public static final Block CHERRYLOG = registerPillar("cherry_log", FabricBlockSettings.copyOf(Blocks.OAK_LOG), 5, 5); + public static final Block CHERRYWOOD = registerPillar("cherry_wood", FabricBlockSettings.copyOf(Blocks.OAK_WOOD), 5, 5); + public static final Block CHERRYLOGSTRIPPED = registerPillar("stripped_cherry_log", FabricBlockSettings.copyOf(Blocks.STRIPPED_OAK_LOG), 5, 5); + public static final Block CHERRYWOODSTRIPPED = registerPillar("stripped_cherry_wood", FabricBlockSettings.copyOf(Blocks.STRIPPED_OAK_WOOD), 5, 5); public static final Block CHERRYLEAVES = registerLeaves("cherry_leaves", FabricBlockSettings.copyOf(Blocks.OAK_LEAVES), 30, 60, 6649929); public static final Block CHERRYPLANKS = registerBlock("cherry_planks", FabricBlockSettings.copyOf(Blocks.OAK_PLANKS), 5, 20); diff --git a/src/main/java/net/parsell/cherry/core/CherryItems.java b/src/main/java/net/parsell/cherry/core/CherryItems.java index 945b5d8..832a3e2 100644 --- a/src/main/java/net/parsell/cherry/core/CherryItems.java +++ b/src/main/java/net/parsell/cherry/core/CherryItems.java @@ -11,6 +11,9 @@ import net.minecraft.util.registry.Registry; public class CherryItems { private static void registerBlockItems(){ registerBlockItem("cherry_log", CherryBlocks.CHERRYLOG, ItemGroup.BUILDING_BLOCKS); + registerBlockItem("cherry_wood", CherryBlocks.CHERRYWOOD, ItemGroup.BUILDING_BLOCKS); + registerBlockItem("stripped_cherry_log", CherryBlocks.CHERRYLOGSTRIPPED, ItemGroup.BUILDING_BLOCKS); + registerBlockItem("stripped_cherry_wood", CherryBlocks.CHERRYWOODSTRIPPED, ItemGroup.BUILDING_BLOCKS); registerBlockItem("cherry_leaves", CherryBlocks.CHERRYLEAVES, ItemGroup.BUILDING_BLOCKS, 6649929); registerBlockItem("cherry_planks", CherryBlocks.CHERRYPLANKS, ItemGroup.BUILDING_BLOCKS); } diff --git a/src/main/resources/assets/cherry/blockstates/cherry_wood.json b/src/main/resources/assets/cherry/blockstates/cherry_wood.json new file mode 100644 index 0000000..26d52ba --- /dev/null +++ b/src/main/resources/assets/cherry/blockstates/cherry_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "cherry:block/cherry_wood" + }, + "axis=z": { + "model": "cherry:block/cherry_wood", + "x": 90 + }, + "axis=x": { + "model": "cherry:block/cherry_wood", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/blockstates/stripped_cherry_log.json b/src/main/resources/assets/cherry/blockstates/stripped_cherry_log.json new file mode 100644 index 0000000..c3610f5 --- /dev/null +++ b/src/main/resources/assets/cherry/blockstates/stripped_cherry_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "cherry:block/stripped_cherry_log" + }, + "axis=z": { + "model": "cherry:block/stripped_cherry_log", + "x": 90 + }, + "axis=x": { + "model": "cherry:block/stripped_cherry_log", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/blockstates/stripped_cherry_wood.json b/src/main/resources/assets/cherry/blockstates/stripped_cherry_wood.json new file mode 100644 index 0000000..0f17aed --- /dev/null +++ b/src/main/resources/assets/cherry/blockstates/stripped_cherry_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "cherry:block/stripped_cherry_wood" + }, + "axis=z": { + "model": "cherry:block/stripped_cherry_wood", + "x": 90 + }, + "axis=x": { + "model": "cherry:block/stripped_cherry_wood", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/lang/en_us.json b/src/main/resources/assets/cherry/lang/en_us.json index e35a38e..4470ec3 100644 --- a/src/main/resources/assets/cherry/lang/en_us.json +++ b/src/main/resources/assets/cherry/lang/en_us.json @@ -1,5 +1,8 @@ { "block.cherry.cherry_log": "Cherry Log", + "block.cherry.cherry_wood": "Cherry Wood", + "block.cherry.stripped_cherry_log": "Stripped Cherry Log", + "block.cherry.stripped_cherry_wood": "Stripped Cherry Wood", "block.cherry.cherry_leaves": "Cherry Leaves", "block.cherry.cherry_planks": "Cherry Planks" } \ No newline at end of file diff --git a/src/main/resources/assets/cherry/models/block/cherry_wood.json b/src/main/resources/assets/cherry/models/block/cherry_wood.json new file mode 100644 index 0000000..f9bd513 --- /dev/null +++ b/src/main/resources/assets/cherry/models/block/cherry_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "cherry:block/cherry_log", + "side": "cherry:block/cherry_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/models/block/stripped_cherry_log.json b/src/main/resources/assets/cherry/models/block/stripped_cherry_log.json new file mode 100644 index 0000000..0b3722d --- /dev/null +++ b/src/main/resources/assets/cherry/models/block/stripped_cherry_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "cherry:block/stripped_cherry_log_top", + "side": "cherry:block/stripped_cherry_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/models/block/stripped_cherry_wood.json b/src/main/resources/assets/cherry/models/block/stripped_cherry_wood.json new file mode 100644 index 0000000..a525cf7 --- /dev/null +++ b/src/main/resources/assets/cherry/models/block/stripped_cherry_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "cherry:block/stripped_cherry_log", + "side": "cherry:block/stripped_cherry_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/models/item/cherry_wood.json b/src/main/resources/assets/cherry/models/item/cherry_wood.json new file mode 100644 index 0000000..28f5faa --- /dev/null +++ b/src/main/resources/assets/cherry/models/item/cherry_wood.json @@ -0,0 +1,4 @@ +{ + "parent": "cherry:block/cherry_wood" +} + diff --git a/src/main/resources/assets/cherry/models/item/stripped_cherry_log.json b/src/main/resources/assets/cherry/models/item/stripped_cherry_log.json new file mode 100644 index 0000000..6a6480b --- /dev/null +++ b/src/main/resources/assets/cherry/models/item/stripped_cherry_log.json @@ -0,0 +1,4 @@ +{ + "parent": "cherry:block/stripped_cherry_log" +} + diff --git a/src/main/resources/assets/cherry/models/item/stripped_cherry_wood.json b/src/main/resources/assets/cherry/models/item/stripped_cherry_wood.json new file mode 100644 index 0000000..6694995 --- /dev/null +++ b/src/main/resources/assets/cherry/models/item/stripped_cherry_wood.json @@ -0,0 +1,4 @@ +{ + "parent": "cherry:block/stripped_cherry_wood" +} + diff --git a/src/main/resources/assets/cherry/textures/block/stripped_cherry_log.png b/src/main/resources/assets/cherry/textures/block/stripped_cherry_log.png new file mode 100644 index 0000000000000000000000000000000000000000..b93dbe0ebf1ad18560cb6378a2bfca0214e20a3d GIT binary patch literal 14746 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 UyJCOm@`_8ZTz&r~FL}-X0lqtx-~a#s literal 0 HcmV?d00001 diff --git a/src/main/resources/data/cherry/loot_tables/blocks/cherry_planks.json b/src/main/resources/data/cherry/loot_tables/blocks/cherry_planks.json new file mode 100644 index 0000000..7de90a5 --- /dev/null +++ b/src/main/resources/data/cherry/loot_tables/blocks/cherry_planks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "cherry:cherry_planks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + diff --git a/src/main/resources/data/cherry/loot_tables/blocks/cherry_wood.json b/src/main/resources/data/cherry/loot_tables/blocks/cherry_wood.json new file mode 100644 index 0000000..f19a2a2 --- /dev/null +++ b/src/main/resources/data/cherry/loot_tables/blocks/cherry_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "cherry:cherry_wood" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + diff --git a/src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_log.json b/src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_log.json new file mode 100644 index 0000000..c3ef2a5 --- /dev/null +++ b/src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_log.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "cherry:stripped_cherry_wood" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + diff --git a/src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_wood.json b/src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_wood.json new file mode 100644 index 0000000..c3ef2a5 --- /dev/null +++ b/src/main/resources/data/cherry/loot_tables/blocks/stripped_cherry_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "cherry:stripped_cherry_wood" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + diff --git a/src/main/resources/data/cherry/recipes/cherry_wood.json b/src/main/resources/data/cherry/recipes/cherry_wood.json new file mode 100644 index 0000000..967af6e --- /dev/null +++ b/src/main/resources/data/cherry/recipes/cherry_wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bark", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cherry:cherry_log" + } + }, + "result": { + "item": "cherry:cherry_wood", + "count": 3 + } + } \ No newline at end of file diff --git a/src/main/resources/data/cherry/recipes/stripped_cherry_wood.json b/src/main/resources/data/cherry/recipes/stripped_cherry_wood.json new file mode 100644 index 0000000..a86e2d2 --- /dev/null +++ b/src/main/resources/data/cherry/recipes/stripped_cherry_wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bark", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cherry:stripped_cherry_log" + } + }, + "result": { + "item": "cherry:stripped_cherry_wood", + "count": 3 + } + } \ No newline at end of file diff --git a/src/main/resources/data/cherry/tags/blocks/cherry_logs.json b/src/main/resources/data/cherry/tags/blocks/cherry_logs.json index 7c766bc..252c1fa 100644 --- a/src/main/resources/data/cherry/tags/blocks/cherry_logs.json +++ b/src/main/resources/data/cherry/tags/blocks/cherry_logs.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "cherry:cherry_log" + "cherry:cherry_log", + "cherry:cherry_wood", + "cherry:stripped_cherry_log", + "cherry:stripped_cherry_wood" ] } diff --git a/src/main/resources/data/cherry/tags/items/cherry_logs.json b/src/main/resources/data/cherry/tags/items/cherry_logs.json index 7c766bc..50333a1 100644 --- a/src/main/resources/data/cherry/tags/items/cherry_logs.json +++ b/src/main/resources/data/cherry/tags/items/cherry_logs.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "cherry:cherry_log" + "cherry:cherry_log", + "cherry:cherry_wood", + "cherry:stripped_cherry_log", + "cherry:stripped_cherry_wood" ] -} +} \ No newline at end of file