feat!: restructure all available mods

crafthippie · Jul 27, 2024 · a249775 · a249775
1 parent 38583ef
commit a249775
Show file tree

Hide file tree

Showing 89 changed files with 829 additions and 385 deletions.
diff --git a/README.md b/README.md
@@ -33,9 +33,8 @@ MINECRAFT_BACKUPS_DIR = ${MINECRAFT_DATA_DIR}/backups
 
 ## Inherited environment variables
 
--   [webhippie/minecraft-forge](https://github.com/dockhippie/minecraft-forge#available-environment-variables)
 -   [webhippie/minecraft-vanilla](https://github.com/dockhippie/minecraft-vanilla#available-environment-variables)
--   [webhippie/adoptopenjdk](https://github.com/dockhippie/adoptopenjdk#available-environment-variables)
+-   [webhippie/temurin](https://github.com/dockhippie/adoptopenjdk#available-environment-variables)
 -   [webhippie/ubuntu](https://github.com/dockhippie/ubuntu#available-environment-variables)
 
 ## Contributing

diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
@@ -1,14 +1,22 @@
-FROM ghcr.io/dockhippie/minecraft-forge:47.2-amd64
+FROM ghcr.io/dockhippie/minecraft-vanilla:1.20.1-amd64 AS build
 
 EXPOSE 25565 25575 8123
 
+ENV FORGE_VERSION 47.1.106
+ENV FORGE_URL https://maven.neoforged.net/releases/net/neoforged/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar
+
 ENV DYNMAP_JAR Dynmap-3.7-beta-4-forge-1.20.jar
 ENV DYNMAP_URL https://mediafilez.forgecdn.net/files/4979/24/${DYNMAP_JAR}
 
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
+    curl --create-dirs -sLo /usr/share/minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar ${FORGE_URL} && \
+    cd /usr/share/minecraft && \
+    mkdir mods && \
+    java -jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar --installServer && \
+    rm -f forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar.log run.bat run.sh && \
     curl --create-dirs -sLo /usr/share/minecraft/mods/${DYNMAP_JAR} ${DYNMAP_URL}
 
 ENV MINECRAFT_LEVEL_TYPE DEFAULT

diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
@@ -1,14 +1,22 @@
-FROM ghcr.io/dockhippie/minecraft-forge:47.2-arm64
+FROM ghcr.io/dockhippie/minecraft-vanilla:1.20.1-arm64 AS build
 
 EXPOSE 25565 25575 8123
 
+ENV FORGE_VERSION 47.1.106
+ENV FORGE_URL https://maven.neoforged.net/releases/net/neoforged/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar
+
 ENV DYNMAP_JAR Dynmap-3.7-beta-4-forge-1.20.jar
 ENV DYNMAP_URL https://mediafilez.forgecdn.net/files/4979/24/${DYNMAP_JAR}
 
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
+    curl --create-dirs -sLo /usr/share/minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar ${FORGE_URL} && \
+    cd /usr/share/minecraft && \
+    mkdir mods && \
+    java -jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar --installServer && \
+    rm -f forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar.log run.bat run.sh && \
     curl --create-dirs -sLo /usr/share/minecraft/mods/${DYNMAP_JAR} ${DYNMAP_URL}
 
 ENV MINECRAFT_LEVEL_TYPE DEFAULT