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 0000000..b93dbe0 Binary files /dev/null and b/src/main/resources/assets/cherry/textures/block/stripped_cherry_log.png differ diff --git a/src/main/resources/assets/cherry/textures/block/stripped_cherry_log_top.png b/src/main/resources/assets/cherry/textures/block/stripped_cherry_log_top.png new file mode 100644 index 0000000..7910f2c Binary files /dev/null and b/src/main/resources/assets/cherry/textures/block/stripped_cherry_log_top.png differ 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