PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-17 10:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added bedsheets for all the remaining colours and added recipes for them

Browse source
This commit is contained in:
Sollace 2023-11-02 18:24:35 +00:00
parent ccec0eec81
commit 33375097fe
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
38 changed files with 578 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/com/minelittlepony/unicopia/block/FancyBedBlock.java
View file

@ -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<SheetPattern> 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() {

28
src/main/java/com/minelittlepony/unicopia/item/UItems.java
View file

@ -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);

18
src/main/resources/assets/unicopia/lang/en_us.json
View file

@ -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",

6
src/main/resources/assets/unicopia/models/item/black_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/orange_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/brown_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/cyan_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/gray_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/green_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/green_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/light_blue_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/light_gray_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/lime_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/magenta_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/purple_bed_sheets"
}
}

6
src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "unicopia:item/yellow_bed_sheets"
}
}

21
src/main/resources/data/unicopia/recipes/bed_sheets/apple.json Normal file
View file

@ -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"
}
}

21
src/main/resources/data/unicopia/recipes/bed_sheets/bar.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/black.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/blue.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/brown.json Normal file
View file

@ -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"
}
}

21
src/main/resources/data/unicopia/recipes/bed_sheets/checker.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/cyan.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/gray.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/green.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/light_blue.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/light_gray.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/lime.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/magenta.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/orange.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/pink.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/purple.json Normal file
View file

@ -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"
}
}

36
src/main/resources/data/unicopia/recipes/bed_sheets/rainbow.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/red.json Normal file
View file

@ -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"
}
}

18
src/main/resources/data/unicopia/recipes/bed_sheets/yellow.json Normal file
View file

@ -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"
}
}

20
src/main/resources/data/unicopia/recipes/cloth_bed.json Normal file
View file

@ -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"
}
}

20
src/main/resources/data/unicopia/recipes/cloud_bed.json Normal file
View file

@ -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"
}
}

26
src/main/resources/data/unicopia/tags/items/bed_sheets.json Normal file
View file

@ -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"
]
}

4
src/main/resources/data/unicopia/tags/items/groups/earth_pony.json
View file

@ -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"
]
}

2
src/main/resources/data/unicopia/tags/items/groups/pegasus.json
View file

@ -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",