diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9e1679..b6e7a3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,11 +43,6 @@ jobs: run: | echo "$(jsonxf -s '{"main_menu":{"bottom_left":[{"text":"${{ steps.get_pack_name.outputs.value }} ${{ steps.set_pack_version.outputs.value }}","clickEvent":{"action":"open_url","value":"https://www.youtube.com/watch?v=dQw4w9WgXcQ"}}]}}')" > config/isxander-main-menu-credits.json - - name: Export datapack - run: | - (cd custom/datapacks/cobble-creations-tweaks && zip -r ../../../cobble-creations-tweaks .) - mv cobble-creations-tweaks.zip openloader/data/ - - name: Refresh and build .mrpack run: packwiz refresh && packwiz mr export diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ccc6dd..795601f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,11 +65,6 @@ jobs: run: | echo "$(jsonxf -s '{"main_menu":{"bottom_left":[{"text":"${{ steps.get_pack_name.outputs.value }} v${{ github.event.inputs.version }}","clickEvent":{"action":"open_url","value":"https://www.youtube.com/watch?v=dQw4w9WgXcQ"}}]}}')" > config/isxander-main-menu-credits.json - - name: Export datapack - run: | - (cd custom/datapacks/cobble-creations-tweaks && zip -r ../../../cobble-creations-tweaks .) - mv cobble-creations-tweaks.zip openloader/data/ - - name: Refresh and build .mrpack run: packwiz refresh && packwiz mr export diff --git a/openloader/data/alphabetsoup.pw.toml b/config/openloader/data/alphabetsoup.pw.toml similarity index 100% rename from openloader/data/alphabetsoup.pw.toml rename to config/openloader/data/alphabetsoup.pw.toml diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_quarter_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_quarter_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_quarter_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_cypress_quarter_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_quarter_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_quarter_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_quarter_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_hemlock_quarter_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_japanese_maple_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_japanese_maple_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_japanese_maple_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_japanese_maple_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_quarter_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_quarter_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_quarter_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rainbow_eucalyptus_quarter_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_quarter_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_quarter_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_quarter_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_redwood_quarter_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rubber_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rubber_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rubber_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_rubber_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_sakura_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_sakura_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_sakura_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_sakura_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_small_oak_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_small_oak_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_small_oak_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_small_oak_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_willow_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_willow_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_willow_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_willow_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_yucca_log.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_yucca_log.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_yucca_log.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/cutting_yucca_log.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/ability_capsule.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/shaped_ability_capsule.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/ability_capsule.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/shaped_ability_capsule.json diff --git a/custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/ability_patch.json b/config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/shaped_ability_patch.json similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/ability_patch.json rename to config/openloader/data/cobble-creations-tweaks/data/cobble-creations-tweaks/recipes/shaped_ability_patch.json diff --git a/custom/datapacks/cobble-creations-tweaks/pack.mcmeta b/config/openloader/data/cobble-creations-tweaks/pack.mcmeta similarity index 100% rename from custom/datapacks/cobble-creations-tweaks/pack.mcmeta rename to config/openloader/data/cobble-creations-tweaks/pack.mcmeta diff --git a/openloader/data/hiddenmons-cobblemon.pw.toml b/config/openloader/data/hiddenmons-cobblemon.pw.toml similarity index 100% rename from openloader/data/hiddenmons-cobblemon.pw.toml rename to config/openloader/data/hiddenmons-cobblemon.pw.toml diff --git a/openloader/data/missingmons-cobblemon.pw.toml b/config/openloader/data/missingmons-cobblemon.pw.toml similarity index 100% rename from openloader/data/missingmons-cobblemon.pw.toml rename to config/openloader/data/missingmons-cobblemon.pw.toml diff --git a/openloader/data/mysticmons.pw.toml b/config/openloader/data/mysticmons.pw.toml similarity index 100% rename from openloader/data/mysticmons.pw.toml rename to config/openloader/data/mysticmons.pw.toml diff --git a/openloader/data/vivillon-pride-patterns.pw.toml b/config/openloader/data/vivillon-pride-patterns.pw.toml similarity index 100% rename from openloader/data/vivillon-pride-patterns.pw.toml rename to config/openloader/data/vivillon-pride-patterns.pw.toml diff --git a/pack.toml b/pack.toml index 94b6e26..cdac062 100644 --- a/pack.toml +++ b/pack.toml @@ -13,4 +13,4 @@ fabric = "0.15.11" minecraft = "1.20.1" [options] -datapack-folder = "openloader/data" +datapack-folder = "config/openloader/data"