From c7c9882fca86ad33f983947e2bfba6839f8f24ca Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 30 Jun 2024 19:29:59 -0500 Subject: [PATCH] docs: updating AUTO_CURSEFORGE examples that no longer need /downloads --- examples/aof7/docker-compose.yml | 15 --------------- examples/atm8/docker-compose.yml | 5 ++--- examples/atm9/docker-compose.yml | 1 - .../auto-cf/using-excludes/docker-compose.yml | 3 +-- examples/bettermc/docker-compose.yml | 3 +-- examples/rad2/compose.yaml | 17 ----------------- .../vault-hunters-1-18-2/docker-compose.yml | 4 ---- files/cf-exclude-include.json | 9 +++++++++ 8 files changed, 13 insertions(+), 44 deletions(-) diff --git a/examples/aof7/docker-compose.yml b/examples/aof7/docker-compose.yml index fea7c22584c..4e2c94060a1 100644 --- a/examples/aof7/docker-compose.yml +++ b/examples/aof7/docker-compose.yml @@ -16,21 +16,6 @@ services: - "25565:25565" volumes: - mc-data:/data - - ./downloads:/downloads - # Manually download the following and put into the 'downloads' directory next to this compose file - # - # Mod Filename Download page - # =========================== ========================================= ==================================================================================== - # Fish of Thieves [Fabric 1.20.1] Fish of Thieves v3.0.3 https://www.curseforge.com/minecraft/mc-mods/fish-of-thieves/files/4958329 - # Only Hammers [FORGE/FABRIC] OnlyHammers-1.20.1-0.6-Fabric https://www.curseforge.com/minecraft/mc-mods/only-hammers-forge-fabric/files/4832068 - # Sprinklerz sprinklerz-0.5_fabric.jar https://www.curseforge.com/minecraft/mc-mods/sprinklerz/files/4835664 - # Frog Legs (Fabric/Forge) FrogLegs-v2.0.0-1.20.1-Fabric.jar https://www.curseforge.com/minecraft/mc-mods/froglegs/files/4917818 - # TrimsEffects [FABRIC] TrimsEffects - MC 1.20.X - 1.1.0 https://www.curseforge.com/minecraft/mc-mods/trimseffects/files/4954156 - # Display Case Display Case-fabric-1.20-1.0.8.jar https://www.curseforge.com/minecraft/mc-mods/displaycase/files/4921333 - # Structory: Towers Structory Towers 1.20.4 v1.0.6 https://www.curseforge.com/minecraft/mc-mods/structory-towers/files/4937875 - # Packet Fixer Packet Fixer Fabric 1.2.1 https://www.curseforge.com/minecraft/mc-mods/packet-fixer/files/4884316 - # Perfect Plushies Perfect Plushies 1.9.0 [Fabric] https://www.curseforge.com/minecraft/mc-mods/perfect-plushies/files/4985767 - # Structory Structory 1.20.2 v1.3.4 https://www.curseforge.com/minecraft/mc-mods/structory/files/4937872 volumes: mc-data: {} diff --git a/examples/atm8/docker-compose.yml b/examples/atm8/docker-compose.yml index 7b9fb6bc1dc..fe8425b88cf 100644 --- a/examples/atm8/docker-compose.yml +++ b/examples/atm8/docker-compose.yml @@ -1,6 +1,6 @@ services: mc: - image: itzg/minecraft-server + image: itzg/minecraft-server:java17 ports: - "25565:25565" environment: @@ -9,11 +9,10 @@ services: # allocate from https://console.curseforge.com/ and set in .env file CF_API_KEY: ${CF_API_KEY} CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-the-mods-8 - CF_FILENAME_MATCHER: "1.0.6" +# CF_FILENAME_MATCHER: "1.1.0" MEMORY: 4G volumes: - mc-data:/data - - ../downloads:/downloads # Since Docker's default volume driver creates volumes owned by root, this # init container will change ownership to match final UID of mc service, above init-filebrowser: diff --git a/examples/atm9/docker-compose.yml b/examples/atm9/docker-compose.yml index 374056ec239..19566044123 100644 --- a/examples/atm9/docker-compose.yml +++ b/examples/atm9/docker-compose.yml @@ -14,7 +14,6 @@ services: MEMORY: 4G volumes: - mc-data:/data - - ./downloads:/downloads volumes: mc-data: {} \ No newline at end of file diff --git a/examples/auto-cf/using-excludes/docker-compose.yml b/examples/auto-cf/using-excludes/docker-compose.yml index f03745b2b77..9c2d83b828a 100644 --- a/examples/auto-cf/using-excludes/docker-compose.yml +++ b/examples/auto-cf/using-excludes/docker-compose.yml @@ -1,6 +1,6 @@ services: mc: - image: itzg/minecraft-server:java8-multiarch + image: itzg/minecraft-server:java8 ports: - "25565:25565" environment: @@ -43,7 +43,6 @@ services: MEMORY: 4G volumes: - mc-data:/data - - ./downloads:/downloads volumes: mc-data: {} \ No newline at end of file diff --git a/examples/bettermc/docker-compose.yml b/examples/bettermc/docker-compose.yml index aead70a20ec..d38e0775fff 100644 --- a/examples/bettermc/docker-compose.yml +++ b/examples/bettermc/docker-compose.yml @@ -7,11 +7,10 @@ services: # Set CF_API_KEY=... in a .env file next to this compose file and don't source control that file CF_API_KEY: ${CF_API_KEY} CF_SLUG: better-mc-fabric-bmc1 - CF_FILENAME_MATCHER: v18.5 +# CF_FILENAME_MATCHER: v18.5 MEMORY: 4G volumes: - mc:/data - - ../downloads:/downloads ports: - "25565:25565" diff --git a/examples/rad2/compose.yaml b/examples/rad2/compose.yaml index 80da4794c7b..bf1d58ec77b 100644 --- a/examples/rad2/compose.yaml +++ b/examples/rad2/compose.yaml @@ -13,38 +13,21 @@ services: # Optional: select a specific version/file #CF_FILENAME_MATCHER: "0.2.34" CF_EXCLUDE_MODS: | - auudio-forge - betterf3 - better-third-person - clickable-advancements controlling craftpresence creative-core default-options - drippy-loading-screen - embeddium - embeddium-extension - embeddium-extras equipment-compare - ezzoom - fading-night-vision - fancymenu item-borders itemphysic-lite - just-enough-resources-jer konkrete - legendary-tooltips - mouse-tweaks oauth - oculus sound-filters - textrues-embeddium-options toast-control CF_FORCE_SYNCHRONIZE: "true" MEMORY: 4G volumes: - mc-data:/data - - ./downloads:/downloads volumes: mc-data: {} diff --git a/examples/vault-hunters-1-18-2/docker-compose.yml b/examples/vault-hunters-1-18-2/docker-compose.yml index b3b32021fb9..393dc4474c8 100644 --- a/examples/vault-hunters-1-18-2/docker-compose.yml +++ b/examples/vault-hunters-1-18-2/docker-compose.yml @@ -16,10 +16,6 @@ services: ENABLE_COMMAND_BLOCK: true DIFFICULTY: hard volumes: - # Need to place non-distributable mods in ./downloads/mods - # As of Update-10.0.0 - # - Neon Craft 2 v2.2: https://www.curseforge.com/minecraft/mc-mods/neon-craft-2-mod/files/3726051 - - ./downloads:/downloads - mc-data:/data volumes: diff --git a/files/cf-exclude-include.json b/files/cf-exclude-include.json index 5354d66c3c5..7a83489e744 100644 --- a/files/cf-exclude-include.json +++ b/files/cf-exclude-include.json @@ -1,6 +1,7 @@ { "globalExcludes": [ "ambientsounds", + "auudio-forge", "appleskin", "armor-toughness-bar", "better-advancements", @@ -9,18 +10,25 @@ "biomeinfo", "block-drops-jei-addon", "cherished-worlds", + "clickable-advancements", "controlling", "ctm", "custom-main-menu", "defensive-measures", "ding", + "drippy-loading-screen", "dynamiclights-reforged", "embeddium", + "embeddium-extension", + "embeddium-extras", "enchantment-descriptions", "entity-texture-features-fabric", "entityculling", "extreme-sound-muffler", + "ezzoom", + "fading-night-vision", "falling-leaves-forge", + "fancymenu", "free-cam", "ignitioncoil", "inmisaddon", @@ -50,6 +58,7 @@ "searchables", "skin-layers-3d", "sodium", + "textrues-embeddium-options", "textrues-rubidium-options", "thaumic-jei", "tips",