hopefully load datapacks correctly

LilydevMC · Jul 14, 2024 · a5e48ea · a5e48ea
1 parent 3c55bf8
commit a5e48ea
Show file tree

Hide file tree

Showing 25 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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 → config/openloader/data/alphabetsoup.pw.toml b/openloader/data/alphabetsoup.pw.toml → config/openloader/data/alphabetsoup.pw.toml
diff --git a/...s-tweaks/recipes/cutting_cypress_log.json → ...s-tweaks/recipes/cutting_cypress_log.json b/...s-tweaks/recipes/cutting_cypress_log.json → ...s-tweaks/recipes/cutting_cypress_log.json
diff --git a/.../recipes/cutting_cypress_quarter_log.json → .../recipes/cutting_cypress_quarter_log.json b/.../recipes/cutting_cypress_quarter_log.json → .../recipes/cutting_cypress_quarter_log.json
diff --git a/...s-tweaks/recipes/cutting_hemlock_log.json → ...s-tweaks/recipes/cutting_hemlock_log.json b/...s-tweaks/recipes/cutting_hemlock_log.json → ...s-tweaks/recipes/cutting_hemlock_log.json
diff --git a/.../recipes/cutting_hemlock_quarter_log.json → .../recipes/cutting_hemlock_quarter_log.json b/.../recipes/cutting_hemlock_quarter_log.json → .../recipes/cutting_hemlock_quarter_log.json
diff --git a/...s/recipes/cutting_japanese_maple_log.json → ...s/recipes/cutting_japanese_maple_log.json b/...s/recipes/cutting_japanese_maple_log.json → ...s/recipes/cutting_japanese_maple_log.json
diff --git a/...cipes/cutting_rainbow_eucalyptus_log.json → ...cipes/cutting_rainbow_eucalyptus_log.json b/...cipes/cutting_rainbow_eucalyptus_log.json → ...cipes/cutting_rainbow_eucalyptus_log.json
diff --git a/...tting_rainbow_eucalyptus_quarter_log.json → ...tting_rainbow_eucalyptus_quarter_log.json b/...tting_rainbow_eucalyptus_quarter_log.json → ...tting_rainbow_eucalyptus_quarter_log.json
diff --git a/...s-tweaks/recipes/cutting_redwood_log.json → ...s-tweaks/recipes/cutting_redwood_log.json b/...s-tweaks/recipes/cutting_redwood_log.json → ...s-tweaks/recipes/cutting_redwood_log.json
diff --git a/.../recipes/cutting_redwood_quarter_log.json → .../recipes/cutting_redwood_quarter_log.json b/.../recipes/cutting_redwood_quarter_log.json → .../recipes/cutting_redwood_quarter_log.json
diff --git a/...ns-tweaks/recipes/cutting_rubber_log.json → ...ns-tweaks/recipes/cutting_rubber_log.json b/...ns-tweaks/recipes/cutting_rubber_log.json → ...ns-tweaks/recipes/cutting_rubber_log.json
diff --git a/...ns-tweaks/recipes/cutting_sakura_log.json → ...ns-tweaks/recipes/cutting_sakura_log.json b/...ns-tweaks/recipes/cutting_sakura_log.json → ...ns-tweaks/recipes/cutting_sakura_log.json
diff --git a/...tweaks/recipes/cutting_small_oak_log.json → ...tweaks/recipes/cutting_small_oak_log.json b/...tweaks/recipes/cutting_small_oak_log.json → ...tweaks/recipes/cutting_small_oak_log.json
diff --git a/...ns-tweaks/recipes/cutting_willow_log.json → ...ns-tweaks/recipes/cutting_willow_log.json b/...ns-tweaks/recipes/cutting_willow_log.json → ...ns-tweaks/recipes/cutting_willow_log.json
diff --git a/...ons-tweaks/recipes/cutting_yucca_log.json → ...ons-tweaks/recipes/cutting_yucca_log.json b/...ons-tweaks/recipes/cutting_yucca_log.json → ...ons-tweaks/recipes/cutting_yucca_log.json
diff --git a/...tions-tweaks/recipes/ability_capsule.json → ...weaks/recipes/shaped_ability_capsule.json b/...tions-tweaks/recipes/ability_capsule.json → ...weaks/recipes/shaped_ability_capsule.json
diff --git a/...eations-tweaks/recipes/ability_patch.json → ...-tweaks/recipes/shaped_ability_patch.json b/...eations-tweaks/recipes/ability_patch.json → ...-tweaks/recipes/shaped_ability_patch.json
diff --git a/...packs/cobble-creations-tweaks/pack.mcmeta → .../data/cobble-creations-tweaks/pack.mcmeta b/...packs/cobble-creations-tweaks/pack.mcmeta → .../data/cobble-creations-tweaks/pack.mcmeta
diff --git a/openloader/data/hiddenmons-cobblemon.pw.toml → ...nloader/data/hiddenmons-cobblemon.pw.toml b/openloader/data/hiddenmons-cobblemon.pw.toml → ...nloader/data/hiddenmons-cobblemon.pw.toml
diff --git a/...loader/data/missingmons-cobblemon.pw.toml → ...loader/data/missingmons-cobblemon.pw.toml b/...loader/data/missingmons-cobblemon.pw.toml → ...loader/data/missingmons-cobblemon.pw.toml
diff --git a/openloader/data/mysticmons.pw.toml → config/openloader/data/mysticmons.pw.toml b/openloader/data/mysticmons.pw.toml → config/openloader/data/mysticmons.pw.toml
diff --git a/...ader/data/vivillon-pride-patterns.pw.toml → ...ader/data/vivillon-pride-patterns.pw.toml b/...ader/data/vivillon-pride-patterns.pw.toml → ...ader/data/vivillon-pride-patterns.pw.toml
diff --git 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"