illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-08-24 17:13:48 +01:00
commit c3c366bf69
9 changed files with 93 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

126
.github/workflows/build.yml vendored
View file

@ -24,6 +24,8 @@ jobs:
project_full_name: ${{ steps.check.outputs.project_name }}-${{ steps.check.outputs.project_version }}
changelog: ${{ steps.changelog.outputs.description }}
mc_version: ${{ steps.check.outputs.minecraft_version }}
loader_version: ${{ steps.check.outputs.loader_version }}
loader_type: ${{ steps.check.outputs.loader_type }}
release_type: ${{ steps.check.outputs.release_type }}
diff: ${{ steps.read_diff.outputs.diff }}
exists: ${{ steps.check.outputs.exists }}
@ -163,10 +165,19 @@ jobs:
id: check
shell: bash
run: |
echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT
MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}'
MINECRAFT_VERSION=$(echo "$MC_VERSIONS_JSON" | jq -r '.[0]' | tr -d '[]"')
LOADERS_JSON='${{ steps.pakku_lock_info.outputs.loaders }}'
LOADER_TYPE=$(echo "$LOADERS_JSON" | jq -r 'keys[0]')
LOADER_VERSION=$(echo "$LOADERS_JSON" | jq -r ".[keys[0]]")
echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT
echo "loader_version=$LOADER_VERSION" >> $GITHUB_OUTPUT
echo "loader_type=$LOADER_TYPE" >> $GITHUB_OUTPUT
if ${{ env.DEV_ENVIRONMENT == 'true' }}; then
echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT
@ -174,6 +185,7 @@ jobs:
echo "project_version=${{ steps.changelog.outputs.version }}" >> $GITHUB_OUTPUT
fi
echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT
echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT
echo "exists=${{ steps.check_tag.outputs.exists }}" >> $GITHUB_OUTPUT
echo "make_release=${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }}" >> $GITHUB_OUTPUT
@ -197,6 +209,8 @@ jobs:
📃 **Release**: `${{ steps.check.outputs.project_version }}`
📃 **Release Type**: `${{ steps.check.outputs.release_type }}`
📃 **Game Version**: `${{ steps.check.outputs.minecraft_version }}`
📃 **Loader Type**: `${{ steps.check.outputs.loader_type }}`
📃 **Loader Version**: `${{ steps.check.outputs.loader_version }}`
📃 **Dev Environment**: `${{ env.DEV_ENVIRONMENT }}`
📃 **Tag Exists**: `${{ steps.check.outputs.exists }}`
@ -266,6 +280,7 @@ jobs:
📃 **Name**: ${{ needs.info.outputs.project_name }}
📃 **Release**: `${{ steps.changelog.outputs.version }}`
📃 **Release Type**: `${{ needs.info.outputs.release_type }}`
📃 **Loader**: `${{ needs.info.outputs.loader_type }}-${{ needs.info.outputs.loader_version }}`
${{ needs.info.outputs.changelog }}
@ -283,8 +298,22 @@ jobs:
set +e
VERSION=${{ needs.info.outputs.project_version }}
LOADER_VERSION=${{ needs.info.outputs.loader_version }}
LOADER_TYPE=${{ needs.info.outputs.loader_type }}
MINECRAFT_VERSION=${{ needs.info.outputs.mc_version }}
sed -i -e "s/DEV/${VERSION}/g" pakku.json
sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt
sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg
sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/server-overrides/forge-auto-install.txt
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
- name: 📝 Cache pakku
uses: actions/cache@v4.2.4
@ -292,14 +321,17 @@ jobs:
with:
path: build/.cache
key: pakku-cache-${{ hashFiles('pakku-lock.json') }}
restore-keys: pakku-cache-
- name: 📦 Export modpack
run: |
curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J
java -jar pakku.jar fetch
java -jar pakku.jar export
- name: 📁 Rename artifact curseforge
mkdir -p .pakku/multimc-overrides/flame
mkdir -p .pakku/multimc-overrides/mods
- name: 📁 Preparing the artifact curseforge
run: |
cd ./build/curseforge/
mv *.zip $(basename -s .zip *.zip)-curseforge.zip
@ -311,7 +343,7 @@ jobs:
path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip
if-no-files-found: error
- name: 📁 Rename artifact modrinth
- name: 📁 Preparing the artifact modrinth
run: |
cd ./build/modrinth/
mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
@ -323,7 +355,29 @@ jobs:
path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
if-no-files-found: warn
- name: 📁 Rename artifact server
- name: 📁 Preparing the artifact multimc
run: |
mkdir -p .pakku/multimc-overrides/flame
mkdir -p .pakku/multimc-overrides/mods
mv -vf .pakku/multimc-overrides ./build/multimc
cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json
cp -rf ./build/.cache/curseforge/overrides ./build/multimc/.minecraft
cp -rf ./mods ./build/multimc/.minecraft/mods
cd ./build/multimc/
zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/
- name: 🚀 Upload artifact multimc
uses: actions/upload-artifact@v4.6.2
with:
name: ${{ needs.info.outputs.project_full_name }}-multimc
path: ./build/multimc/${{ needs.info.outputs.project_full_name }}-multimc.zip
if-no-files-found: error
- name: 📁 Preparing the artifact server
run: |
cd ./build/serverpack/
mv *.zip $(basename -s .zip *.zip)-serverpack.zip
@ -335,60 +389,9 @@ jobs:
path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip
if-no-files-found: error
build-multimc:
name: 📦 Build MultiMC
needs: [info]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v5.0.0
- name: 🔄 Replace strings
shell: bash
run: |
set +e
VERSION=${{ needs.info.outputs.project_version }}
sed -i -e "s/\"version\": \"[0-9.]*\"/\"version\": \"${VERSION}\"/g" pakku.json
sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt
sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg
- name: 📝 Cache pakku
uses: actions/cache@v4.2.4
id: cache
with:
path: build/.cache
key: pakku-cache-${{ hashFiles('pakku-lock.json') }}
restore-keys: pakku-cache-
- name: 📦 Export
run: |
curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J
java -jar pakku.jar --debug fetch
java -jar pakku.jar --debug export
- name: 📁 Move files
run: |
ls
mkdir -p .pakku/multimc-overrides/flame
mkdir -p .pakku/multimc-overrides/mods
mv -vf ./build/.cache/curseforge/manifest.json .pakku/multimc-overrides/flame/manifest.json
mv -vf ./build/.cache/curseforge/overrides .pakku/multimc-overrides/.minecraft
mv -vf ./mods .pakku/multimc-overrides/.minecraft/mods
cd .pakku/multimc-overrides/
zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/
- name: 🚀 Upload zip multimc
uses: actions/upload-artifact@v4.6.2
with:
name: ${{ needs.info.outputs.project_full_name }}-multimc
path: .pakku/multimc-overrides/${{ needs.info.outputs.project_full_name }}-multimc.zip
if-no-files-found: error
release-github:
name: 🚀 Release to GitHub
needs: [info, build-modpack, build-multimc]
needs: [info, build-modpack]
runs-on: ubuntu-latest
if: ${{ needs.info.outputs.make_release == 'true' }}
outputs:
@ -421,13 +424,6 @@ jobs:
fi
echo "✔️ All artifacts found"
# - name: 🚫 Сlose label "Done"
# uses: Xikaro/close-issues-based-on-label@master
# env:
# LABEL: "Status: Done"
# COMMENT: In ${{ needs.info.outputs.project_version }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 📄 Format diff
id: format_diff
if: ${{ needs.info.outputs.diff != '' }}
@ -578,7 +574,7 @@ jobs:
**Release Type**: `${{ needs.info.outputs.release_type }}`
**Game Version**: `${{ needs.info.outputs.mc_version }}`
[CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern/files/${{ needs.release-curseforge.outputs.id }}) • [GitHub](${{ needs.release-github.outputs.url }}) • [Issues](https://github.com/${{ github.repository }}/issues)
:curseforge_logo: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern/files/${{ needs.release-curseforge.outputs.id }}) • :github_logo: [GitHub](${{ needs.release-github.outputs.url }}) • [Issues](https://github.com/${{ github.repository }}/issues)
```markdown
${{ steps.truncated.outputs.text }}
- ...```

6
.pakku/server-overrides/forge-auto-install.txt
View file

@ -2,12 +2,12 @@
# Specify your desired Minecraft-Version.
# Possible options are [Version like: "1.20.4" or "latest"]
minecraftVersion=1.20.1
minecraftVersion=MINECRAFT_VERSION
# Specify your desired LoaderType.
# Possible options are ["Forge" or "NeoForge"]
loaderType=Forge
loaderType=LOADER_TYPE
# Specify your desired Loader-Version.
# Possible options are [Version like: "20.4.164-beta" or "latest" or "recommended"]
loaderVersion=47.4.2
loaderVersion=LOADER_VERSION

2
config/corpsecurioscompat-common.toml
View file

@ -3,4 +3,6 @@
[general]
#Items that should not be transferred to curios slots (format: 'modid:item')
blacklisted_items = []
#Whether cursed items should be transferred back to curios slots (true = transfer cursed items, false = don't transfer)
transfer_cursed_items = false

2
config/everycomp-common.toml
View file

@ -2,8 +2,6 @@
[general]
#Puts all the added items into a new Every Compat tab instead of their own mod tabs. Be warned that if disabled it could cause some issue with some mods that have custom tabs
creative_tab = true
#Makes dynamic assets that are generated depend on loaded resource packs. Turn off to make them just use vanilla assets
assets_depend_on_loaded_packs = true
#Creates a debug folder inside your instance directory where all the dynamically generated resources will be saved
save_debug_resources = false
#Sends a packet to verify all dependencies mod versions are the same on connect. DIsable if it causes issues

8
config/everycomp-hazardous.toml
View file

@ -19,7 +19,7 @@
#Exclude WoodType from all of Modules
# EXAMPLE: blacklist = [
# "forestry:.*fireproof.*", COMMENT: .* is an RegEx, it exclude all of WoodType containing "fireproof" from Forestry
# "biomesoplenty:.*", COMMENT: .* is an RegEx, it exclude all of WoodType from Wood Mod for any Module
# "biomesoplenty:.*", COMMENT: .* is an RegEx, it exclude all of WoodType from Wood Mod for any Module
# "biomesoplenty:redwood" COMMENT: exclude redwood from Wood Mod for any module
# ]
#
@ -34,9 +34,9 @@
#Exclude EntrySet from the module for All of WoodType or LeavesType
# This is only applied to Wood-Good.
# EXAMPLE: blacklist = [
# "chipped:checkered_trapdoor", COMMENT: chipped:checkered_oak_trapdoor without "oak"
# "variantvanillablocks:chest", COMMENT: variantvanillablocks:oak_chest without "oak"
# "chipped:.*" COMMENT: .* is an regex which will exclude all of EntrySets from one Module - Wood-Good ONLY
# "chipped:checkered_trapdoor", COMMENT: chipped:checkered_oak_trapdoor without "oak"
# "variantvanillablocks:chest", COMMENT: variantvanillablocks:oak_chest without "oak"
# "chipped:.*" COMMENT: .* is an regex which will exclude all of EntrySets from one Module - Wood-Good ONLY
# ]
#
blacklist = []

9
config/fancymenu/options.txt
View file

@ -14,7 +14,6 @@ B:advanced_customization_mode = 'false';
##[loading]
B:preload_animations = 'true';
S:preload_resources = '[cubic_panorama]beneath%!source_end!%[slideshow]new_loading_screen%!source_end!%';
S:custom_game_intro_skip_text = '';
B:allow_game_intro_skip = 'true';
@ -85,4 +84,10 @@ B:show_welcome_screen = 'false';
##[keyframe_editor]
B:arrow_keys_move_preview = 'false';
B:arrow_keys_move_preview = 'false';
##[advanced]
L:placeholder_caching_duration_ms = '30';
L:requirement_caching_duration_ms = '0';

8
config/tfg-client.toml Normal file
View file

@ -0,0 +1,8 @@
[propick_vein_rendering]
#
#
#1 in N chance for the precise xray ore prospector particles to appear per block. Set to 0 to disable. Default: 5
#Range: 0 ~ 1000
PreciseOreProspectorParticleChance = 5

10
config/tfg-common.toml
View file

@ -1,5 +1,7 @@
#Should be create compat enabled?
createCompat = true
#Should be tfc ambiental compat enabled?
tfcAmbientalCompat = true
[general]
#Should be create compat enabled?
createCompat = true
#Should be tfc ambiental compat enabled?
tfcAmbientalCompat = true

4
pakku.json
View file

@ -12,6 +12,7 @@
"!kubejs/probe/**"
],
"server_overrides": [
"!kubejs/assets",
"forge-auto-install.txt",
"generate_auto_installation_file.bat",
"minecraft_server.jar",
@ -19,8 +20,7 @@
"server_starter.conf",
"server-icon.png",
"start_server.bat",
"README.md",
"!kubejs/assets/**"
"README.md"
],
"client_overrides": [
"resourcepacks"