diff --git a/.github/buildtools/filelist.txt b/.github/buildtools/filelist.txt index 33de5481a..14bd8ec4b 100644 --- a/.github/buildtools/filelist.txt +++ b/.github/buildtools/filelist.txt @@ -1,10 +1,11 @@ .git/ .github/ +shaderpacks/ +.curseclient .gitignore CHANGELOG.md -minecraftinstance.json -LICENSE README.md -mmc-pack.json instance.cfg -kubejs.code-workspace \ No newline at end of file +manifest.json +mmc-pack.json +modlist.html \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4df2d3b4d..42934813f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,30 +32,29 @@ jobs: - name: Archive MMC run: | - rsync -av --exclude-from='.github/buildtools/filelist.txt' / .minecraft/ - zip -r /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ + rsync -av --exclude-from='.github/buildtools/filelist.txt' ./ .minecraft/ + zip -r ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - name: Archive CF run: | mv -vf .minecraft/ overrides/ - zip -r /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip manifest.json modlist.html overrides/config/ overrides/kubejs/ overrides/defaultconfigs/ + zip -r ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip manifest.json modlist.html overrides/config/ overrides/kubejs/ overrides/defaultconfigs/ - name: Archive Server run: | cp -r .github/buildtools/serverfiles/* overrides/ - cd /overrides/ - cat /.github/buildtools/client_mod.txt | while read -r line; do find mods -name "$line" -delete; done + cd ./overrides/ + cat ./.github/buildtools/client_mod.txt | while read -r line; do find mods -name "$line" -delete; done rm -rf shaderpacks - cp -r /.github/buildtools/serverfiles/* /overrides/ - zip -r /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip ./ + zip -r ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip ./ - name: Upload Curseforge uses: henkelmax/upload-curseforge-modpack-action@v1.0.0 with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: "385053" - modpack-path: /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip - modpack-server-path: /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip + modpack-path: ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip + modpack-server-path: ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip changelog: "${{ steps.changelog.outputs.description }}" changelog-format: markdown game-version: "1.20.1" @@ -72,9 +71,9 @@ jobs: name: Release ${{ steps.changelog.outputs.version }} body: ${{ steps.changelog.outputs.description }} files: | - /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip - /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip - /TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip + ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip + ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip + ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip - name: Discord notification uses: tsickert/discord-webhook@v5.3.0 diff --git a/.gitignore b/.gitignore index 6c6c0e29b..e6a25a3e5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ minecraftinstance.json config/smoothboot.json .curseclient +knownkeys.txt +*.code-workspace diff --git a/knownkeys.txt b/knownkeys.txt deleted file mode 100644 index ae88ea12a..000000000 --- a/knownkeys.txt +++ /dev/null @@ -1,116 +0,0 @@ -key.attack -key.use -key.forward -key.left -key.back -key.right -key.jump -key.sneak -key.sprint -key.drop -key.inventory -key.chat -key.playerlist -key.pickItem -key.command -key.socialInteractions -key.screenshot -key.togglePerspective -key.smoothCamera -key.fullscreen -key.spectatorOutlines -key.swapOffhand -key.saveToolbarActivator -key.loadToolbarActivator -key.advancements -key.hotbar.1 -key.hotbar.2 -key.hotbar.3 -key.hotbar.4 -key.hotbar.5 -key.hotbar.6 -key.hotbar.7 -key.hotbar.8 -key.hotbar.9 -key.clienttweaks.hideOffhandItem -key.clienttweaks.disableStepAssist -key.clienttweaks.disableLogStripping -key.argonauts.open_party_chat -key.argonauts.open_guild_chat -gui.xaero_open_map -gui.xaero_open_settings -gui.xaero_map_zoom_in -gui.xaero_map_zoom_out -gui.xaero_quick_confirm -placebo.toggleTrails -placebo.toggleWings -key.modernfix.config -key.heracles.open_quests -keybind.sophisticatedbackpacks.open_backpack -keybind.sophisticatedbackpacks.inventory_interaction -keybind.sophisticatedbackpacks.tool_swap -keybind.sophisticatedbackpacks.sort -keybind.sophisticatedbackpacks.toggle_upgrade_1 -keybind.sophisticatedbackpacks.toggle_upgrade_2 -keybind.sophisticatedbackpacks.toggle_upgrade_3 -keybind.sophisticatedbackpacks.toggle_upgrade_4 -keybind.sophisticatedbackpacks.toggle_upgrade_5 -key.corpse.death_history -tfc.key.place_block -tfc.key.cycle_chisel_mode -tfc.key.stack_food -key.jade.config -key.jade.show_overlay -key.jade.toggle_liquid -key.jade.show_recipes -key.jade.show_uses -key.jade.narrate -key.jade.show_details -key.ae2.guide -key.ae2.wireless_pattern_access_terminal -key.ae2.ae2wtlib_restock -key.ae2.ae2wtlib_magnet -key.ae2.portable_item_cell -key.ae2.portable_fluid_cell -key.ae2.wireless_pattern_encoding_terminal -key.ae2.wireless_terminal -key.astikorcarts.desc -key.curios.open.desc -create.keyinfo.toolmenu -create.keyinfo.toolbelt -gui.xaero_switch_waypoint_set -gui.xaero_instant_waypoint -gui.xaero_toggle_slime -gui.xaero_toggle_grid -gui.xaero_toggle_waypoints -gui.xaero_toggle_map_waypoints -gui.xaero_toggle_map -gui.xaero_enlarge_map -gui.xaero_waypoints_key -gui.xaero_zoom_in -gui.xaero_zoom_out -gui.xaero_new_waypoint -gui.xaero_display_all_sets -gui.xaero_toggle_light_overlay -gui.xaero_toggle_entity_radar -gui.xaero_reverse_entity_radar -gui.xaero_toggle_manual_cave_mode -gui.xaero_alternative_list_players -gui.xaero_toggle_tracked_players -gui.xaero_toggle_pac_chunk_claims -gui.xaero_minimap_settings -iris.keybind.reload -iris.keybind.toggleShaders -iris.keybind.shaderPackSelection -key.prometheus.open_homes -key.inventoryhud.toggle -key.inventoryhud.openconfig -key.inventoryhud.togglepot -key.inventoryhud.togglearm -key.inventoryhud.toggleall -Reload Menu | CTRL + ALT + -Toggle Customization Overlay | CTRL + ALT + -cos.key.opencosarmorinventory -key.entityculling.toggle -key.craftpresence.config_keycode.name -gui.xaero_pac_key_open_menu diff --git a/kubejs.code-workspace b/kubejs.code-workspace deleted file mode 100644 index 875350bc6..000000000 --- a/kubejs.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "kubejs" - } - ], - "settings": {} -} \ No newline at end of file