diff --git a/src/main/java/com/teamabode/verdance/core/integration/farmersdelight/FDIntegration.java b/src/main/java/com/teamabode/verdance/core/integration/farmersdelight/FDIntegration.java index 92c4648..23ddc8a 100644 --- a/src/main/java/com/teamabode/verdance/core/integration/farmersdelight/FDIntegration.java +++ b/src/main/java/com/teamabode/verdance/core/integration/farmersdelight/FDIntegration.java @@ -7,11 +7,10 @@ import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.loader.api.ModContainer; import net.minecraft.item.ItemGroup; +import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; -import vectorwing.farmersdelight.common.registry.ModBlocks; -import vectorwing.farmersdelight.common.registry.ModItems; public class FDIntegration { private static final RegistryKey TAB_FARMERS_DELIGHT = RegistryKey.of( @@ -25,10 +24,14 @@ public static void register(ModContainer container) { FDCompatSoundEvents.register(); ItemGroupEvents.modifyEntriesEvent(TAB_FARMERS_DELIGHT).register(entries -> { - entries.addAfter(ModItems.ONION_CRATE.get(), FDCompatBlocks.MULBERRY_CRATE); - entries.addAfter(ModBlocks.CHERRY_CABINET.get(), FDCompatBlocks.MULBERRY_CABINET); + entries.addAfter(Registries.ITEM.get(new Identifier("farmersdelight", "onion_crate")), FDCompatBlocks.MULBERRY_CRATE); + entries.addAfter(Registries.ITEM.get(new Identifier("farmersdelight", "cherry_cabinet")), FDCompatBlocks.MULBERRY_CABINET); }); - CompatUtils.registerBuiltinPack("farmersdelight_datapack", container); + if (CompatUtils.isModLoaded("connectormod")) { + CompatUtils.registerBuiltinPack("forge_farmersdelight_datapack", container); + } else { + CompatUtils.registerBuiltinPack("farmersdelight_datapack", container); + } CompatUtils.registerBuiltinPack("farmersdelight_resourcepack", container); } } diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/farmersdelight/tags/items/cabinets/wooden.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/farmersdelight/tags/items/cabinets/wooden.json new file mode 100644 index 0000000..f2fd7b3 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/farmersdelight/tags/items/cabinets/wooden.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "verdance:mulberry_cabinet" + ] +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000..ea29c22 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "verdance:mulberry_cabinet", + "verdance:mulberry_crate" + ] +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/decorations/mulberry_cabinet.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/decorations/mulberry_cabinet.json new file mode 100644 index 0000000..267532e --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/decorations/mulberry_cabinet.json @@ -0,0 +1,25 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mulberry_trapdoor": { + "conditions": { + "items": [ + { + "items": ["verdance:mulberry_trapdoor"] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "verdance:mulberry_cabinet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [["has_the_recipe", "has_mulberry_trapdoor"]], + "rewards": { + "recipes": ["verdance:mulberry_cabinet"] + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/decorations/mulberry_crate.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/decorations/mulberry_crate.json new file mode 100644 index 0000000..d84649c --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/decorations/mulberry_crate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mulberry": { + "conditions": { + "items": [ + { + "items": ["verdance:mulberry"] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "verdance:mulberry_crate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_mulberry" + ] + ], + "rewards": { + "recipes": [ + "verdance:mulberry_crate" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/foods/mulberry.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/foods/mulberry.json new file mode 100644 index 0000000..f62b443 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/advancements/recipes/foods/mulberry.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mulberry_crate": { + "conditions": { + "items": [ + { + "items": ["verdance:mulberry_crate"] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "verdance:mulberry" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_mulberry_crate" + ] + ], + "rewards": { + "recipes": [ + "verdance:mulberry" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/cantaloupe.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/cantaloupe.json new file mode 100644 index 0000000..deac6d9 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/cantaloupe.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:cantaloupe" + } + ], + "result": [ + { + "count": 4, + "item": "verdance:cantaloupe_slice" + } + ], + "tool": { + "tag": "forge:tools/knives" + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_door.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_door.json new file mode 100644 index 0000000..d75f80a --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_door.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:mulberry_door" + } + ], + "result": [ + { + "item": "verdance:mulberry_planks" + } + ], + "tool": { + "fabric:type": "farmersdelight:tool_action", + "action": "axe_dig" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_hanging_sign.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_hanging_sign.json new file mode 100644 index 0000000..4b24e47 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_hanging_sign.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:mulberry_hanging_sign" + } + ], + "result": [ + { + "item": "verdance:mulberry_planks" + } + ], + "tool": { + "fabric:type": "farmersdelight:tool_action", + "action": "axe_dig" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_log.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_log.json new file mode 100644 index 0000000..dae8635 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_log.json @@ -0,0 +1,21 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:mulberry_log" + } + ], + "result": [ + { + "item": "verdance:stripped_mulberry_log" + }, + { + "item": "farmersdelight:tree_bark" + } + ], + "sound": "minecraft:item.axe.strip", + "tool": { + "fabric:type": "farmersdelight:tool_action", + "action": "axe_strip" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_sign.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_sign.json new file mode 100644 index 0000000..6cd325e --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_sign.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:mulberry_sign" + } + ], + "result": [ + { + "item": "verdance:mulberry_planks" + } + ], + "tool": { + "fabric:type": "farmersdelight:tool_action", + "action": "axe_dig" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_trapdoor.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_trapdoor.json new file mode 100644 index 0000000..c747333 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:mulberry_trapdoor" + } + ], + "result": [ + { + "item": "verdance:mulberry_planks" + } + ], + "tool": { + "fabric:type": "farmersdelight:tool_action", + "action": "axe_dig" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_wood.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_wood.json new file mode 100644 index 0000000..0b7868e --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/mulberry_wood.json @@ -0,0 +1,21 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:mulberry_wood" + } + ], + "result": [ + { + "item": "verdance:stripped_mulberry_wood" + }, + { + "item": "farmersdelight:tree_bark" + } + ], + "sound": "minecraft:item.axe.strip", + "tool": { + "fabric:type": "farmersdelight:tool_action", + "action": "axe_strip" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/violet.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/violet.json new file mode 100644 index 0000000..29a5b67 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/cutting/violet.json @@ -0,0 +1,17 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "verdance:violet" + } + ], + "result": [ + { + "item": "minecraft:purple_dye", + "count": 2 + } + ], + "tool": { + "tag": "forge:tools/knives" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry.json new file mode 100644 index 0000000..006607a --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "verdance:mulberry_crate" + } + ], + "result": { + "count": 9, + "item": "verdance:mulberry" + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry_cabinet.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry_cabinet.json new file mode 100644 index 0000000..1a8fcc1 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry_cabinet.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": { + "item": "verdance:mulberry_trapdoor" + }, + "_": { + "item": "verdance:mulberry_slab" + } + }, + "pattern": ["___", "D D", "___"], + "result": { + "count": 1, + "item": "verdance:mulberry_cabinet" + } +} diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry_crate.json b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry_crate.json new file mode 100644 index 0000000..56238ce --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/data/verdance/recipes/mulberry_crate.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "verdance:mulberry" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "item": "verdance:mulberry_crate" + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/forge_farmersdelight_datapack/pack.mcmeta b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/pack.mcmeta new file mode 100644 index 0000000..0356621 --- /dev/null +++ b/src/main/resources/resourcepacks/forge_farmersdelight_datapack/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Compatibility for Forge Farmer's Delight", + "pack_format": 15 + } +} \ No newline at end of file