From e49a197fc3de9e8aefe41e3c8fb324076f067716 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:10:36 -0600 Subject: [PATCH] =?UTF-8?q?Add=20conversion=20mod=20to=20transfer=20data?= =?UTF-8?q?=20from=20i3=E2=86=9214?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes i4 a modpack; files have been moved correspondingly. --- .github/ISSUE_TEMPLATE/bug_report.md | 24 ------------------ .github/workflows/luacheck.yml | 21 --------------- {res => .res}/api-footer_button.png | Bin {res => .res}/api-tabs.png | Bin {res => .res}/i4_logo.png | Bin {res => .res}/i4_logo_scaled.png | Bin {res => .res}/screenshot.png | Bin API.md | 4 +-- README.md | 6 ++--- i3/README.md | 5 ++++ i3/init.lua | 11 ++++++++ i3/mod.conf | 3 +++ i4/README.md | 5 ++++ init.lua => i4/init.lua | 0 {locale => i4/locale}/i3.fr.tr | 0 {locale => i4/locale}/template | 0 mod.conf => i4/mod.conf | 2 +- {sounds => i4/sounds}/i3_achievement.ogg | Bin {sounds => i4/sounds}/i3_cannot.ogg | Bin {sounds => i4/sounds}/i3_click.ogg | Bin {sounds => i4/sounds}/i3_craft.ogg | Bin {sounds => i4/sounds}/i3_heavy_armor.ogg | Bin {sounds => i4/sounds}/i3_heavy_boots.ogg | Bin {sounds => i4/sounds}/i3_heavy_helmet.ogg | Bin {sounds => i4/sounds}/i3_heavy_leggings.ogg | Bin {sounds => i4/sounds}/i3_heavy_shield.ogg | Bin {sounds => i4/sounds}/i3_light_armor.ogg | Bin {sounds => i4/sounds}/i3_light_boots.ogg | Bin {sounds => i4/sounds}/i3_light_helmet.ogg | Bin {sounds => i4/sounds}/i3_light_leggings.ogg | Bin {sounds => i4/sounds}/i3_light_shield.ogg | Bin {sounds => i4/sounds}/i3_skin_change.ogg | Bin {sounds => i4/sounds}/i3_tab.ogg | Bin {sounds => i4/sounds}/i3_teleport.ogg | Bin {sounds => i4/sounds}/i3_trash.ogg | Bin {src => i4/src}/api.lua | 0 {src => i4/src}/bags.lua | 0 {src => i4/src}/caches.lua | 0 {src => i4/src}/callbacks.lua | 0 {src => i4/src}/common.lua | 0 {src => i4/src}/compression.lua | 0 {src => i4/src}/detached_inv.lua | 0 {src => i4/src}/fields.lua | 0 {src => i4/src}/groups.lua | 0 {src => i4/src}/gui.lua | 0 {src => i4/src}/hud.lua | 0 {src => i4/src}/model_aliases.lua | 0 {src => i4/src}/preprocessor.lua | 0 {src => i4/src}/progressive.lua | 0 {src => i4/src}/styles.lua | 0 {tests => i4/tests}/test_compression.lua | 0 {tests => i4/tests}/test_custom_recipes.lua | 0 {tests => i4/tests}/test_online_recipe.json | 0 {tests => i4/tests}/test_operators.lua | 0 {tests => i4/tests}/test_tabs.lua | 0 {tests => i4/tests}/test_waypoints.lua | 0 {textures => i4/textures}/i3_add.png | Bin {textures => i4/textures}/i3_all.png | Bin {textures => i4/textures}/i3_all_on.png | Bin {textures => i4/textures}/i3_armor.png | Bin {textures => i4/textures}/i3_armor_1.png | Bin {textures => i4/textures}/i3_armor_2.png | Bin {textures => i4/textures}/i3_armor_3.png | Bin {textures => i4/textures}/i3_armor_4.png | Bin {textures => i4/textures}/i3_armor_5.png | Bin {textures => i4/textures}/i3_armor_hover.png | Bin {textures => i4/textures}/i3_arrow.png | Bin .../textures}/i3_arrow_content.png | Bin {textures => i4/textures}/i3_award.png | Bin {textures => i4/textures}/i3_award_hover.png | Bin {textures => i4/textures}/i3_bag.png | Bin {textures => i4/textures}/i3_bag_hover.png | Bin {textures => i4/textures}/i3_bag_large.png | Bin {textures => i4/textures}/i3_bag_medium.png | Bin {textures => i4/textures}/i3_bag_small.png | Bin {textures => i4/textures}/i3_bar.png | Bin {textures => i4/textures}/i3_bg.png | Bin {textures => i4/textures}/i3_bg_content.png | Bin {textures => i4/textures}/i3_bg_full.png | Bin {textures => i4/textures}/i3_bg_goto.png | Bin {textures => i4/textures}/i3_bg_notif.png | Bin {textures => i4/textures}/i3_blank.png | Bin {textures => i4/textures}/i3_btn9.png | Bin {textures => i4/textures}/i3_btn9_hovered.png | Bin {textures => i4/textures}/i3_btn9_pressed.png | Bin {textures => i4/textures}/i3_cancel.png | Bin {textures => i4/textures}/i3_compress.png | Bin {textures => i4/textures}/i3_cube.png | Bin {textures => i4/textures}/i3_edit.png | Bin {textures => i4/textures}/i3_exit.png | Bin {textures => i4/textures}/i3_fav.png | Bin {textures => i4/textures}/i3_fav_off.png | Bin {textures => i4/textures}/i3_find_more.png | Bin {textures => i4/textures}/i3_fire_anim.png | Bin {textures => i4/textures}/i3_flag_anim.png | Bin {textures => i4/textures}/i3_furnace_anim.png | Bin {textures => i4/textures}/i3_heart.png | Bin {textures => i4/textures}/i3_heart_half.png | Bin {textures => i4/textures}/i3_highlight.png | Bin {textures => i4/textures}/i3_home.png | Bin {textures => i4/textures}/i3_home_px.png | Bin .../textures}/i3_home_px_hover.png | Bin {textures => i4/textures}/i3_hotbar.png | Bin {textures => i4/textures}/i3_item.png | Bin {textures => i4/textures}/i3_item_on.png | Bin {textures => i4/textures}/i3_mesepick.png | Bin {textures => i4/textures}/i3_next.png | Bin {textures => i4/textures}/i3_next_hover.png | Bin {textures => i4/textures}/i3_no_result.png | Bin {textures => i4/textures}/i3_node.png | Bin {textures => i4/textures}/i3_node_on.png | Bin {textures => i4/textures}/i3_non_visible.png | Bin {textures => i4/textures}/i3_refresh.png | Bin {textures => i4/textures}/i3_search.png | Bin .../textures}/i3_search_outline.png | Bin .../textures}/i3_search_outline_trim.png | Bin {textures => i4/textures}/i3_settings.png | Bin {textures => i4/textures}/i3_shapeless.png | Bin {textures => i4/textures}/i3_skin.png | Bin {textures => i4/textures}/i3_skin_hover.png | Bin {textures => i4/textures}/i3_slot.png | Bin {textures => i4/textures}/i3_sort.png | Bin {textures => i4/textures}/i3_steelpick.png | Bin {textures => i4/textures}/i3_tab.png | Bin {textures => i4/textures}/i3_tab_hover.png | Bin {textures => i4/textures}/i3_tab_small.png | Bin .../textures}/i3_tab_small_hover.png | Bin {textures => i4/textures}/i3_trash.png | Bin {textures => i4/textures}/i3_visible.png | Bin {textures => i4/textures}/i3_waypoint.png | Bin .../textures}/i3_waypoint_hover.png | Bin {textures => i4/textures}/i4_crafting.png | Bin {util => i4/util}/luacheck.lua | 0 {util => i4/util}/optipng.sh | 0 {util => i4/util}/servers.lua | 0 modpack.conf | 3 +++ 136 files changed, 33 insertions(+), 51 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/workflows/luacheck.yml rename {res => .res}/api-footer_button.png (100%) rename {res => .res}/api-tabs.png (100%) rename {res => .res}/i4_logo.png (100%) rename {res => .res}/i4_logo_scaled.png (100%) rename {res => .res}/screenshot.png (100%) create mode 100644 i3/README.md create mode 100644 i3/init.lua create mode 100644 i3/mod.conf create mode 100644 i4/README.md rename init.lua => i4/init.lua (100%) rename {locale => i4/locale}/i3.fr.tr (100%) rename {locale => i4/locale}/template (100%) rename mod.conf => i4/mod.conf (61%) rename {sounds => i4/sounds}/i3_achievement.ogg (100%) rename {sounds => i4/sounds}/i3_cannot.ogg (100%) rename {sounds => i4/sounds}/i3_click.ogg (100%) rename {sounds => i4/sounds}/i3_craft.ogg (100%) rename {sounds => i4/sounds}/i3_heavy_armor.ogg (100%) rename {sounds => i4/sounds}/i3_heavy_boots.ogg (100%) rename {sounds => i4/sounds}/i3_heavy_helmet.ogg (100%) rename {sounds => i4/sounds}/i3_heavy_leggings.ogg (100%) rename {sounds => i4/sounds}/i3_heavy_shield.ogg (100%) rename {sounds => i4/sounds}/i3_light_armor.ogg (100%) rename {sounds => i4/sounds}/i3_light_boots.ogg (100%) rename {sounds => i4/sounds}/i3_light_helmet.ogg (100%) rename {sounds => i4/sounds}/i3_light_leggings.ogg (100%) rename {sounds => i4/sounds}/i3_light_shield.ogg (100%) rename {sounds => i4/sounds}/i3_skin_change.ogg (100%) rename {sounds => i4/sounds}/i3_tab.ogg (100%) rename {sounds => i4/sounds}/i3_teleport.ogg (100%) rename {sounds => i4/sounds}/i3_trash.ogg (100%) rename {src => i4/src}/api.lua (100%) rename {src => i4/src}/bags.lua (100%) rename {src => i4/src}/caches.lua (100%) rename {src => i4/src}/callbacks.lua (100%) rename {src => i4/src}/common.lua (100%) rename {src => i4/src}/compression.lua (100%) rename {src => i4/src}/detached_inv.lua (100%) rename {src => i4/src}/fields.lua (100%) rename {src => i4/src}/groups.lua (100%) rename {src => i4/src}/gui.lua (100%) rename {src => i4/src}/hud.lua (100%) rename {src => i4/src}/model_aliases.lua (100%) rename {src => i4/src}/preprocessor.lua (100%) rename {src => i4/src}/progressive.lua (100%) rename {src => i4/src}/styles.lua (100%) rename {tests => i4/tests}/test_compression.lua (100%) rename {tests => i4/tests}/test_custom_recipes.lua (100%) rename {tests => i4/tests}/test_online_recipe.json (100%) rename {tests => i4/tests}/test_operators.lua (100%) rename {tests => i4/tests}/test_tabs.lua (100%) rename {tests => i4/tests}/test_waypoints.lua (100%) rename {textures => i4/textures}/i3_add.png (100%) rename {textures => i4/textures}/i3_all.png (100%) rename {textures => i4/textures}/i3_all_on.png (100%) rename {textures => i4/textures}/i3_armor.png (100%) rename {textures => i4/textures}/i3_armor_1.png (100%) rename {textures => i4/textures}/i3_armor_2.png (100%) rename {textures => i4/textures}/i3_armor_3.png (100%) rename {textures => i4/textures}/i3_armor_4.png (100%) rename {textures => i4/textures}/i3_armor_5.png (100%) rename {textures => i4/textures}/i3_armor_hover.png (100%) rename {textures => i4/textures}/i3_arrow.png (100%) rename {textures => i4/textures}/i3_arrow_content.png (100%) rename {textures => i4/textures}/i3_award.png (100%) rename {textures => i4/textures}/i3_award_hover.png (100%) rename {textures => i4/textures}/i3_bag.png (100%) rename {textures => i4/textures}/i3_bag_hover.png (100%) rename {textures => i4/textures}/i3_bag_large.png (100%) rename {textures => i4/textures}/i3_bag_medium.png (100%) rename {textures => i4/textures}/i3_bag_small.png (100%) rename {textures => i4/textures}/i3_bar.png (100%) rename {textures => i4/textures}/i3_bg.png (100%) rename {textures => i4/textures}/i3_bg_content.png (100%) rename {textures => i4/textures}/i3_bg_full.png (100%) rename {textures => i4/textures}/i3_bg_goto.png (100%) rename {textures => i4/textures}/i3_bg_notif.png (100%) rename {textures => i4/textures}/i3_blank.png (100%) rename {textures => i4/textures}/i3_btn9.png (100%) rename {textures => i4/textures}/i3_btn9_hovered.png (100%) rename {textures => i4/textures}/i3_btn9_pressed.png (100%) rename {textures => i4/textures}/i3_cancel.png (100%) rename {textures => i4/textures}/i3_compress.png (100%) rename {textures => i4/textures}/i3_cube.png (100%) rename {textures => i4/textures}/i3_edit.png (100%) rename {textures => i4/textures}/i3_exit.png (100%) rename {textures => i4/textures}/i3_fav.png (100%) rename {textures => i4/textures}/i3_fav_off.png (100%) rename {textures => i4/textures}/i3_find_more.png (100%) rename {textures => i4/textures}/i3_fire_anim.png (100%) rename {textures => i4/textures}/i3_flag_anim.png (100%) rename {textures => i4/textures}/i3_furnace_anim.png (100%) rename {textures => i4/textures}/i3_heart.png (100%) rename {textures => i4/textures}/i3_heart_half.png (100%) rename {textures => i4/textures}/i3_highlight.png (100%) rename {textures => i4/textures}/i3_home.png (100%) rename {textures => i4/textures}/i3_home_px.png (100%) rename {textures => i4/textures}/i3_home_px_hover.png (100%) rename {textures => i4/textures}/i3_hotbar.png (100%) rename {textures => i4/textures}/i3_item.png (100%) rename {textures => i4/textures}/i3_item_on.png (100%) rename {textures => i4/textures}/i3_mesepick.png (100%) rename {textures => i4/textures}/i3_next.png (100%) rename {textures => i4/textures}/i3_next_hover.png (100%) rename {textures => i4/textures}/i3_no_result.png (100%) rename {textures => i4/textures}/i3_node.png (100%) rename {textures => i4/textures}/i3_node_on.png (100%) rename {textures => i4/textures}/i3_non_visible.png (100%) rename {textures => i4/textures}/i3_refresh.png (100%) rename {textures => i4/textures}/i3_search.png (100%) rename {textures => i4/textures}/i3_search_outline.png (100%) rename {textures => i4/textures}/i3_search_outline_trim.png (100%) rename {textures => i4/textures}/i3_settings.png (100%) rename {textures => i4/textures}/i3_shapeless.png (100%) rename {textures => i4/textures}/i3_skin.png (100%) rename {textures => i4/textures}/i3_skin_hover.png (100%) rename {textures => i4/textures}/i3_slot.png (100%) rename {textures => i4/textures}/i3_sort.png (100%) rename {textures => i4/textures}/i3_steelpick.png (100%) rename {textures => i4/textures}/i3_tab.png (100%) rename {textures => i4/textures}/i3_tab_hover.png (100%) rename {textures => i4/textures}/i3_tab_small.png (100%) rename {textures => i4/textures}/i3_tab_small_hover.png (100%) rename {textures => i4/textures}/i3_trash.png (100%) rename {textures => i4/textures}/i3_visible.png (100%) rename {textures => i4/textures}/i3_waypoint.png (100%) rename {textures => i4/textures}/i3_waypoint_hover.png (100%) rename {textures => i4/textures}/i4_crafting.png (100%) rename {util => i4/util}/luacheck.lua (100%) rename {util => i4/util}/optipng.sh (100%) rename {util => i4/util}/servers.lua (100%) create mode 100644 modpack.conf diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 96ac07f..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Additional context** -- Mod version? Release or git? -- Engine version? -- LuaJIT enabled? -- Operating system? -- Did you try to disable other mods except i3? diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml deleted file mode 100644 index d9d6abf..0000000 --- a/.github/workflows/luacheck.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Luacheck - -on: [push, pull_request] - -jobs: - - luacheck: - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup ‘lua’ - uses: leafo/gh-actions-lua@v8 - with: - luaVersion: 5.1 - - name: Setup ‘luarocks’ - uses: leafo/gh-actions-luarocks@v4 - - name: Setup ‘luacheck’ - run: luarocks install luacheck - - name: Run ‘luacheck’ linter - run: cd util; lua luacheck.lua diff --git a/res/api-footer_button.png b/.res/api-footer_button.png similarity index 100% rename from res/api-footer_button.png rename to .res/api-footer_button.png diff --git a/res/api-tabs.png b/.res/api-tabs.png similarity index 100% rename from res/api-tabs.png rename to .res/api-tabs.png diff --git a/res/i4_logo.png b/.res/i4_logo.png similarity index 100% rename from res/i4_logo.png rename to .res/i4_logo.png diff --git a/res/i4_logo_scaled.png b/.res/i4_logo_scaled.png similarity index 100% rename from res/i4_logo_scaled.png rename to .res/i4_logo_scaled.png diff --git a/res/screenshot.png b/.res/screenshot.png similarity index 100% rename from res/screenshot.png rename to .res/screenshot.png diff --git a/API.md b/API.md index d025fd1..9374d8f 100644 --- a/API.md +++ b/API.md @@ -16,7 +16,7 @@ ### Tabs -![Screenshot of the inventory with the below example tab in focus.](res/api-tabs.png) +![Screenshot of the inventory with the below example tab in focus.](.res/api-tabs.png) #### `i4.new_tab(name, def)` @@ -92,7 +92,7 @@ A list of registered tabs. --- ### Footer buttons -![Screenshot of the inventory with the below example footer-button.](res/api-footer_button.png) +![Screenshot of the inventory with the below example footer-button.](.res/api-footer_button.png) `i4.new_footer_button(name, def)` diff --git a/README.md b/README.md index f7477d0..52376dd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# ![i4](res/i4_logo_scaled.png) +# ![i4](.res/i4_logo_scaled.png) -![A screenshot of Minetest displaying i3’s inventory.](res/screenshot.png) +![A screenshot of Minetest displaying i3’s inventory.](.res/screenshot.png) [i4](https://notabug.org/jadedctrl/i4) is an inventory system for Minetest with a focus on cohesion. It is a fork of [i3](https://github.com/minetest-mods/i3), the “next-generation inventory.” Primary differences to `i3` include an extended [API](API.md), more efficient use of screen-space, and general house-keeping. @@ -65,4 +65,4 @@ Textures are under the [CC BY-SA 3.0](LICENSE.md#textures), by paramat & BlockMe Source code for i4 is under the [GNU GPLv3](LICENSE.md#gplv3), with contributions by Jaidyn Ann ``. Code from i3 is under the [MIT license](LICENSE.md#mit), and is by Jean-Patrick Guerrero (with contributions by SmallJoker & anonymous). -See [./LICENSE](LICENSE) for details. +See [LICENSE.md](LICENSE.md) for details. diff --git a/i3/README.md b/i3/README.md new file mode 100644 index 0000000..a8b94fc --- /dev/null +++ b/i3/README.md @@ -0,0 +1,5 @@ +# i3→i4 Conversion Mod + +This mod is very bare-bones, and it only exists to bridge the gap between i3 and i4. + +Player data from i3 is transferred to i4; and mods that support i3 also work with i4, so long as this mod is present. diff --git a/i3/init.lua b/i3/init.lua new file mode 100644 index 0000000..3f5e310 --- /dev/null +++ b/i3/init.lua @@ -0,0 +1,11 @@ +-- This is a placeholder mod, to mimic i3’s presence for mods that test for mods +-- that test for it using modpath or some other mechanism. +-- i4 is compatible with i3, mods can use the global tables i3 or i4. + +local storage = core.get_mod_storage("i3") +local data = core.deserialize(storage:get_string"data") or {} + +if data and not i4.imported then + i4.data = data + i4.imported = true +end diff --git a/i3/mod.conf b/i3/mod.conf new file mode 100644 index 0000000..a48136f --- /dev/null +++ b/i3/mod.conf @@ -0,0 +1,3 @@ +name = i3 +description = Conversion mod for i3 to i4 +depends = i4 diff --git a/i4/README.md b/i4/README.md new file mode 100644 index 0000000..7e1982d --- /dev/null +++ b/i4/README.md @@ -0,0 +1,5 @@ +# i4 +This is the primary mod for i4; please see the modpack’s [README.md](../README.md). +It should be in the directory immediately above this one. + +Alternatively, visit the [Git repository](https://notabug.org/jadedctrl/i4). diff --git a/init.lua b/i4/init.lua similarity index 100% rename from init.lua rename to i4/init.lua diff --git a/locale/i3.fr.tr b/i4/locale/i3.fr.tr similarity index 100% rename from locale/i3.fr.tr rename to i4/locale/i3.fr.tr diff --git a/locale/template b/i4/locale/template similarity index 100% rename from locale/template rename to i4/locale/template diff --git a/mod.conf b/i4/mod.conf similarity index 61% rename from mod.conf rename to i4/mod.conf index 4d02197..9cb3600 100644 --- a/mod.conf +++ b/i4/mod.conf @@ -1,4 +1,4 @@ name = i4 -description = Next-generation inventory +description = Cohesive and featureful inventory mod optional_depends = 3d_armor, skinsdb, awards min_minetest_version = 5.6 diff --git a/sounds/i3_achievement.ogg b/i4/sounds/i3_achievement.ogg similarity index 100% rename from sounds/i3_achievement.ogg rename to i4/sounds/i3_achievement.ogg diff --git a/sounds/i3_cannot.ogg b/i4/sounds/i3_cannot.ogg similarity index 100% rename from sounds/i3_cannot.ogg rename to i4/sounds/i3_cannot.ogg diff --git a/sounds/i3_click.ogg b/i4/sounds/i3_click.ogg similarity index 100% rename from sounds/i3_click.ogg rename to i4/sounds/i3_click.ogg diff --git a/sounds/i3_craft.ogg b/i4/sounds/i3_craft.ogg similarity index 100% rename from sounds/i3_craft.ogg rename to i4/sounds/i3_craft.ogg diff --git a/sounds/i3_heavy_armor.ogg b/i4/sounds/i3_heavy_armor.ogg similarity index 100% rename from sounds/i3_heavy_armor.ogg rename to i4/sounds/i3_heavy_armor.ogg diff --git a/sounds/i3_heavy_boots.ogg b/i4/sounds/i3_heavy_boots.ogg similarity index 100% rename from sounds/i3_heavy_boots.ogg rename to i4/sounds/i3_heavy_boots.ogg diff --git a/sounds/i3_heavy_helmet.ogg b/i4/sounds/i3_heavy_helmet.ogg similarity index 100% rename from sounds/i3_heavy_helmet.ogg rename to i4/sounds/i3_heavy_helmet.ogg diff --git a/sounds/i3_heavy_leggings.ogg b/i4/sounds/i3_heavy_leggings.ogg similarity index 100% rename from sounds/i3_heavy_leggings.ogg rename to i4/sounds/i3_heavy_leggings.ogg diff --git a/sounds/i3_heavy_shield.ogg b/i4/sounds/i3_heavy_shield.ogg similarity index 100% rename from sounds/i3_heavy_shield.ogg rename to i4/sounds/i3_heavy_shield.ogg diff --git a/sounds/i3_light_armor.ogg b/i4/sounds/i3_light_armor.ogg similarity index 100% rename from sounds/i3_light_armor.ogg rename to i4/sounds/i3_light_armor.ogg diff --git a/sounds/i3_light_boots.ogg b/i4/sounds/i3_light_boots.ogg similarity index 100% rename from sounds/i3_light_boots.ogg rename to i4/sounds/i3_light_boots.ogg diff --git a/sounds/i3_light_helmet.ogg b/i4/sounds/i3_light_helmet.ogg similarity index 100% rename from sounds/i3_light_helmet.ogg rename to i4/sounds/i3_light_helmet.ogg diff --git a/sounds/i3_light_leggings.ogg b/i4/sounds/i3_light_leggings.ogg similarity index 100% rename from sounds/i3_light_leggings.ogg rename to i4/sounds/i3_light_leggings.ogg diff --git a/sounds/i3_light_shield.ogg b/i4/sounds/i3_light_shield.ogg similarity index 100% rename from sounds/i3_light_shield.ogg rename to i4/sounds/i3_light_shield.ogg diff --git a/sounds/i3_skin_change.ogg b/i4/sounds/i3_skin_change.ogg similarity index 100% rename from sounds/i3_skin_change.ogg rename to i4/sounds/i3_skin_change.ogg diff --git a/sounds/i3_tab.ogg b/i4/sounds/i3_tab.ogg similarity index 100% rename from sounds/i3_tab.ogg rename to i4/sounds/i3_tab.ogg diff --git a/sounds/i3_teleport.ogg b/i4/sounds/i3_teleport.ogg similarity index 100% rename from sounds/i3_teleport.ogg rename to i4/sounds/i3_teleport.ogg diff --git a/sounds/i3_trash.ogg b/i4/sounds/i3_trash.ogg similarity index 100% rename from sounds/i3_trash.ogg rename to i4/sounds/i3_trash.ogg diff --git a/src/api.lua b/i4/src/api.lua similarity index 100% rename from src/api.lua rename to i4/src/api.lua diff --git a/src/bags.lua b/i4/src/bags.lua similarity index 100% rename from src/bags.lua rename to i4/src/bags.lua diff --git a/src/caches.lua b/i4/src/caches.lua similarity index 100% rename from src/caches.lua rename to i4/src/caches.lua diff --git a/src/callbacks.lua b/i4/src/callbacks.lua similarity index 100% rename from src/callbacks.lua rename to i4/src/callbacks.lua diff --git a/src/common.lua b/i4/src/common.lua similarity index 100% rename from src/common.lua rename to i4/src/common.lua diff --git a/src/compression.lua b/i4/src/compression.lua similarity index 100% rename from src/compression.lua rename to i4/src/compression.lua diff --git a/src/detached_inv.lua b/i4/src/detached_inv.lua similarity index 100% rename from src/detached_inv.lua rename to i4/src/detached_inv.lua diff --git a/src/fields.lua b/i4/src/fields.lua similarity index 100% rename from src/fields.lua rename to i4/src/fields.lua diff --git a/src/groups.lua b/i4/src/groups.lua similarity index 100% rename from src/groups.lua rename to i4/src/groups.lua diff --git a/src/gui.lua b/i4/src/gui.lua similarity index 100% rename from src/gui.lua rename to i4/src/gui.lua diff --git a/src/hud.lua b/i4/src/hud.lua similarity index 100% rename from src/hud.lua rename to i4/src/hud.lua diff --git a/src/model_aliases.lua b/i4/src/model_aliases.lua similarity index 100% rename from src/model_aliases.lua rename to i4/src/model_aliases.lua diff --git a/src/preprocessor.lua b/i4/src/preprocessor.lua similarity index 100% rename from src/preprocessor.lua rename to i4/src/preprocessor.lua diff --git a/src/progressive.lua b/i4/src/progressive.lua similarity index 100% rename from src/progressive.lua rename to i4/src/progressive.lua diff --git a/src/styles.lua b/i4/src/styles.lua similarity index 100% rename from src/styles.lua rename to i4/src/styles.lua diff --git a/tests/test_compression.lua b/i4/tests/test_compression.lua similarity index 100% rename from tests/test_compression.lua rename to i4/tests/test_compression.lua diff --git a/tests/test_custom_recipes.lua b/i4/tests/test_custom_recipes.lua similarity index 100% rename from tests/test_custom_recipes.lua rename to i4/tests/test_custom_recipes.lua diff --git a/tests/test_online_recipe.json b/i4/tests/test_online_recipe.json similarity index 100% rename from tests/test_online_recipe.json rename to i4/tests/test_online_recipe.json diff --git a/tests/test_operators.lua b/i4/tests/test_operators.lua similarity index 100% rename from tests/test_operators.lua rename to i4/tests/test_operators.lua diff --git a/tests/test_tabs.lua b/i4/tests/test_tabs.lua similarity index 100% rename from tests/test_tabs.lua rename to i4/tests/test_tabs.lua diff --git a/tests/test_waypoints.lua b/i4/tests/test_waypoints.lua similarity index 100% rename from tests/test_waypoints.lua rename to i4/tests/test_waypoints.lua diff --git a/textures/i3_add.png b/i4/textures/i3_add.png similarity index 100% rename from textures/i3_add.png rename to i4/textures/i3_add.png diff --git a/textures/i3_all.png b/i4/textures/i3_all.png similarity index 100% rename from textures/i3_all.png rename to i4/textures/i3_all.png diff --git a/textures/i3_all_on.png b/i4/textures/i3_all_on.png similarity index 100% rename from textures/i3_all_on.png rename to i4/textures/i3_all_on.png diff --git a/textures/i3_armor.png b/i4/textures/i3_armor.png similarity index 100% rename from textures/i3_armor.png rename to i4/textures/i3_armor.png diff --git a/textures/i3_armor_1.png b/i4/textures/i3_armor_1.png similarity index 100% rename from textures/i3_armor_1.png rename to i4/textures/i3_armor_1.png diff --git a/textures/i3_armor_2.png b/i4/textures/i3_armor_2.png similarity index 100% rename from textures/i3_armor_2.png rename to i4/textures/i3_armor_2.png diff --git a/textures/i3_armor_3.png b/i4/textures/i3_armor_3.png similarity index 100% rename from textures/i3_armor_3.png rename to i4/textures/i3_armor_3.png diff --git a/textures/i3_armor_4.png b/i4/textures/i3_armor_4.png similarity index 100% rename from textures/i3_armor_4.png rename to i4/textures/i3_armor_4.png diff --git a/textures/i3_armor_5.png b/i4/textures/i3_armor_5.png similarity index 100% rename from textures/i3_armor_5.png rename to i4/textures/i3_armor_5.png diff --git a/textures/i3_armor_hover.png b/i4/textures/i3_armor_hover.png similarity index 100% rename from textures/i3_armor_hover.png rename to i4/textures/i3_armor_hover.png diff --git a/textures/i3_arrow.png b/i4/textures/i3_arrow.png similarity index 100% rename from textures/i3_arrow.png rename to i4/textures/i3_arrow.png diff --git a/textures/i3_arrow_content.png b/i4/textures/i3_arrow_content.png similarity index 100% rename from textures/i3_arrow_content.png rename to i4/textures/i3_arrow_content.png diff --git a/textures/i3_award.png b/i4/textures/i3_award.png similarity index 100% rename from textures/i3_award.png rename to i4/textures/i3_award.png diff --git a/textures/i3_award_hover.png b/i4/textures/i3_award_hover.png similarity index 100% rename from textures/i3_award_hover.png rename to i4/textures/i3_award_hover.png diff --git a/textures/i3_bag.png b/i4/textures/i3_bag.png similarity index 100% rename from textures/i3_bag.png rename to i4/textures/i3_bag.png diff --git a/textures/i3_bag_hover.png b/i4/textures/i3_bag_hover.png similarity index 100% rename from textures/i3_bag_hover.png rename to i4/textures/i3_bag_hover.png diff --git a/textures/i3_bag_large.png b/i4/textures/i3_bag_large.png similarity index 100% rename from textures/i3_bag_large.png rename to i4/textures/i3_bag_large.png diff --git a/textures/i3_bag_medium.png b/i4/textures/i3_bag_medium.png similarity index 100% rename from textures/i3_bag_medium.png rename to i4/textures/i3_bag_medium.png diff --git a/textures/i3_bag_small.png b/i4/textures/i3_bag_small.png similarity index 100% rename from textures/i3_bag_small.png rename to i4/textures/i3_bag_small.png diff --git a/textures/i3_bar.png b/i4/textures/i3_bar.png similarity index 100% rename from textures/i3_bar.png rename to i4/textures/i3_bar.png diff --git a/textures/i3_bg.png b/i4/textures/i3_bg.png similarity index 100% rename from textures/i3_bg.png rename to i4/textures/i3_bg.png diff --git a/textures/i3_bg_content.png b/i4/textures/i3_bg_content.png similarity index 100% rename from textures/i3_bg_content.png rename to i4/textures/i3_bg_content.png diff --git a/textures/i3_bg_full.png b/i4/textures/i3_bg_full.png similarity index 100% rename from textures/i3_bg_full.png rename to i4/textures/i3_bg_full.png diff --git a/textures/i3_bg_goto.png b/i4/textures/i3_bg_goto.png similarity index 100% rename from textures/i3_bg_goto.png rename to i4/textures/i3_bg_goto.png diff --git a/textures/i3_bg_notif.png b/i4/textures/i3_bg_notif.png similarity index 100% rename from textures/i3_bg_notif.png rename to i4/textures/i3_bg_notif.png diff --git a/textures/i3_blank.png b/i4/textures/i3_blank.png similarity index 100% rename from textures/i3_blank.png rename to i4/textures/i3_blank.png diff --git a/textures/i3_btn9.png b/i4/textures/i3_btn9.png similarity index 100% rename from textures/i3_btn9.png rename to i4/textures/i3_btn9.png diff --git a/textures/i3_btn9_hovered.png b/i4/textures/i3_btn9_hovered.png similarity index 100% rename from textures/i3_btn9_hovered.png rename to i4/textures/i3_btn9_hovered.png diff --git a/textures/i3_btn9_pressed.png b/i4/textures/i3_btn9_pressed.png similarity index 100% rename from textures/i3_btn9_pressed.png rename to i4/textures/i3_btn9_pressed.png diff --git a/textures/i3_cancel.png b/i4/textures/i3_cancel.png similarity index 100% rename from textures/i3_cancel.png rename to i4/textures/i3_cancel.png diff --git a/textures/i3_compress.png b/i4/textures/i3_compress.png similarity index 100% rename from textures/i3_compress.png rename to i4/textures/i3_compress.png diff --git a/textures/i3_cube.png b/i4/textures/i3_cube.png similarity index 100% rename from textures/i3_cube.png rename to i4/textures/i3_cube.png diff --git a/textures/i3_edit.png b/i4/textures/i3_edit.png similarity index 100% rename from textures/i3_edit.png rename to i4/textures/i3_edit.png diff --git a/textures/i3_exit.png b/i4/textures/i3_exit.png similarity index 100% rename from textures/i3_exit.png rename to i4/textures/i3_exit.png diff --git a/textures/i3_fav.png b/i4/textures/i3_fav.png similarity index 100% rename from textures/i3_fav.png rename to i4/textures/i3_fav.png diff --git a/textures/i3_fav_off.png b/i4/textures/i3_fav_off.png similarity index 100% rename from textures/i3_fav_off.png rename to i4/textures/i3_fav_off.png diff --git a/textures/i3_find_more.png b/i4/textures/i3_find_more.png similarity index 100% rename from textures/i3_find_more.png rename to i4/textures/i3_find_more.png diff --git a/textures/i3_fire_anim.png b/i4/textures/i3_fire_anim.png similarity index 100% rename from textures/i3_fire_anim.png rename to i4/textures/i3_fire_anim.png diff --git a/textures/i3_flag_anim.png b/i4/textures/i3_flag_anim.png similarity index 100% rename from textures/i3_flag_anim.png rename to i4/textures/i3_flag_anim.png diff --git a/textures/i3_furnace_anim.png b/i4/textures/i3_furnace_anim.png similarity index 100% rename from textures/i3_furnace_anim.png rename to i4/textures/i3_furnace_anim.png diff --git a/textures/i3_heart.png b/i4/textures/i3_heart.png similarity index 100% rename from textures/i3_heart.png rename to i4/textures/i3_heart.png diff --git a/textures/i3_heart_half.png b/i4/textures/i3_heart_half.png similarity index 100% rename from textures/i3_heart_half.png rename to i4/textures/i3_heart_half.png diff --git a/textures/i3_highlight.png b/i4/textures/i3_highlight.png similarity index 100% rename from textures/i3_highlight.png rename to i4/textures/i3_highlight.png diff --git a/textures/i3_home.png b/i4/textures/i3_home.png similarity index 100% rename from textures/i3_home.png rename to i4/textures/i3_home.png diff --git a/textures/i3_home_px.png b/i4/textures/i3_home_px.png similarity index 100% rename from textures/i3_home_px.png rename to i4/textures/i3_home_px.png diff --git a/textures/i3_home_px_hover.png b/i4/textures/i3_home_px_hover.png similarity index 100% rename from textures/i3_home_px_hover.png rename to i4/textures/i3_home_px_hover.png diff --git a/textures/i3_hotbar.png b/i4/textures/i3_hotbar.png similarity index 100% rename from textures/i3_hotbar.png rename to i4/textures/i3_hotbar.png diff --git a/textures/i3_item.png b/i4/textures/i3_item.png similarity index 100% rename from textures/i3_item.png rename to i4/textures/i3_item.png diff --git a/textures/i3_item_on.png b/i4/textures/i3_item_on.png similarity index 100% rename from textures/i3_item_on.png rename to i4/textures/i3_item_on.png diff --git a/textures/i3_mesepick.png b/i4/textures/i3_mesepick.png similarity index 100% rename from textures/i3_mesepick.png rename to i4/textures/i3_mesepick.png diff --git a/textures/i3_next.png b/i4/textures/i3_next.png similarity index 100% rename from textures/i3_next.png rename to i4/textures/i3_next.png diff --git a/textures/i3_next_hover.png b/i4/textures/i3_next_hover.png similarity index 100% rename from textures/i3_next_hover.png rename to i4/textures/i3_next_hover.png diff --git a/textures/i3_no_result.png b/i4/textures/i3_no_result.png similarity index 100% rename from textures/i3_no_result.png rename to i4/textures/i3_no_result.png diff --git a/textures/i3_node.png b/i4/textures/i3_node.png similarity index 100% rename from textures/i3_node.png rename to i4/textures/i3_node.png diff --git a/textures/i3_node_on.png b/i4/textures/i3_node_on.png similarity index 100% rename from textures/i3_node_on.png rename to i4/textures/i3_node_on.png diff --git a/textures/i3_non_visible.png b/i4/textures/i3_non_visible.png similarity index 100% rename from textures/i3_non_visible.png rename to i4/textures/i3_non_visible.png diff --git a/textures/i3_refresh.png b/i4/textures/i3_refresh.png similarity index 100% rename from textures/i3_refresh.png rename to i4/textures/i3_refresh.png diff --git a/textures/i3_search.png b/i4/textures/i3_search.png similarity index 100% rename from textures/i3_search.png rename to i4/textures/i3_search.png diff --git a/textures/i3_search_outline.png b/i4/textures/i3_search_outline.png similarity index 100% rename from textures/i3_search_outline.png rename to i4/textures/i3_search_outline.png diff --git a/textures/i3_search_outline_trim.png b/i4/textures/i3_search_outline_trim.png similarity index 100% rename from textures/i3_search_outline_trim.png rename to i4/textures/i3_search_outline_trim.png diff --git a/textures/i3_settings.png b/i4/textures/i3_settings.png similarity index 100% rename from textures/i3_settings.png rename to i4/textures/i3_settings.png diff --git a/textures/i3_shapeless.png b/i4/textures/i3_shapeless.png similarity index 100% rename from textures/i3_shapeless.png rename to i4/textures/i3_shapeless.png diff --git a/textures/i3_skin.png b/i4/textures/i3_skin.png similarity index 100% rename from textures/i3_skin.png rename to i4/textures/i3_skin.png diff --git a/textures/i3_skin_hover.png b/i4/textures/i3_skin_hover.png similarity index 100% rename from textures/i3_skin_hover.png rename to i4/textures/i3_skin_hover.png diff --git a/textures/i3_slot.png b/i4/textures/i3_slot.png similarity index 100% rename from textures/i3_slot.png rename to i4/textures/i3_slot.png diff --git a/textures/i3_sort.png b/i4/textures/i3_sort.png similarity index 100% rename from textures/i3_sort.png rename to i4/textures/i3_sort.png diff --git a/textures/i3_steelpick.png b/i4/textures/i3_steelpick.png similarity index 100% rename from textures/i3_steelpick.png rename to i4/textures/i3_steelpick.png diff --git a/textures/i3_tab.png b/i4/textures/i3_tab.png similarity index 100% rename from textures/i3_tab.png rename to i4/textures/i3_tab.png diff --git a/textures/i3_tab_hover.png b/i4/textures/i3_tab_hover.png similarity index 100% rename from textures/i3_tab_hover.png rename to i4/textures/i3_tab_hover.png diff --git a/textures/i3_tab_small.png b/i4/textures/i3_tab_small.png similarity index 100% rename from textures/i3_tab_small.png rename to i4/textures/i3_tab_small.png diff --git a/textures/i3_tab_small_hover.png b/i4/textures/i3_tab_small_hover.png similarity index 100% rename from textures/i3_tab_small_hover.png rename to i4/textures/i3_tab_small_hover.png diff --git a/textures/i3_trash.png b/i4/textures/i3_trash.png similarity index 100% rename from textures/i3_trash.png rename to i4/textures/i3_trash.png diff --git a/textures/i3_visible.png b/i4/textures/i3_visible.png similarity index 100% rename from textures/i3_visible.png rename to i4/textures/i3_visible.png diff --git a/textures/i3_waypoint.png b/i4/textures/i3_waypoint.png similarity index 100% rename from textures/i3_waypoint.png rename to i4/textures/i3_waypoint.png diff --git a/textures/i3_waypoint_hover.png b/i4/textures/i3_waypoint_hover.png similarity index 100% rename from textures/i3_waypoint_hover.png rename to i4/textures/i3_waypoint_hover.png diff --git a/textures/i4_crafting.png b/i4/textures/i4_crafting.png similarity index 100% rename from textures/i4_crafting.png rename to i4/textures/i4_crafting.png diff --git a/util/luacheck.lua b/i4/util/luacheck.lua similarity index 100% rename from util/luacheck.lua rename to i4/util/luacheck.lua diff --git a/util/optipng.sh b/i4/util/optipng.sh similarity index 100% rename from util/optipng.sh rename to i4/util/optipng.sh diff --git a/util/servers.lua b/i4/util/servers.lua similarity index 100% rename from util/servers.lua rename to i4/util/servers.lua diff --git a/modpack.conf b/modpack.conf new file mode 100644 index 0000000..63f88f8 --- /dev/null +++ b/modpack.conf @@ -0,0 +1,3 @@ +name = i4 +title = i4 +description = Featureful and cohesive inventory mod