-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from MeepishRealms/dev
Merge v1.5.0 from Dev into Main
- Loading branch information
Showing
47 changed files
with
2,816 additions
and
484 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| /.minecraft/saves/* | ||
| /.minecraft/logs/* | ||
| /.minecraft/dashloader-cache/* | ||
| /.minecraft/mods/* | ||
| /.minecraft/screenshots/* | ||
| /.minecraft/schematics/* | ||
| /.minecraft/crash-reports/* | ||
| saves/* | ||
| logs/* | ||
| screenshots/* | ||
| schematics/* | ||
| crash-reports/* | ||
| /.minecraft/.cache/* | ||
| /.minecraft/usercache.json | ||
| /.minecraft/usernamecache.json | ||
| *.mrpack | ||
| usercache.json | ||
| usernamecache.json | ||
| *.mrpack | ||
| /*.zip | ||
| /.idx/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Docker Compose | ||
| The recommended method to run Modded Expansion on Docker is using Docker Compose. Modern versions of Docker should come with compose functionality out-of-the-box. | ||
|
|
||
| **Note: Docker versions using a Windows kernel are not supported.** | ||
|
|
||
| ## Installation | ||
|
|
||
| 1. `cd` into the folder where you placed the `docker-compose.yml` file on your server. | ||
| 2. Run the following command: | ||
| ``` | ||
| $ docker compose up -d | ||
| ``` | ||
|
|
||
| If your user is NOT part of the `docker` group, you will need to run the aforementioned command as root using `sudo` or other methods. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #To spin up this compose file, make sure you are "cd"'d into the directory where this file is stored. | ||
| #Then run `docker compose up -d" | ||
| services: | ||
| modded_expansion: | ||
| name: mrme | ||
| image: docker.io/itzg/minecraft-server:java17-graalvm | ||
| network: host | ||
| tty: true | ||
| stdin_open: true | ||
| volumes: | ||
| - mrme_world:/data | ||
| environment: | ||
| EULA: "true" | ||
| TYPE: "MODRINTH" | ||
| MODRINTH_MODPACK: "FpI88Ccr" | ||
| MODRINTH_DEFAULT_VERSION_TYPE: "release" | ||
| CONFIGPATH: "config" | ||
| MOTD: "MeepishRealms Modded Expansion Dedicated Server" | ||
| ICON: "https://www.dropbox.com/scl/fi/goueaqlx8sk3nctq44fe9/mrmediscord.png?rlkey=e00ucxfupu9rxbrivxiqpuoya&dl=1" | ||
| MEMORY: "8G" | ||
| JVM_OPTS: "-XX:+UseG1GC -XX:MaxGCPauseMillis=130 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=28 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=20 -XX:G1MixedGCCountTarget=3 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:SurvivorRatio=32 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150 -XX:AllocatePrefetchStyle=3 -XX:+UseTransparentHugePages -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:+EagerJVMCI -Dgraal.TuneInlinerExploration=1 -Dgraal.CompilerConfiguration=enterprise -XX:ConcGCThreads=4" | ||
| NETWORK_COMPRESSION_THRESHOLD: "256" | ||
| SYNC_CHUNK_WRITES: "false" | ||
| DIFFICULTY: "hard" | ||
| VIEW_DISTANCE: "16" | ||
| ALLOW_FLIGHT: "true" | ||
| SPAWN_PROTECTION: "0" | ||
| ENABLE_COMMAND_BLOCK: "true" | ||
| ENABLE_WHITELIST: "true" | ||
| ENFORCE_WHITELIST: "true" | ||
| SNOOPER_ENABLED: "false" | ||
| restart: always |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # Quadlet for Podman | ||
| The recommended method to run Modded Expansion on Podman is using Quadlets. Modern versions of Podman should come with quadlet functionality out-of-the-box. | ||
|
|
||
| *You can also use `podman-compose` along with the `docker-compose.yml` file in the containers folder as well, but this functionality will need to be installed separately.* | ||
|
|
||
| To begin, download the `mrme.container` and `mrme.volume` files within this folder onto your Linux server. | ||
|
|
||
| Next, decide if you want to run Modded Expansion as a rootful or rootless container. | ||
|
|
||
| ## Rootless Installation (Recommended) | ||
| 1. `cd` into the folder where you placed the Quadlet files on your server. | ||
| 2. Move both `mrme.container` and `mrme.volume` into `~/.config/containers/systemd/`. | ||
| ``` | ||
| $ mv mrme.container mrme.volume ~/.config/containers/systemd/ | ||
| ``` | ||
| 3. Reload the systemd user daemon. | ||
| ``` | ||
| $ systemctl --user daemon-reload | ||
| ``` | ||
| 4. Start the MR:ME service. | ||
| ``` | ||
| $ systemctl --user start mrme.service | ||
| ``` | ||
|
|
||
| The container will now automatically start and self-update on future boots. | ||
|
|
||
| ## Rootful Installation | ||
| All commands for this set of instructions past the first step are required to be run as root, using `sudo` or otherwise. | ||
| 1. `cd` into the folder where you placed the Quadlet files on your server. | ||
| 2. Move both `mrme.container` and `mrme.volume` into `/etc/containers/systemd/`. | ||
| ``` | ||
| # mv mrme.container mrme.volume /etc/containers/systemd/ | ||
| ``` | ||
| 3. Reload the systemd system daemon. | ||
| ``` | ||
| # systemctl daemon-reload | ||
| ``` | ||
| 4. Start the MR:ME service. | ||
| ``` | ||
| # systemctl start mrme.service | ||
| ``` | ||
|
|
||
| The container will now automatically start and self-update on future boots. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| [Container] | ||
| #By using this Quadlet template, you are agreeing to Mojang's EULA. | ||
| Environment=EULA=true | ||
| #Container Properties | ||
| AutoUpdate=registry | ||
| ContainerName=mrme | ||
| Image=docker.io/itzg/minecraft-server:java17-graalvm | ||
| Network=host | ||
| PodmanArgs=--interactive --tty | ||
| Volume=mrme.volume:/data | ||
| #Modrinth Settings | ||
| Environment=TYPE=MODRINTH | ||
| Environment=MODRINTH_MODPACK=FpI88Ccr | ||
| Environment=MODRINTH_DEFAULT_VERSION_TYPE=release | ||
| Environment=CONFIGPATH=config | ||
| #Server Identity | ||
| Environment=MOTD="MeepishRealms: Modded Expansion Dedicated Server" | ||
| Environment=ICON=https://www.dropbox.com/scl/fi/goueaqlx8sk3nctq44fe9/mrmediscord.png?rlkey=e00ucxfupu9rxbrivxiqpuoya&dl=1 | ||
| #Performance and Java Settings | ||
| Environment=MEMORY=8G | ||
| Environment=JVM_OPTS="-XX:+UseG1GC -XX:MaxGCPauseMillis=130 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=28 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=20 -XX:G1MixedGCCountTarget=3 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:SurvivorRatio=32 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150 -XX:AllocatePrefetchStyle=3 -XX:+UseTransparentHugePages -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:+EagerJVMCI -Dgraal.TuneInlinerExploration=1 -Dgraal.CompilerConfiguration=enterprise -XX:ConcGCThreads=4" | ||
| Environment=NETWORK_COMPRESSION_THRESHOLD=256 | ||
| Environment=SYNC_CHUNK_WRITES=false | ||
| #Server Properties | ||
| Environment=DIFFICULTY=hard | ||
| Environment=VIEW_DISTANCE=16 | ||
| Environment=ALLOW_FLIGHT=true | ||
| Environment=SPAWN_PROTECTION=1 | ||
| Environment=ENABLE_COMMAND_BLOCK=true | ||
| Environment=ENABLE_WHITELIST=true | ||
| Environment=ENFORCE_WHITELIST=true | ||
| Environment=SNOOPER_ENABLED=false | ||
|
|
||
| [Service] | ||
| #Restarts container on crash unless manually stopped with systemctl. | ||
| Restart=always | ||
| TimeoutStopSec=120 | ||
|
|
||
| [Install] | ||
| #Starts container on boot. | ||
| WantedBy=multi-user.target default.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [Volume] | ||
| VolumeName=mrme_world |
Oops, something went wrong.