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

.github/workflows/build.yml

@@ -327,19 +327,23 @@ jobs:
 
 
           sed -i -e "s/DEV/${VERSION}/g" pakku.json
+          sed -i -e "s/DEV/${VERSION}/g" .github/docker/docker-compose.yml
           sed -i -e "s/DEV/${VERSION}/g" config/mod-director/modpack.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/DEV/${VERSION}/g" .pakku/server-overrides/server.properties
 
+          
+          sed -i -e "s/LOADER_VERSION/${LOADER_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/multimc-overrides/mmc-pack.json
           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/multimc-overrides/mmc-pack.json
           sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
 
-      - name: 📝 Cache pakku
+      - name: 📝 Cache Pakku
         uses: actions/cache@v5.0.1
         id: cache
         with:
@@ -347,7 +351,7 @@ jobs:
           key: pakku-cache-${{ hashFiles('pakku-lock.json') }}
           restore-keys: pakku-cache-
 
-      - name: 📦 Export modpack
+      - 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
@@ -356,7 +360,7 @@ jobs:
           mkdir -p .pakku/multimc-overrides/flame
           mkdir -p .pakku/multimc-overrides/mods
 
-      - name: 📁 Preparing the artifact curseforge
+      - name: 📁 Preparing the artifact CurseForge
         run: |
           cd ./build/curseforge/
           mv *.zip $(basename -s .zip *.zip)-curseforge.zip
@@ -368,19 +372,19 @@ jobs:
           path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip
           if-no-files-found: error
 
-      - name: 📁 Preparing the artifact modrinth
+      - name: 📁 Preparing the artifact Modrinth
         run: |
           cd ./build/modrinth/
           mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
 
-      - name: 🚀 Upload artifact modrinth
+      - name: 🚀 Upload artifact Modrinth
         uses: actions/upload-artifact@v6.0.0
         with:
           name: ${{ needs.info.outputs.project_full_name }}-modrinth
           path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
           if-no-files-found: warn
 
-      - name: 📁 Preparing the artifact multimc
+      - name: 📁 Preparing the artifact MultiMC
         run: |
           mkdir -p .pakku/multimc-overrides/flame
           mkdir -p .pakku/multimc-overrides/mods
@@ -397,25 +401,39 @@ jobs:
           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
+      - name: 🚀 Upload artifact MultiMC
         uses: actions/upload-artifact@v6.0.0
         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
+      - name: 📁 Preparing the artifact Server
         run: |
           cd ./build/serverpack/
           mv *.zip $(basename -s .zip *.zip)-serverpack.zip
 
-      - name: 🚀 Upload artifact server
+      - name: 🚀 Upload artifact Server
         uses: actions/upload-artifact@v6.0.0
         with:
           name: ${{ needs.info.outputs.project_full_name }}-serverpack
           path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip
           if-no-files-found: error
 
+      - name: 📁 Preparing the artifact Docker
+        run: |
+          mv -vf .pakku/docker-overrides ./build/docker
+
+          cd ./build/docker/
+          mv *.yml $(basename -s .yml *.yml)-docker.yml
+
+      - name: 🚀 Upload Docker Artifact
+        uses: actions/upload-artifact@v6.0.0
+        with:
+          name: ${{ needs.info.outputs.project_full_name }}-docker
+          path: ./.github/docker/${{ needs.info.outputs.project_full_name }}-docker.yml
+          if-no-files-found: error
+
   release-github:
     name: 🚀 Release to GitHub
     needs: [info, build-project]
@@ -449,6 +467,9 @@ jobs:
           if [ ! -f ${{ needs.info.outputs.project_full_name }}-multimc.zip ]; then
             echo '::error::No value found for artifact `multimc.zip`.' && exit 1
           fi
+          if [ ! -f ${{ needs.info.outputs.project_full_name }}-docker.yml ]; then
+            echo '::error::No value found for artifact `docker.yml`.' && exit 1
+          fi
           echo "✔️ All artifacts found"
 
       - name: 📄 Format diff
@@ -476,6 +497,7 @@ jobs:
             ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
             ${{ needs.info.outputs.project_full_name }}-serverpack.zip
             ${{ needs.info.outputs.project_full_name }}-multimc.zip
+            ${{ needs.info.outputs.project_full_name }}-docker.yml
           prerelease: ${{ needs.info.outputs.release_type != 'release' }}
           generate_release_notes: true
           token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -23,6 +23,10 @@ build/
 !.pakku/**/*
 !pakku.jar
 
+# Docker
+/.github/docker/data
+/.github/docker/backups
+
 # Configs
 config/jei/world/
 config/gregtech/terminal/
