Merge "WORKSPACE: cleanup"
diff --git a/personal/q3k/minecraft/Dockerfile-paper b/personal/q3k/minecraft/Dockerfile-paper
index fbf17dd..d1c39e4 100644
--- a/personal/q3k/minecraft/Dockerfile-paper
+++ b/personal/q3k/minecraft/Dockerfile-paper
@@ -11,7 +11,7 @@
apt-get -y install build-essential python3-dev python3-pil python3-numpy ;\
mkdir overviewer ;\
cd overviewer ;\
- wget --quiet https://github.com/overviewer/Minecraft-Overviewer/archive/v0.15.0.tar.gz ;\
+ wget --quiet https://overviewer.org/builds/src/152/overviewer-0.15.77.tar.gz ;\
tar xvf *.tar.gz ;\
cd Minecraft-Overviewer* ;\
python3 setup.py build ;\
@@ -26,20 +26,15 @@
USER minecraft
WORKDIR /home/minecraft
+ARG VERSION=1.16.1
RUN set -e -x ;\
- mkdir build ;\
- cd build ;\
- wget --quiet https://papermc.io/api/v1/paper/1.15.2/333/download ;\
- cp paper*jar .. ;\
- cd .. ;\
- rm -rf build ;\
- mv paper*.jar paper.jar
+ wget --quiet https://papermc.io/api/v1/paper/${VERSION}/latest/download ;\
+ mv download paper.jar
-ADD worldedit-bukkit-7.1.0.jar .
-ADD worldguard-bukkit-7.0.2.jar .
+ADD worldedit-bukkit-7.2.0-beta-01.jar .
+ADD worldguard-bukkit-7.0.4-beta1.jar .
RUN set -e -x ;\
- VERSION=1.15.2 ;\
mkdir -p /home/minecraft/.minecraft/versions/${VERSION}/ ;\
wget --quiet https://overviewer.org/textures/${VERSION} -O /home/minecraft/.minecraft/versions/${VERSION}/${VERSION}.jar
diff --git a/personal/q3k/minecraft/Dockerfile-spigot b/personal/q3k/minecraft/Dockerfile-spigot
index 61852a5..cf47ea8 100644
--- a/personal/q3k/minecraft/Dockerfile-spigot
+++ b/personal/q3k/minecraft/Dockerfile-spigot
@@ -11,7 +11,7 @@
apt-get -y install build-essential python3-dev python3-pil python3-numpy ;\
mkdir overviewer ;\
cd overviewer ;\
- wget --quiet https://github.com/overviewer/Minecraft-Overviewer/archive/v0.15.0.tar.gz ;\
+ wget --quiet https://overviewer.org/builds/src/152/overviewer-0.15.77.tar.gz ;\
tar xvf *.tar.gz ;\
cd Minecraft-Overviewer* ;\
python3 setup.py build ;\
@@ -26,21 +26,21 @@
USER minecraft
WORKDIR /home/minecraft
+ARG VERSION=1.16.1
RUN set -e -x ;\
mkdir build ;\
cd build ;\
- wget --quiet https://hub.spigotmc.org/jenkins/job/BuildTools/112/artifact/target/BuildTools.jar ;\
- java -jar BuildTools.jar --rev 1.15.2 ;\
+ wget --quiet https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar ;\
+ java -jar BuildTools.jar --rev 1.16.1 ;\
cp spigot*jar .. ;\
cd .. ;\
rm -rf build ;\
mv spigot*.jar spigot.jar
-ADD worldedit-bukkit-7.1.0.jar .
-ADD worldguard-bukkit-7.0.2.jar .
+ADD worldedit-bukkit-7.2.0-beta-01.jar .
+ADD worldguard-bukkit-7.0.4-beta1.jar .
RUN set -e -x ;\
- VERSION=1.15.2 ;\
mkdir -p /home/minecraft/.minecraft/versions/${VERSION}/ ;\
wget --quiet https://overviewer.org/textures/${VERSION} -O /home/minecraft/.minecraft/versions/${VERSION}/${VERSION}.jar
diff --git a/personal/q3k/minecraft/worldedit-bukkit-7.2.0-beta-01.jar b/personal/q3k/minecraft/worldedit-bukkit-7.2.0-beta-01.jar
new file mode 100644
index 0000000..93b623a
--- /dev/null
+++ b/personal/q3k/minecraft/worldedit-bukkit-7.2.0-beta-01.jar
Binary files differ
diff --git a/personal/q3k/minecraft/worldguard-bukkit-7.0.4-beta1.jar b/personal/q3k/minecraft/worldguard-bukkit-7.0.4-beta1.jar
new file mode 100644
index 0000000..0c071a5
--- /dev/null
+++ b/personal/q3k/minecraft/worldguard-bukkit-7.0.4-beta1.jar
Binary files differ