diff --git a/src/main/java/me/jonasjones/nec/block/ModBlocks.java b/src/main/java/me/jonasjones/nec/block/ModBlocks.java index efbc2b0..78e5e27 100644 --- a/src/main/java/me/jonasjones/nec/block/ModBlocks.java +++ b/src/main/java/me/jonasjones/nec/block/ModBlocks.java @@ -6,8 +6,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.RotatedPillarBlock; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.material.Material; import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; @@ -22,6 +21,7 @@ public class ModBlocks { public static final Block DEEPSLATE_DIAMOND_ORE_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0F)); public static final Block JAVA_BLOCK = new Block(FabricBlockSettings.of(Material.STONE).strength(5.0F)); public static final Block POCKET_BLOCK = new Block(FabricBlockSettings.of(Material.STONE).strength(5.0F)); + public static Block FLETCHING_STAIRS_BLOCK = null; private static BlockItem GUN_BLOCK_ITEM; private static Block GUN_BLOCK_BLOCK; private static BlockItem BLAZE_BLOCK_ITEM; @@ -36,6 +36,8 @@ public class ModBlocks { public static Block JAVA_BLOCK_BLOCK; public static BlockItem POCKET_BLOCK_ITEM; public static Block POCKET_BLOCK_BLOCK; + public static BlockItem FLETCHING_STAIRS_TIEM; + public static Block FLETCHING_STAIRS_BLOCK_BLOCK; //public static final Block GREEN_BIRCH_WOOD = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); //public static final Block STRIPPED_GREEN_BIRCH_LOG = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); //public static final Block STRIPPED_GREEN_BIRCH_WOOD = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); @@ -68,5 +70,10 @@ public class ModBlocks { POCKET_BLOCK_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "pocket_block"), POCKET_BLOCK); POCKET_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "pocket_block"), new BlockItem(POCKET_BLOCK, new FabricItemSettings())); ModRegistries.register_item(POCKET_BLOCK_ITEM); + + FLETCHING_STAIRS_BLOCK = new StairBlock(GREEEN_BIRCH_LOG_BLOCK.defaultBlockState(), FabricBlockSettings.of(Material.WOOD).strength(1.0F)); + FLETCHING_STAIRS_BLOCK_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "fletching_stairs"), FLETCHING_STAIRS_BLOCK); + FLETCHING_STAIRS_TIEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "fletching_stairs"), new BlockItem(FLETCHING_STAIRS_BLOCK, new FabricItemSettings())); + ModRegistries.register_item(FLETCHING_STAIRS_TIEM); } } diff --git a/src/main/resources/assets/nec/blockstates/fletching_stairs.json b/src/main/resources/assets/nec/blockstates/fletching_stairs.json new file mode 100644 index 0000000..33022f3 --- /dev/null +++ b/src/main/resources/assets/nec/blockstates/fletching_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "nec:block/fletching_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "nec:block/fletching_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "nec:block/fletching_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "nec:block/fletching_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index c43e79f..6f8cbdd 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -6,6 +6,8 @@ "advancements.nec.ak_47.title": "Congrats, You're f*cking useless!", "advancements.nec.dirt_sword.description": "Haha, get it? ... -_-", "advancements.nec.dirt_sword.title": "You are now dirty", + "advancements.nec.fletching_stairs.description": "Craft some Fletching Stairs", + "advancements.nec.fletching_stairs.title": "Finally useful!", "advancements.nec.pocket_block.description": "Craft a Pocket Block", "advancements.nec.pocket_block.title": "It's basically Bedrock", "advancements.nec.java_block.description": "Craft a Java Block", @@ -19,6 +21,7 @@ "block.nec.cursed_dirt": "Cursed Dirt", "block.nec.deepslate_diamond_ore_ore": "Deepslate Diamond Ore Ore", "block.nec.diamond_ore_ore": "Diamond Ore Ore", + "block.nec.fletching_stairs": "Fletching Stairs", "block.nec.green_birch_log": "Green Birch Log", "block.nec.gun_block": "Gun Block", "block.nec.java_block": "Java Block", diff --git a/src/main/resources/assets/nec/models/block/fletching_stairs.json b/src/main/resources/assets/nec/models/block/fletching_stairs.json new file mode 100644 index 0000000..95cd12c --- /dev/null +++ b/src/main/resources/assets/nec/models/block/fletching_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "minecraft:block/birch_planks", + "side": "minecraft:block/fletching_table_side", + "top": "minecraft:block/fletching_table_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nec/models/block/fletching_stairs_inner.json b/src/main/resources/assets/nec/models/block/fletching_stairs_inner.json new file mode 100644 index 0000000..dd16540 --- /dev/null +++ b/src/main/resources/assets/nec/models/block/fletching_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "minecraft:block/birch_planks", + "side": "minecraft:block/fletching_table_side", + "top": "minecraft:block/fletching_table_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nec/models/block/fletching_stairs_outer.json b/src/main/resources/assets/nec/models/block/fletching_stairs_outer.json new file mode 100644 index 0000000..f43d15f --- /dev/null +++ b/src/main/resources/assets/nec/models/block/fletching_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "minecraft:block/birch_planks", + "side": "minecraft:block/fletching_table_side", + "top": "minecraft:block/fletching_table_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nec/models/item/fletching_stairs.json b/src/main/resources/assets/nec/models/item/fletching_stairs.json new file mode 100644 index 0000000..5f919ab --- /dev/null +++ b/src/main/resources/assets/nec/models/item/fletching_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "nec:block/fletching_stairs" +} \ No newline at end of file diff --git a/src/main/resources/data/nec/advancements/fletching_stairs.json b/src/main/resources/data/nec/advancements/fletching_stairs.json new file mode 100644 index 0000000..9effd8a --- /dev/null +++ b/src/main/resources/data/nec/advancements/fletching_stairs.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "nec:fletching_stairs" + }, + "title": { + "translate": "advancements.nec.fletching_stairs.title" + }, + "description": { + "translate": "advancements.nec.fletching_stairs.description" + }, + "frame": "task", + "show_toast": true, + "annouce_to_chat": true + }, + "parent": "nec:nec", + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "nec:fletching_stairs" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/fletching_stairs.json b/src/main/resources/data/nec/recipes/fletching_stairs.json new file mode 100644 index 0000000..750e87c --- /dev/null +++ b/src/main/resources/data/nec/recipes/fletching_stairs.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A ", + "AA ", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:fletching_table" + } + }, + "result": { + "item": "nec:fletching_stairs", + "count": 4 + } +} \ No newline at end of file