diff --git a/MC1.20.6/src/main/generated/data/roses_mod/loot_tables/blocks/potted_cyan.json b/MC1.20.6/src/main/generated/data/roses_mod/loot_tables/blocks/potted_cyan.json new file mode 100644 index 0000000..c55ac8a --- /dev/null +++ b/MC1.20.6/src/main/generated/data/roses_mod/loot_tables/blocks/potted_cyan.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/MC1.20.6/src/main/generated/data/roses_mod/loot_tables/blocks/potted_rose.json b/MC1.20.6/src/main/generated/data/roses_mod/loot_tables/blocks/potted_rose.json new file mode 100644 index 0000000..c13492f --- /dev/null +++ b/MC1.20.6/src/main/generated/data/roses_mod/loot_tables/blocks/potted_rose.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:rose_flower" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/MC1.20.6/src/main/java/observer/nelle/roses_mod/datagen/RosesLootTableProvider.java b/MC1.20.6/src/main/java/observer/nelle/roses_mod/datagen/RosesLootTableProvider.java index e650ec0..519b9ce 100644 --- a/MC1.20.6/src/main/java/observer/nelle/roses_mod/datagen/RosesLootTableProvider.java +++ b/MC1.20.6/src/main/java/observer/nelle/roses_mod/datagen/RosesLootTableProvider.java @@ -27,6 +27,9 @@ public class RosesLootTableProvider extends FabricBlockLootTableProvider { addDrop(RosesBlocks.INSTANCE.getRoseFlower()); addDrop(RosesBlocks.INSTANCE.getCyanRoseFlower()); + addPottedPlantDrops(RosesBlocks.INSTANCE.getPottedRose()); + addPottedPlantDrops(RosesBlocks.INSTANCE.getPottedCyan()); + addDrop(Blocks.ROSE_BUSH, roseBushDrops(Blocks.ROSE_BUSH, Objects.requireNonNull(RosesBlocks.INSTANCE.getRoseFlower()).asItem(), 2.0F, 5.0F)); addDrop(RosesBlocks.INSTANCE.getCyanRoseBush(), roseBushDrops(RosesBlocks.INSTANCE.getCyanRoseBush(), Objects.requireNonNull(RosesBlocks.INSTANCE.getCyanRoseFlower()).asItem(), 2.0F, 5.0F)); } diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/cyan_rose.json b/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/cyan_rose.json deleted file mode 100644 index 308ea91..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/cyan_rose.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "roses_mod:cyan_rose" - } - ] - } - ] -} diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json deleted file mode 100644 index 9e19db2..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 2, - "entries": [ - { - "type": "minecraft:item", - "name": "roses_mod:cyan_rose" - } - ] - } - ] -} diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/rose_flower.json b/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/rose_flower.json deleted file mode 100644 index e015922..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/loot_tables/blocks/rose_flower.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "roses_mod:rose_flower" - } - ] - } - ] -} diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/cyan_dye.json b/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/cyan_dye.json deleted file mode 100644 index 6994a61..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/cyan_dye.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - [ - { - "item": "roses_mod:cyan_rose_bush" - }, - { - "item": "roses_mod:cyan_rose" - } - ] - ], - "result": { - "item": "minecraft:cyan_dye", - "count": 2 - } -} diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/cyan_rose_bush.json b/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/cyan_rose_bush.json deleted file mode 100644 index 20a5789..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/cyan_rose_bush.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - " WW", - " WW" - ], - "key": { - "W": { - "item": "roses_mod:cyan_rose" - } - }, - "result": { - "item": "roses_mod:cyan_rose_bush", - "count": 1 - } -} diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/red_dye.json b/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/red_dye.json deleted file mode 100644 index 38111c3..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/red_dye.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - [ - { - "item": "roses_mod:rose_flower" - } - ] - ], - "result": { - "item": "minecraft:red_dye", - "count": 1 - } -} diff --git a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/rose_bush.json b/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/rose_bush.json deleted file mode 100644 index e02ef06..0000000 --- a/MC1.20.6/src/main/resources/old/data/roses_mod/recipes/rose_bush.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - " WW", - " WW" - ], - "key": { - "W": { - "item": "roses_mod:rose_flower" - } - }, - "result": { - "item": "minecraft:rose_bush", - "count": 1 - } -}