diff --git a/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java index 160290aa..b3494074 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java @@ -102,21 +102,26 @@ public class FancyBedBlock extends BedBlock { BLACK(DyeColor.BLACK), BROWN(DyeColor.BROWN), RED(DyeColor.RED), - ORANGE(DyeColor.ORANGE),// + ORANGE(DyeColor.ORANGE), YELLOW(DyeColor.YELLOW), LIME(DyeColor.LIME), GREEN(DyeColor.GREEN), CYAN(DyeColor.CYAN), LIGHT_BLUE(DyeColor.LIGHT_BLUE), - BLUE(DyeColor.BLUE),// + BLUE(DyeColor.BLUE), PURPLE(DyeColor.PURPLE), MAGENTA(DyeColor.MAGENTA), - PINK(DyeColor.PINK), // + PINK(DyeColor.PINK), APPLE(null), BARS(null), CHECKER(null), - RAINBOW(null); + KELP(null), + RAINBOW(null), + RAINBOW_BPW(null), + RAINBOW_BPY(null), + RAINBOW_PBG(null), + RAINBOW_PWR(null); @SuppressWarnings("deprecation") public static final Codec CODEC = StringIdentifiable.createCodec(SheetPattern::values); diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 282f9e3e..dd36c523 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -182,7 +182,12 @@ public interface UItems { 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 CHECKERED_BED_SHEETS = register("checkered_bed_sheets", new BedsheetsItem(CloudBedBlock.SheetPattern.CHECKER, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); + Item KELP_BED_SHEETS = register(CloudBedBlock.SheetPattern.KELP); Item RAINBOW_BED_SHEETS = register(CloudBedBlock.SheetPattern.RAINBOW); + Item RAINBOW_BPW_BED_SHEETS = register(CloudBedBlock.SheetPattern.RAINBOW_BPW); + Item RAINBOW_BPY_BED_SHEETS = register(CloudBedBlock.SheetPattern.RAINBOW_BPY); + Item RAINBOW_PBG_BED_SHEETS = register(CloudBedBlock.SheetPattern.RAINBOW_PBG); + Item RAINBOW_PWR_BED_SHEETS = register(CloudBedBlock.SheetPattern.RAINBOW_PWR); AmuletItem PEGASUS_AMULET = register("pegasus_amulet", new PegasusAmuletItem(new FabricItemSettings() .maxCount(1) diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index dc2905db..e19929cf 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -200,7 +200,12 @@ "item.unicopia.apple_bed_sheets": "Apple Patterned Bed Sheets", "item.unicopia.barred_bed_sheets": "Bar Patterned Bed Sheets", "item.unicopia.checkered_bed_sheets": "Checker Patterned Bed Sheets", + "item.unicopia.kelp_bed_sheets": "Kelp Bed Sheets", "item.unicopia.rainbow_bed_sheets": "Rainbow Patterned Bed Sheets", + "item.unicopia.rainbow_bpw_bed_sheets": "BPW Rainbow Patterned Bed Sheets", + "item.unicopia.rainbow_bpy_bed_sheets": "BPY Rainbow Patterned Bed Sheets", + "item.unicopia.rainbow_pbg_bed_sheets": "PGB Rainbow Patterned Bed Sheets", + "item.unicopia.rainbow_pwr_bed_sheets": "PWR Rainbow Patterned Bed Sheets", "block.unicopia.rocks": "Rocks", "block.unicopia.bananas": "Bananas", diff --git a/src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json new file mode 100644 index 00000000..8234a2b0 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/kelp_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json new file mode 100644 index 00000000..7930b725 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/rainbow_bpw_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json new file mode 100644 index 00000000..50c3f6c4 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/rainbow_bpy_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json new file mode 100644 index 00000000..0b4d249f --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/rainbow_pbg_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json new file mode 100644 index 00000000..94dd563f --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/rainbow_pwr_bed_sheets" + } +} diff --git a/src/main/resources/assets/unicopia/textures/entity/bed/sheets/kelp.png b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/kelp.png new file mode 100644 index 00000000..02fbc460 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/kelp.png differ diff --git a/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_bpw.png b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_bpw.png new file mode 100644 index 00000000..8a846140 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_bpw.png differ diff --git a/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_bpy.png b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_bpy.png new file mode 100644 index 00000000..8c6cf39c Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_bpy.png differ diff --git a/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_pbg.png b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_pbg.png new file mode 100644 index 00000000..c0785122 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_pbg.png differ diff --git a/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_pwr.png b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_pwr.png new file mode 100644 index 00000000..69312e52 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/entity/bed/sheets/rainbow_pwr.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/kelp_bed_sheets.png b/src/main/resources/assets/unicopia/textures/item/kelp_bed_sheets.png new file mode 100644 index 00000000..05670937 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/kelp_bed_sheets.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/rainbow_bpw_bed_sheets.png b/src/main/resources/assets/unicopia/textures/item/rainbow_bpw_bed_sheets.png new file mode 100644 index 00000000..0f361335 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/rainbow_bpw_bed_sheets.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/rainbow_bpy_bed_sheets.png b/src/main/resources/assets/unicopia/textures/item/rainbow_bpy_bed_sheets.png new file mode 100644 index 00000000..357aabab Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/rainbow_bpy_bed_sheets.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/rainbow_pbg_bed_sheets.png b/src/main/resources/assets/unicopia/textures/item/rainbow_pbg_bed_sheets.png new file mode 100644 index 00000000..65c3c3f6 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/rainbow_pbg_bed_sheets.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/rainbow_pwr_bed_sheets.png b/src/main/resources/assets/unicopia/textures/item/rainbow_pwr_bed_sheets.png new file mode 100644 index 00000000..88f4a338 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/rainbow_pwr_bed_sheets.png differ diff --git a/src/main/resources/data/unicopia/tags/items/bed_sheets.json b/src/main/resources/data/unicopia/tags/items/bed_sheets.json index 99f4c7d3..295c3f4d 100644 --- a/src/main/resources/data/unicopia/tags/items/bed_sheets.json +++ b/src/main/resources/data/unicopia/tags/items/bed_sheets.json @@ -21,6 +21,11 @@ "unicopia:apple_bed_sheets", "unicopia:barred_bed_sheets", "unicopia:checkered_bed_sheets", - "unicopia:rainbow_bed_sheets" + "unicopia:kelp_bed_sheets", + "unicopia:rainbow_bed_sheets", + "unicopia:rainbow_bpw_bed_sheets", + "unicopia:rainbow_bpy_bed_sheets", + "unicopia:rainbow_pbg_bed_sheets", + "unicopia:rainbow_pwr_bed_sheets" ] }