diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 8253acfa..6336947a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -91,6 +91,7 @@ a96ad963692f2c93b949c8ea80b54d276f97cfac data\inspirations\loot_tables\blocks\br 8e4c46aefed04cac698d503827a45c7fd06e01f4 data\inspirations\loot_tables\blocks\brown_carpeted_trapdoor.json fd0cd0be8d1f1ff6a4d3938760360c658be4bb17 data\inspirations\loot_tables\blocks\brown_fitted_carpet.json b60566209e6c65c36204d68df31cd1fda6e2889c data\inspirations\loot_tables\blocks\brown_mulch.json +07c4020c119c75d66e9ca264f312a43bd1b0691d data\inspirations\loot_tables\blocks\cactus.json bfb5dd012f0066d88fa760fae1bebe6558b3ed6d data\inspirations\loot_tables\blocks\chain.json e46cbaa0134bba610fc8bacfe5ddbbc8a78c695c data\inspirations\loot_tables\blocks\collector.json 196679f5b8e1285f2a1adb8ffe9347f8c00ab342 data\inspirations\loot_tables\blocks\cyan_carpeted_pressure_plate.json @@ -127,6 +128,10 @@ fad8f8b4847df795628b4c751843c800eeca52d7 data\inspirations\loot_tables\blocks\pi 7dc82266efef2f22f13283e03443133a56f94a63 data\inspirations\loot_tables\blocks\pink_fitted_carpet.json 9a187f9b34914c8817bf51027ce31e53a846ec6c data\inspirations\loot_tables\blocks\pipe.json 513551869fe994b8325110c996c56025fb4bb61d data\inspirations\loot_tables\blocks\plain_mulch.json +9c9da9c2ba1b4587644b1164dac24c6b590068f5 data\inspirations\loot_tables\blocks\potted_cyan.json +55010a2b58bb91ff029e120c8e9260112dcc22ac data\inspirations\loot_tables\blocks\potted_paeonia.json +9a5b21cc134721ee5690235414afc0b1cc3fb724 data\inspirations\loot_tables\blocks\potted_rose.json +d303503f0d1c3527530ec6252befb816cb8cff8b data\inspirations\loot_tables\blocks\potted_syringa.json eb0f0b22f0fd93b789492372c696ffad07f099ee data\inspirations\loot_tables\blocks\purple_carpeted_pressure_plate.json 451840f58c0c700cb0d49018dd78978b49888a50 data\inspirations\loot_tables\blocks\purple_carpeted_trapdoor.json 25148e13f89056e622ca9ac8613bce6c89c95ab9 data\inspirations\loot_tables\blocks\purple_fitted_carpet.json @@ -141,12 +146,14 @@ e1098ca1931d5b3b6dff2656fbc94dd51f88d93a data\inspirations\loot_tables\blocks\re 747670736c51687ce985fc49f5135cdda695be4c data\inspirations\loot_tables\blocks\rope.json c0feec7dc8366f16994e1c2c91c131d65727d4bf data\inspirations\loot_tables\blocks\rose.json c90ab094ee40355f6ae86bfe004f89e7b600f814 data\inspirations\loot_tables\blocks\round_path.json +a1e05929b5bf5a1bdee8ad324f965b837a133794 data\inspirations\loot_tables\blocks\sugar_cane.json a22220d01ba3540f2e3960886ecde7d4d75a5030 data\inspirations\loot_tables\blocks\syringa.json 102f35b175c3302320053b3f93b353faeebbe744 data\inspirations\loot_tables\blocks\tile_path.json d7d2072a114e5750dc3dbe9acb97fcd040501646 data\inspirations\loot_tables\blocks\tomes_bookshelf.json 00243e7539cf0dc37e0240f03f939d0157e2159f data\inspirations\loot_tables\blocks\torch_lever.json 67d659bff686b50ac7a6a9d33e2321fb286f7009 data\inspirations\loot_tables\blocks\vine.json 00243e7539cf0dc37e0240f03f939d0157e2159f data\inspirations\loot_tables\blocks\wall_torch_lever.json +9e86e1745e01dc128fc5e888ca21a0751f158e90 data\inspirations\loot_tables\blocks\wet_hopper.json ba1324e3a9d2ac57bcdd3450d0982ebdbde3fbd1 data\inspirations\loot_tables\blocks\white_carpeted_pressure_plate.json e680bcbd06a62804166f4ea2a53bb6c600363c6e data\inspirations\loot_tables\blocks\white_carpeted_trapdoor.json cc9d0cfc14c0fa9c48db2da9bb825a2d45010c2d data\inspirations\loot_tables\blocks\white_enlightened_bush.json @@ -235,6 +242,7 @@ a7677e2f4b61bec6a66eb117ddf741a3a7225321 data\inspirations\tags\blocks\bookshelv 85c18a3259a3290405d1f9b53f263fa73d5016f3 data\inspirations\tags\blocks\carpeted_trapdoors.json ecdd745b396ff144add1388b63cba8af1be721ae data\inspirations\tags\blocks\cauldron_fire.json efef16448b3849eec615d4ecb466e4d196f0d176 data\inspirations\tags\blocks\enlightened_bushes.json +0ea9aa0e47add5d25bdba1eab427063cad8938c6 data\inspirations\tags\blocks\flower_pots.json 1c2e1c7caee1ee40a9e7f597f4f994f7ae181894 data\inspirations\tags\blocks\mulch.json 71b95f7bd7ef4a6b4e22a6f3b69385f51a105d54 data\inspirations\tags\blocks\small_flowers.json 25faf71ac48005a9e6001136dc4c49ebda28a252 data\inspirations\tags\items\books.json @@ -248,6 +256,7 @@ f810dc54f6b45752b2d459d3e08e962dbcf82f19 data\inspirations\tags\items\waypoint_c 99552ca43885337f75f5a3b8813d495bf4f7d799 data\minecraft\tags\blocks\bamboo_plantable_on.json e3919558d698934995ec9c82e60f3b584658e531 data\minecraft\tags\blocks\carpets.json 99552ca43885337f75f5a3b8813d495bf4f7d799 data\minecraft\tags\blocks\dirt_like.json +00df993619a2f7d35c51e653f41bc1cda4577e0f data\minecraft\tags\blocks\flower_pots.json 031a33f8bd31ca3b0aed413bbef3598d57bb741e data\minecraft\tags\blocks\leaves.json 1101fc9d7fab05e322e9d9dbd36bceeee54770a7 data\minecraft\tags\blocks\wooden_trapdoors.json df6257725a0918249c66724ce5f1d47efb41b162 data\minecraft\tags\items\arrows.json diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/cactus.json b/src/generated/resources/data/inspirations/loot_tables/blocks/cactus.json new file mode 100644 index 00000000..26d3ad83 --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/cactus.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "inspirations:cactus_seeds" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/potted_cyan.json b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_cyan.json new file mode 100644 index 00000000..c9d4a47f --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_cyan.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "inspirations:cyan_flower" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/potted_paeonia.json b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_paeonia.json new file mode 100644 index 00000000..c57020a4 --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_paeonia.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "inspirations:paeonia" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/potted_rose.json b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_rose.json new file mode 100644 index 00000000..ff7a2c9f --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_rose.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "inspirations:rose" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/potted_syringa.json b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_syringa.json new file mode 100644 index 00000000..457be90b --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/potted_syringa.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "inspirations:syringa" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/sugar_cane.json b/src/generated/resources/data/inspirations/loot_tables/blocks/sugar_cane.json new file mode 100644 index 00000000..5fc9e6e0 --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/sugar_cane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "inspirations:sugar_cane_seeds" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/loot_tables/blocks/wet_hopper.json b/src/generated/resources/data/inspirations/loot_tables/blocks/wet_hopper.json new file mode 100644 index 00000000..c8ec9e91 --- /dev/null +++ b/src/generated/resources/data/inspirations/loot_tables/blocks/wet_hopper.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "minecraft:hopper" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/inspirations/tags/blocks/flower_pots.json b/src/generated/resources/data/inspirations/tags/blocks/flower_pots.json index 1a442256..49bdbfd3 100644 --- a/src/generated/resources/data/inspirations/tags/blocks/flower_pots.json +++ b/src/generated/resources/data/inspirations/tags/blocks/flower_pots.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ + "inspirations:potted_rose", "inspirations:potted_cyan", "inspirations:potted_paeonia", - "inspirations:potted_rose", "inspirations:potted_syringa" ] -} +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json b/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json new file mode 100644 index 00000000..46c7371b --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#inspirations:flower_pots" + ] +} \ No newline at end of file diff --git a/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockLootTable.java b/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockLootTable.java index b06d1951..24efd05b 100644 --- a/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockLootTable.java +++ b/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockLootTable.java @@ -99,6 +99,11 @@ private void addBuilding() { this.registerDropSelfLootTable(InspirationsBuilding.flower_paeonia); this.registerDropSelfLootTable(InspirationsBuilding.flower_syringa); + this.registerFlowerPot(InspirationsBuilding.potted_rose); + this.registerFlowerPot(InspirationsBuilding.potted_cyan); + this.registerFlowerPot(InspirationsBuilding.potted_paeonia); + this.registerFlowerPot(InspirationsBuilding.potted_syringa); + this.registerDropSelfLootTable(InspirationsBuilding.path_brick); this.registerDropSelfLootTable(InspirationsBuilding.path_rock); this.registerDropSelfLootTable(InspirationsBuilding.path_round); @@ -153,8 +158,9 @@ private void addTweaks() { ); } } - // this.registerDropping(InspirationsTweaks.sugarCaneCrop, InspirationsTweaks.sugarCaneSeeds); - // this.registerDropping(InspirationsTweaks.cactusCrop, InspirationsTweaks.cactusSeeds); + this.registerLootTable(InspirationsTweaks.wetHopper, droppingWithName(InspirationsTweaks.dryHopper)); + this.registerDropping(InspirationsTweaks.sugarCane, InspirationsTweaks.sugarCaneSeeds); + this.registerDropping(InspirationsTweaks.cactus, InspirationsTweaks.cactusSeeds); } private void addRecipes() { diff --git a/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockTagsProvider.java b/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockTagsProvider.java index 6543f5a9..a6447a4f 100644 --- a/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockTagsProvider.java +++ b/src/main/java/knightminer/inspirations/common/datagen/InspirationsBlockTagsProvider.java @@ -30,17 +30,23 @@ protected void registerTags() { private void registerInspTags() { this.getBuilder(InspirationsTags.Blocks.MULCH) - .add(InspirationsBuilding.plainMulch) - .add(InspirationsBuilding.blackMulch) - .add(InspirationsBuilding.blueMulch) - .add(InspirationsBuilding.brownMulch) - .add(InspirationsBuilding.redMulch); + .add(InspirationsBuilding.plainMulch) + .add(InspirationsBuilding.blackMulch) + .add(InspirationsBuilding.blueMulch) + .add(InspirationsBuilding.brownMulch) + .add(InspirationsBuilding.redMulch); this.getBuilder(InspirationsTags.Blocks.SMALL_FLOWERS) - .add(InspirationsBuilding.flower_rose) - .add(InspirationsBuilding.flower_cyan) - .add(InspirationsBuilding.flower_paeonia) - .add(InspirationsBuilding.flower_syringa); + .add(InspirationsBuilding.flower_rose) + .add(InspirationsBuilding.flower_cyan) + .add(InspirationsBuilding.flower_paeonia) + .add(InspirationsBuilding.flower_syringa); + + this.getBuilder(InspirationsTags.Blocks.FLOWER_POTS) + .add(InspirationsBuilding.potted_rose) + .add(InspirationsBuilding.potted_cyan) + .add(InspirationsBuilding.potted_paeonia) + .add(InspirationsBuilding.potted_syringa); this.getBuilder(InspirationsTags.Blocks.ENLIGHTENED_BUSHES) .add(InspirationsBuilding.whiteEnlightenedBush) @@ -49,15 +55,15 @@ private void registerInspTags() { .add(InspirationsBuilding.redEnlightenedBush); this.getBuilder(InspirationsTags.Blocks.CARPETED_TRAPDOORS) - .add(InspirationsUtility.carpetedTrapdoors); + .add(InspirationsUtility.carpetedTrapdoors); this.getBuilder(InspirationsTags.Blocks.CARPETED_PRESSURE_PLATES) - .add(InspirationsUtility.carpetedPressurePlates); + .add(InspirationsUtility.carpetedPressurePlates); this.getBuilder(InspirationsTags.Blocks.BOOKSHELVES) - .add(InspirationsBuilding.shelf_normal) - .add(InspirationsBuilding.shelf_ancient) - .add(InspirationsBuilding.shelf_rainbow) - .add(InspirationsBuilding.shelf_tomes); + .add(InspirationsBuilding.shelf_normal) + .add(InspirationsBuilding.shelf_ancient) + .add(InspirationsBuilding.shelf_rainbow) + .add(InspirationsBuilding.shelf_tomes); this.getBuilder(InspirationsTags.Blocks.CAULDRON_FIRE) .add(Blocks.FIRE); @@ -68,6 +74,7 @@ private void registerVanillaTags() { this.getBuilder(BlockTags.DIRT_LIKE).add(InspirationsTags.Blocks.MULCH); this.getBuilder(BlockTags.BAMBOO_PLANTABLE_ON).add(InspirationsTags.Blocks.MULCH); this.getBuilder(BlockTags.WOODEN_TRAPDOORS).add(InspirationsTags.Blocks.CARPETED_TRAPDOORS); + this.getBuilder(BlockTags.FLOWER_POTS).add(InspirationsTags.Blocks.FLOWER_POTS); this.getBuilder(BlockTags.CARPETS) .add(InspirationsTweaks.fitCarpets) diff --git a/src/main/java/knightminer/inspirations/library/InspirationsTags.java b/src/main/java/knightminer/inspirations/library/InspirationsTags.java index 642b2d31..ad04642e 100644 --- a/src/main/java/knightminer/inspirations/library/InspirationsTags.java +++ b/src/main/java/knightminer/inspirations/library/InspirationsTags.java @@ -11,6 +11,7 @@ public class InspirationsTags { public static class Blocks { public static final Tag MULCH = new BlockTags.Wrapper(Util.getResource("mulch")); public static final Tag SMALL_FLOWERS = new BlockTags.Wrapper(Util.getResource("small_flowers")); + public static final Tag FLOWER_POTS = new BlockTags.Wrapper(Util.getResource("flower_pots")); public static final Tag CARPETED_TRAPDOORS = new BlockTags.Wrapper(Util.getResource("carpeted_trapdoors")); public static final Tag CARPETED_PRESSURE_PLATES = new BlockTags.Wrapper(Util.getResource("carpeted_pressure_plates")); public static final Tag BOOKSHELVES = new BlockTags.Wrapper(Util.getResource("bookshelves"));