From 33375097fe8ddaaf144a5ab8747fdbf16dcb1c16 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 2 Nov 2023 18:24:35 +0000 Subject: [PATCH] Added bedsheets for all the remaining colours and added recipes for them --- .../unicopia/block/FancyBedBlock.java | 42 +++++++++++++++---- .../minelittlepony/unicopia/item/UItems.java | 28 ++++++++++--- .../resources/assets/unicopia/lang/en_us.json | 18 ++++++-- .../models/item/black_bed_sheets.json | 6 +++ .../models/item/brown_bed_sheets.json | 6 +++ .../unicopia/models/item/cyan_bed_sheets.json | 6 +++ .../unicopia/models/item/gray_bed_sheets.json | 6 +++ .../models/item/green_bed_sheets.json | 6 +++ .../models/item/light_blue_bed_sheets.json | 6 +++ .../models/item/light_gray_bed_sheets.json | 6 +++ .../unicopia/models/item/lime_bed_sheets.json | 6 +++ .../models/item/magenta_bed_sheets.json | 6 +++ .../models/item/purple_bed_sheets.json | 6 +++ .../models/item/yellow_bed_sheets.json | 6 +++ .../unicopia/recipes/bed_sheets/apple.json | 21 ++++++++++ .../data/unicopia/recipes/bed_sheets/bar.json | 21 ++++++++++ .../unicopia/recipes/bed_sheets/black.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/blue.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/brown.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/checker.json | 21 ++++++++++ .../unicopia/recipes/bed_sheets/cyan.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/gray.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/green.json | 18 ++++++++ .../recipes/bed_sheets/light_blue.json | 18 ++++++++ .../recipes/bed_sheets/light_gray.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/lime.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/magenta.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/orange.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/pink.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/purple.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/rainbow.json | 36 ++++++++++++++++ .../data/unicopia/recipes/bed_sheets/red.json | 18 ++++++++ .../unicopia/recipes/bed_sheets/yellow.json | 18 ++++++++ .../data/unicopia/recipes/cloth_bed.json | 20 +++++++++ .../data/unicopia/recipes/cloud_bed.json | 20 +++++++++ .../data/unicopia/tags/items/bed_sheets.json | 26 ++++++++++++ .../tags/items/groups/earth_pony.json | 4 +- .../unicopia/tags/items/groups/pegasus.json | 2 + 38 files changed, 578 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/unicopia/models/item/black_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/green_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json create mode 100644 src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/apple.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/bar.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/black.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/blue.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/brown.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/checker.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/cyan.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/gray.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/green.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/light_blue.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/light_gray.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/lime.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/magenta.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/orange.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/pink.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/purple.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/rainbow.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/red.json create mode 100644 src/main/resources/data/unicopia/recipes/bed_sheets/yellow.json create mode 100644 src/main/resources/data/unicopia/recipes/cloth_bed.json create mode 100644 src/main/resources/data/unicopia/recipes/cloud_bed.json create mode 100644 src/main/resources/data/unicopia/tags/items/bed_sheets.json diff --git a/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java index 1ff86b42..160290aa 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java @@ -2,6 +2,8 @@ package com.minelittlepony.unicopia.block; import java.util.Locale; +import org.jetbrains.annotations.Nullable; + import com.minelittlepony.unicopia.item.BedsheetsItem; import net.minecraft.block.BedBlock; @@ -94,19 +96,43 @@ public class FancyBedBlock extends BedBlock { } public enum SheetPattern implements StringIdentifiable { - NONE, - APPLE, - BARS, - BLUE, - CHECKER, - ORANGE, - PINK, - RAINBOW; + NONE(DyeColor.WHITE), + LIGHT_GRAY(DyeColor.LIGHT_GRAY), + GRAY(DyeColor.GRAY), + BLACK(DyeColor.BLACK), + BROWN(DyeColor.BROWN), + RED(DyeColor.RED), + ORANGE(DyeColor.ORANGE),// + YELLOW(DyeColor.YELLOW), + LIME(DyeColor.LIME), + GREEN(DyeColor.GREEN), + CYAN(DyeColor.CYAN), + LIGHT_BLUE(DyeColor.LIGHT_BLUE), + BLUE(DyeColor.BLUE),// + PURPLE(DyeColor.PURPLE), + MAGENTA(DyeColor.MAGENTA), + PINK(DyeColor.PINK), // + + APPLE(null), + BARS(null), + CHECKER(null), + RAINBOW(null); @SuppressWarnings("deprecation") public static final Codec CODEC = StringIdentifiable.createCodec(SheetPattern::values); private final String name = name().toLowerCase(Locale.ROOT); + @Nullable + private final DyeColor color; + + SheetPattern(@Nullable DyeColor color) { + this.color = color; + } + + @Nullable + public DyeColor getColor() { + return color; + } @Override public String asString() { diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 35caa19d..e6500884 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.item; import com.google.common.collect.ImmutableMultimap; import com.minelittlepony.unicopia.*; +import com.minelittlepony.unicopia.block.FancyBedBlock.SheetPattern; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.block.UWoodTypes; import com.minelittlepony.unicopia.block.cloud.CloudBedBlock; @@ -161,13 +162,26 @@ public interface UItems { Item GIANT_BALLOON = register("giant_balloon", new HotAirBalloonItem(new Item.Settings().maxCount(1)), ItemGroups.TOOLS); - Item APPLE_BED_SHEETS = register("apple_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.APPLE, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); + Item LIGHT_GRAY_BED_SHEETS = register(CloudBedBlock.SheetPattern.LIGHT_GRAY); + Item GRAY_BED_SHEETS = register(CloudBedBlock.SheetPattern.GRAY); + Item BLACK_BED_SHEETS = register(CloudBedBlock.SheetPattern.BLACK); + Item BROWN_BED_SHEETS = register(CloudBedBlock.SheetPattern.BROWN); + Item RED_BED_SHEETS = register(CloudBedBlock.SheetPattern.RED); + Item ORANGE_BED_SHEETS = register(CloudBedBlock.SheetPattern.ORANGE); + Item YELLOW_BED_SHEETS = register(CloudBedBlock.SheetPattern.YELLOW); + Item LIME_BED_SHEETS = register(CloudBedBlock.SheetPattern.LIME); + Item GREEN_BED_SHEETS = register(CloudBedBlock.SheetPattern.GREEN); + Item CYAN_BED_SHEETS = register(CloudBedBlock.SheetPattern.CYAN); + Item LIGHT_BLUE_BED_SHEETS = register(CloudBedBlock.SheetPattern.LIGHT_BLUE); + Item BLUE_SHEETS = register(CloudBedBlock.SheetPattern.BLUE); + Item PURPLE_BED_SHEETS = register(CloudBedBlock.SheetPattern.PURPLE); + Item MAGENTA_BED_SHEETS = register(CloudBedBlock.SheetPattern.MAGENTA); + Item PINK_BED_SHEETS = register(CloudBedBlock.SheetPattern.PINK); + + Item APPLE_BED_SHEETS = register(CloudBedBlock.SheetPattern.APPLE); Item BARRED_BED_SHEETS = register("barred_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.BARS, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); - Item BLUE_BED_SHEETS = register("blue_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.BLUE, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); Item CHECKERED_BED_SHEETS = register("checkered_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.CHECKER, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); - Item ORANGE_BED_SHEETS = register("orange_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.ORANGE, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); - Item PINK_BED_SHEETS = register("pink_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.PINK, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); - Item RAINBOW_BED_SHEETS = register("rainbow_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.RAINBOW, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); + Item RAINBOW_BED_SHEETS = register(CloudBedBlock.SheetPattern.RAINBOW); AmuletItem PEGASUS_AMULET = register("pegasus_amulet", new PegasusAmuletItem(new FabricItemSettings() .maxCount(1) @@ -217,6 +231,10 @@ public interface UItems { return Registry.register(Registries.ITEM, race.getId().withPath(p -> p + "_badge"), new Item(new Settings())); } + static Item register(SheetPattern pattern) { + return register(pattern.asString() + "_bed_sheets", new BedsheetsItem(pattern, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); + } + static void bootstrap() { AppleItem.registerTickCallback(Items.APPLE); FuelRegistry.INSTANCE.add(WOODEN_POLEARM, 200); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 922f990f..984bf240 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -176,12 +176,24 @@ "item.unicopia.music_disc_funk": "Music Disc", "item.unicopia.music_disc_funk.desc": "funk, just funk", + "item.unicopia.light_gray_bed_sheets": "Light Gray Bed Sheets", + "item.unicopia.gray_bed_sheets": "Gray Bed Sheets", + "item.unicopia.black_bed_sheets": "Black Bed Sheets", + "item.unicopia.brown_bed_sheets": "Brown Bed Sheets", + "item.unicopia.red_bed_sheets": "Red Bed Sheets", + "item.unicopia.orange_bed_sheets": "Orange Bed Sheets", + "item.unicopia.yellow_bed_sheets": "Yellow Bed Sheets", + "item.unicopia.lime_bed_sheets": "Lime Bed Sheets", + "item.unicopia.green_bed_sheets": "Green Bed Sheets", + "item.unicopia.cyan_bed_sheets": "Cyan Bed Sheets", + "item.unicopia.light_blue_bed_sheets": "Light Blue Bed Sheets", + "item.unicopia.blue_bed_sheets": "Blue Bed Sheets", + "item.unicopia.purple_bed_sheets": "Purple Bed Sheets", + "item.unicopia.magenta_bed_sheets": "Magenta Bed Sheets", + "item.unicopia.pink_bed_sheets": "Pink Bed Sheets", "item.unicopia.apple_bed_sheets": "Apple Patterned Bed Sheets", "item.unicopia.barred_bed_sheets": "Bar Patterned Bed Sheets", - "item.unicopia.blue_bed_sheets": "Blue Bed Sheets", "item.unicopia.checkered_bed_sheets": "Checker Patterned Bed Sheets", - "item.unicopia.orange_bed_sheets": "Orange Bed Sheets", - "item.unicopia.pink_bed_sheets": "Pink Bed Sheets", "item.unicopia.rainbow_bed_sheets": "Rainbow Patterned Bed Sheets", "block.unicopia.rocks": "Rocks", diff --git a/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json new file mode 100644 index 00000000..3744c6d5 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/orange_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json new file mode 100644 index 00000000..e731713b --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/brown_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json new file mode 100644 index 00000000..21cbb8fd --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/cyan_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json new file mode 100644 index 00000000..d14789b7 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/gray_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/green_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/green_bed_sheets.json new file mode 100644 index 00000000..6675e779 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/green_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/green_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json new file mode 100644 index 00000000..362dbebd --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/light_blue_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json new file mode 100644 index 00000000..e5aa977e --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/light_gray_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json new file mode 100644 index 00000000..0b5188f0 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/lime_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json new file mode 100644 index 00000000..3af7061c --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/magenta_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json new file mode 100644 index 00000000..19c466aa --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/purple_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json new file mode 100644 index 00000000..28d94756 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/yellow_bed_sheets" + } +} diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/apple.json b/src/main/resources/data/unicopia/recipes/bed_sheets/apple.json new file mode 100644 index 00000000..59c07b8a --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/apple.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "#%#", + "% %", + " %#" + ], + "key": { + "#": { + "item": "minecraft:green_wool" + }, + "%": { + "item": "minecraft:lime_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:apple_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/bar.json b/src/main/resources/data/unicopia/recipes/bed_sheets/bar.json new file mode 100644 index 00000000..c851297e --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/bar.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "#%#", + "% %", + " %#" + ], + "key": { + "#": { + "item": "minecraft:light_blue_wool" + }, + "%": { + "item": "minecraft:white_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:barred_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/black.json b/src/main/resources/data/unicopia/recipes/bed_sheets/black.json new file mode 100644 index 00000000..9bc645a0 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/black.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:black_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:black_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/blue.json b/src/main/resources/data/unicopia/recipes/bed_sheets/blue.json new file mode 100644 index 00000000..a327c38e --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/blue.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:blue_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:blue_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/brown.json b/src/main/resources/data/unicopia/recipes/bed_sheets/brown.json new file mode 100644 index 00000000..873eee0a --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/brown.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:brown_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:brown_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/checker.json b/src/main/resources/data/unicopia/recipes/bed_sheets/checker.json new file mode 100644 index 00000000..eb41d549 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/checker.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "#%#", + "% %", + " %#" + ], + "key": { + "#": { + "item": "minecraft:green_wool" + }, + "%": { + "item": "minecraft:brown_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:checkered_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/cyan.json b/src/main/resources/data/unicopia/recipes/bed_sheets/cyan.json new file mode 100644 index 00000000..55d27f39 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/cyan.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:cyan_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:cyan_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/gray.json b/src/main/resources/data/unicopia/recipes/bed_sheets/gray.json new file mode 100644 index 00000000..c22908d1 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/gray.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:gray_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:gray_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/green.json b/src/main/resources/data/unicopia/recipes/bed_sheets/green.json new file mode 100644 index 00000000..44cefb48 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/green.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:green_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:green_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/light_blue.json b/src/main/resources/data/unicopia/recipes/bed_sheets/light_blue.json new file mode 100644 index 00000000..7da12483 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/light_blue.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:light_blue_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:light_blue_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/light_gray.json b/src/main/resources/data/unicopia/recipes/bed_sheets/light_gray.json new file mode 100644 index 00000000..2762e0a7 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/light_gray.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:light_gray_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:light_gray_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/lime.json b/src/main/resources/data/unicopia/recipes/bed_sheets/lime.json new file mode 100644 index 00000000..88734f2c --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/lime.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:lime_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:lime_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/magenta.json b/src/main/resources/data/unicopia/recipes/bed_sheets/magenta.json new file mode 100644 index 00000000..eb70f444 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/magenta.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:magenta_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:magenta_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/orange.json b/src/main/resources/data/unicopia/recipes/bed_sheets/orange.json new file mode 100644 index 00000000..3fa98370 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/orange.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:orange_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:orange_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/pink.json b/src/main/resources/data/unicopia/recipes/bed_sheets/pink.json new file mode 100644 index 00000000..2d93ece3 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/pink.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:pink_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:pink_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/purple.json b/src/main/resources/data/unicopia/recipes/bed_sheets/purple.json new file mode 100644 index 00000000..ab41e3ad --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/purple.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:purple_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:purple_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/rainbow.json b/src/main/resources/data/unicopia/recipes/bed_sheets/rainbow.json new file mode 100644 index 00000000..16b2493b --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/rainbow.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "ROY", + "L B", + " PG" + ], + "key": { + "Y": { + "item": "minecraft:yellow_wool" + }, + "O": { + "item": "minecraft:orange_wool" + }, + "R": { + "item": "minecraft:red_wool" + }, + "G": { + "item": "minecraft:green_wool" + }, + "B": { + "item": "minecraft:blue_wool" + }, + "P": { + "item": "minecraft:purple_wool" + }, + "L": { + "item": "minecraft:light_blue_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:rainbow_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/red.json b/src/main/resources/data/unicopia/recipes/bed_sheets/red.json new file mode 100644 index 00000000..ef489f95 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/red.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:red_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:red_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bed_sheets/yellow.json b/src/main/resources/data/unicopia/recipes/bed_sheets/yellow.json new file mode 100644 index 00000000..84bdbe03 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/bed_sheets/yellow.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed_sheets", + "pattern": [ + "###", + "# #", + " ##" + ], + "key": { + "#": { + "item": "minecraft:yellow_wool" + } + }, + "result": { + "count": 1, + "item": "unicopia:yellow_bed_sheets" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/cloth_bed.json b/src/main/resources/data/unicopia/recipes/cloth_bed.json new file mode 100644 index 00000000..54ba7a7f --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/cloth_bed.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed", + "pattern": [ + "^^^", + "###" + ], + "key": { + "^": { + "tag": "minecraft:wool" + }, + "#": { + "tag": "minecraft:logs" + } + }, + "result": { + "count": 1, + "item": "unicopia:cloth_bed" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/cloud_bed.json b/src/main/resources/data/unicopia/recipes/cloud_bed.json new file mode 100644 index 00000000..93b131a8 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/cloud_bed.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bed", + "pattern": [ + "^^^", + "###" + ], + "key": { + "^": { + "item": "unicopia:cloud" + }, + "#": { + "item": "unicopia:cloud_planks" + } + }, + "result": { + "count": 1, + "item": "unicopia:cloud_bed" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/tags/items/bed_sheets.json b/src/main/resources/data/unicopia/tags/items/bed_sheets.json new file mode 100644 index 00000000..99f4c7d3 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/bed_sheets.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "unicopia:light_gray_bed_sheets", + "unicopia:gray_bed_sheets", + "unicopia:black_bed_sheets", + "unicopia:brown_bed_sheets", + "unicopia:red_bed_sheets", + "unicopia:orange_bed_sheets", + "unicopia:yellow_bed_sheets", + "unicopia:lime_bed_sheets", + "unicopia:green_bed_sheets", + "unicopia:cyan_bed_sheets", + "unicopia:light_blue_bed_sheets", + "unicopia:blue_bed_sheets", + "unicopia:purple_bed_sheets", + "unicopia:magenta_bed_sheets", + "unicopia:pink_bed_sheets", + + + "unicopia:apple_bed_sheets", + "unicopia:barred_bed_sheets", + "unicopia:checkered_bed_sheets", + "unicopia:rainbow_bed_sheets" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json b/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json index be47a5df..84d6b64b 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json +++ b/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json @@ -61,6 +61,8 @@ "unicopia:apple_pie_slice", "unicopia:weather_vane", "#unicopia:baskets", - "unicopia:giant_balloon" + "unicopia:giant_balloon", + "unicopia:cloth_bed", + "#unicopia:bed_sheets" ] } diff --git a/src/main/resources/data/unicopia/tags/items/groups/pegasus.json b/src/main/resources/data/unicopia/tags/items/groups/pegasus.json index ec1deffc..2d058cba 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/pegasus.json +++ b/src/main/resources/data/unicopia/tags/items/groups/pegasus.json @@ -12,6 +12,8 @@ "unicopia:dense_cloud_stairs", "unicopia:unstable_cloud", "unicopia:cloud_pillar", + "unicopia:cloud_bed", + "#unicopia:bed_sheets", "#unicopia:food_types/raw_fish", "#unicopia:food_types/cooked_fish", "unicopia:rain_cloud_jar",