@@ -62,9 +66,11 @@ defaultconfigs/ftbranks/players.snbt
 !bansoukou/**.zip
 
 
-/.bobby/
-/.mixin.out/
+/.bobby
+/.mixin.out
 /tacz/tacz_default_gun
+/tacz_backup
+/moonlight-global-datapacks
 /classOut
 /backups
 /profileImage
@@ -93,6 +99,9 @@ defaultconfigs/ftbranks/players.snbt
 /gtceu/prospection_cache
 /data
 /ESM
+/schematics
+/scripts
+/gtceu
 
 # Client data
 bansoukou
@@ -128,7 +137,3 @@ libEffekseerNativeForJava.so
 # .pakku/server-overrides/scripts
 # .pakku/server-overrides/mods
 # .pakku/server-overrides/user_jvm_args.txt
-
-
-
-

.pakku/docker-overrides/docker-compose.yml

@@ -0,0 +1,30 @@
+services:
+  minecraft:
+    image: itzg/minecraft-server:latest
+    container_name: terrafirmagreg-modern
+    tty: true
+    stdin_open: true
+    ports:
+      - "25565:25565"
+    environment:
+      EULA: "true"
+      ENABLE_RCON: "false"
+      GUI: "false"
+      MEMORY: 8G
+
+      TYPE: CUSTOM
+      CUSTOM_SERVER: ./minecraft_server.jar
+      SKIP_GENERIC_PACK_UPDATE_CHECK: "true"
+      OVERRIDE_SERVER_PROPERTIES: "false"
+
+
+      GENERIC_PACKS: TerraFirmaGreg-Modern-DEV-serverpack
+      GENERIC_PACKS_SUFFIX: .zip
+      GENERIC_PACKS_PREFIX: https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/download/DEV/
+
+    volumes:
+      - ./data:/data
+      - ./backups:/backups
+
+volumes:
+  minecraft-data:

.pakku/server-overrides/server.properties

@@ -29,7 +29,7 @@ max-chained-neighbor-updates=1000000
 max-players=64
 max-tick-time=600000
 max-world-size=29999984
-motd=[TerraFirmaGreg-Modern]
+motd=[TerraFirmaGreg-Modern] Server DEV
 network-compression-threshold=256
 online-mode=true
 op-permission-level=4

kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/firmaciv/beneath.json

@@ -0,0 +1,37 @@
+{
+    "name": "幽冥之地",
+    "category": "tfc:firmaciv",
+    "icon": "beneath:wood/sapling/crimson",
+    "flag": "mod:beneath",
+    "read_by_default": true,
+    "sortnum": 100,
+    "pages": [
+        {
+            "type": "patchouli:text",
+            "text": "在火星遥远的边疆，你可以找到绯红木和诡异木，用来建造相当不错的$(l:firmaciv/watercraft)船$()。"
+        },
+        {
+            "type": "patchouli:empty"
+        },
+        {
+            "type": "patchouli:spotlight",
+            "title": "软木",
+            "text": "软木的木质和树皮足够柔软，非常适合制作$(l:firmaciv/canoe)独木舟$()。",
+            "item": "beneath:wood/stripped_log/crimson"
+        },
+        {
+            "type": "patchouli:text",
+            "text": "$(li)绯红木$()"
+        },
+        {
+            "type": "patchouli:spotlight",
+            "title": "硬木",
+            "text": "硬木以其卓越的坚固性著称，是建造更大、更精密船只的理想选择，例如$(l:firmaciv/rowboat)划艇$()和$(l:firmaciv/sloop)单桅纵帆船$()。",
+            "item": "beneath:wood/planks/warped"
+        },
+        {
+            "type": "patchouli:text",
+            "text": "$(li)诡异木$()"
+        }
+    ]
+}

kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/blast_furnace_tips.json

@@ -12,7 +12,7 @@
         {
             "type": "patchouli:spotlight",
             "item": "gtceu:compressed_fireclay",
-            "text": "在将耐火黏土全部用于制作20块耐火砖前，请注意：进入蒸汽时代后，你可通过$(item)压缩耐火黏土$()（需要蒸汽机器制备黏土粉）仅用黏土制作耐火砖。这能让你节省$(item)高岭土$()与$(item)石墨$()用于制作$(thing)铸造台$()。"
+            "text": "在将耐火黏土全部用于制作20块耐火砖前，请注意：进入蒸汽时代后，你就能以低得多的成本制作它。这能让你节省$(item)高岭土$()与$(item)石墨$()用于制作$(thing)铸造台$()。"
         },
         {
             "type": "patchouli:spotlight",
@@ -32,11 +32,11 @@
         },
         {
             "type": "patchouli:text",
-            "text": "你可以使用机械动力的$(item)动力泵$()直接从高炉泵出液态金属。将其导入$(l:tfc:tfcchannelcasting/channel_casting)铸造台$()后，用漏斗或溜槽提取锭——轻松实现自动化！$(br2)还可使用$(item)机械手$()自动拉动风箱！但需注意：过度使用风箱会加速燃料消耗并加快$(thing)吹风管$()的损坏速度。$(br2)产出的$(item)生铁$()与$(item)高碳钢$()可通过$(thing)锻造锤$()进行加工。"
+            "text": "你可以使用机械动力的$(item)动力泵$()直接从高炉泵出液态金属。将其导入$(l:tfc:tfcchannelcasting/channel_casting)铸造台$()后，用漏斗或溜槽提取锭——轻松实现自动化！$(br2)还可使用$(item)机械手$()自动拉动风箱！但需注意：过度使用风箱会加速燃料消耗并加快$(thing)吹风管$()的损坏速度。$(br2)产出的$(item)生铁$()与$(item)高碳钢$()可通过$(thing)锻造锤$()或$(thing)杠杆锤$()进行加工。"
         },
         {
             "type": "patchouli:text",
-            "text": "你可以用朝向高炉的漏斗自动替换破损的风管。"
+            "text": "你可以用朝向高炉的漏斗或物品管道自动替换破损的风管。"
         }
     ]
 }