From bd05c21f3610138429cb4bbf6d71ad24fb91f9ef Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 2 Nov 2023 21:41:56 +0000 Subject: [PATCH] Added cloud lumps --- .../minelittlepony/unicopia/item/UItems.java | 1 + .../resources/assets/unicopia/lang/en_us.json | 1 + .../unicopia/models/item/black_bed_sheets.json | 2 +- .../unicopia/models/item/cloud_lump.json | 6 ++++++ .../unicopia/loot_tables/blocks/cloud.json | 9 ++++++++- .../loot_tables/blocks/cloud_slab.json | 18 ++++++++++++++++-- .../loot_tables/blocks/cloud_stairs.json | 2 +- .../loot_tables/blocks/compacted_cloud.json | 9 ++++++++- .../loot_tables/blocks/dense_cloud.json | 9 ++++++++- .../loot_tables/blocks/dense_cloud_slab.json | 18 ++++++++++++++++-- .../loot_tables/blocks/dense_cloud_stairs.json | 4 ++-- .../unicopia/recipes/blocks/cloud_block.json | 13 +++++++++++++ .../data/unicopia/tags/items/clouds.json | 1 + .../unicopia/tags/items/groups/pegasus.json | 13 +------------ 14 files changed, 83 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/assets/unicopia/models/item/cloud_lump.json create mode 100644 src/main/resources/data/unicopia/recipes/blocks/cloud_block.json diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index e6500884..9d52bd7a 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -203,6 +203,7 @@ public interface UItems { Item CARAPACE = register("carapace", new Item(new Item.Settings()), ItemGroups.INGREDIENTS); Item CLOTH_BED = register("cloth_bed", new FancyBedItem(UBlocks.CLOTH_BED, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); Item CLOUD_BED = register("cloud_bed", new CloudBedItem(UBlocks.CLOUD_BED, new Item.Settings().maxCount(1)), ItemGroups.FUNCTIONAL); + Item CLOUD_LUMP = register("cloud_lump", new Item(new Item.Settings()), ItemGroups.NATURAL); Item ALICORN_BADGE = register(Race.ALICORN); Item PEGASUS_BADGE = register(Race.PEGASUS); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 984bf240..59c29785 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -176,6 +176,7 @@ "item.unicopia.music_disc_funk": "Music Disc", "item.unicopia.music_disc_funk.desc": "funk, just funk", + "item.unicopia.cloud_lump": "Cloud Lump", "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", 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 index 3744c6d5..bc7f7ba1 100644 --- a/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json +++ b/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "unicopia:item/orange_bed_sheets" + "layer0": "unicopia:item/black_bed_sheets" } } diff --git a/src/main/resources/assets/unicopia/models/item/cloud_lump.json b/src/main/resources/assets/unicopia/models/item/cloud_lump.json new file mode 100644 index 00000000..c8ca05f3 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/cloud_lump.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/cloud_lump" + } +} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json index a63862dc..282d5ec9 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json @@ -7,7 +7,14 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:cloud" + "name": "unicopia:cloud_lump", + "functions": [ + { + "add": false, + "count": 4, + "function": "minecraft:set_count" + } + ] } ], "conditions": [ diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_slab.json index b805f097..6926e7fe 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_slab.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_slab.json @@ -7,12 +7,26 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:cloud", + "name": "unicopia:cloud_lump", "functions": [ { "add": false, - "count": 3, + "count": 2, "function": "minecraft:set_count" + }, + { + "add": false, + "count": 4, + "function": "minecraft:set_count", + "conditions": [ + { + "block": "unicopia:cloud_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ] } ] } diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json index 25c27a93..2259e860 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:cloud", + "name": "unicopia:cloud_lump", "functions": [ { "add": false, diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/compacted_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/compacted_cloud.json index a63862dc..282d5ec9 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/compacted_cloud.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/compacted_cloud.json @@ -7,7 +7,14 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:cloud" + "name": "unicopia:cloud_lump", + "functions": [ + { + "add": false, + "count": 4, + "function": "minecraft:set_count" + } + ] } ], "conditions": [ diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json index a63862dc..163e3667 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json @@ -7,7 +7,14 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:cloud" + "name": "unicopia:cloud_lump", + "functions": [ + { + "add": false, + "count": 9, + "function": "minecraft:set_count" + } + ] } ], "conditions": [ diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_slab.json index dcd9199d..e9d1f0e2 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_slab.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_slab.json @@ -7,12 +7,26 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:dense_cloud", + "name": "unicopia:cloud_lump", "functions": [ { "add": false, - "count": 3, + "count": 4, "function": "minecraft:set_count" + }, + { + "add": false, + "count": 8, + "function": "minecraft:set_count", + "conditions": [ + { + "block": "unicopia:dense_cloud_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ] } ] } diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json index 15b99d8c..80ba3be4 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json @@ -7,11 +7,11 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:dense_cloud", + "name": "unicopia:cloud_lump", "functions": [ { "add": false, - "count": 6, + "count": 13, "function": "minecraft:set_count" } ] diff --git a/src/main/resources/data/unicopia/recipes/blocks/cloud_block.json b/src/main/resources/data/unicopia/recipes/blocks/cloud_block.json new file mode 100644 index 00000000..949938df --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/blocks/cloud_block.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": [ + { "item": "unicopia:cloud_lump" } + ] + }, + "result": { "item": "unicopia:cloud", "count": 1 } +} diff --git a/src/main/resources/data/unicopia/tags/items/clouds.json b/src/main/resources/data/unicopia/tags/items/clouds.json index 71b5f333..039c3d9f 100644 --- a/src/main/resources/data/unicopia/tags/items/clouds.json +++ b/src/main/resources/data/unicopia/tags/items/clouds.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "unicopia:cloud_lump", "unicopia:cloud", "unicopia:cloud_planks", "unicopia:cloud_bricks", 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 2d058cba..1d26b745 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/pegasus.json +++ b/src/main/resources/data/unicopia/tags/items/groups/pegasus.json @@ -1,18 +1,7 @@ { "replace": false, "values": [ - "unicopia:cloud", - "unicopia:cloud_slab", - "unicopia:cloud_stairs", - "unicopia:cloud_planks", - "unicopia:cloud_plank_slab", - "unicopia:cloud_plank_stairs", - "unicopia:dense_cloud", - "unicopia:dense_cloud_slab", - "unicopia:dense_cloud_stairs", - "unicopia:unstable_cloud", - "unicopia:cloud_pillar", - "unicopia:cloud_bed", + "#unicopia:clouds", "#unicopia:bed_sheets", "#unicopia:food_types/raw_fish", "#unicopia:food_types/cooked_fish",