# HG changeset patch
# User Luke Hoersten <luke@hoersten.org>
# Date 1624818262 18000
# Node ID 740231770c7cdd876199e8c776ae314b21f46afc
# Parent  9a0b90751216c9558341e0641394132c677cedc5
Updated minecraft to 1.17.

diff -r 9a0b90751216 -r 740231770c7c minecraft/defaults/main.yaml
--- a/minecraft/defaults/main.yaml	Sat May 29 11:25:11 2021 -0500
+++ b/minecraft/defaults/main.yaml	Sun Jun 27 13:24:22 2021 -0500
@@ -7,8 +7,7 @@
 minecraft_mem: "2G"
 minecraft_seed: ""
 
-minecraft_paper_version: "1.16.5"
-minecraft_paper_build: "629"
-minecraft_vanilla_hash: "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"
-
-minecraft_dynmap_version: "3.1-spigot"
+minecraft_paper_version: "1.17"
+minecraft_paper_build: "53"
+minecraft_vanilla_hash: "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"
+minecraft_dynmap_version: "3.2-beta-1-spigot"
diff -r 9a0b90751216 -r 740231770c7c minecraft/files/03adoptopenjdk-direct
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minecraft/files/03adoptopenjdk-direct	Sun Jun 27 13:24:22 2021 -0500
@@ -0,0 +1,1 @@
+Acquire::HTTP::Proxy::adoptopenjdk.jfrog.io "DIRECT";
diff -r 9a0b90751216 -r 740231770c7c minecraft/tasks/adoptopenjdk.yaml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minecraft/tasks/adoptopenjdk.yaml	Sun Jun 27 13:24:22 2021 -0500
@@ -0,0 +1,21 @@
+---
+
+- name: configure apt proxy bypass for https
+  become: yes
+  copy: src="03adoptopenjdk-direct" dest="/etc/apt/apt.conf.d/03adoptopenjdk-direct"
+
+- name: add adoptopenjdk apt key
+  become: yes
+  apt_key: url="https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public/"
+
+- name: add adoptopenjdk apt repo
+  become: yes
+  apt_repository: repo="deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main"
+
+- name: update apt package cache
+  become: yes
+  apt: upgrade="dist" autoremove="yes" autoclean="yes" update_cache="yes" cache_valid_time="3600"
+
+- name: install adoptopenjdk hotspot jre 16
+  become: yes
+  apt: name="adoptopenjdk-16-hotspot-jre"
diff -r 9a0b90751216 -r 740231770c7c minecraft/tasks/main.yaml
--- a/minecraft/tasks/main.yaml	Sat May 29 11:25:11 2021 -0500
+++ b/minecraft/tasks/main.yaml	Sun Jun 27 13:24:22 2021 -0500
@@ -4,9 +4,8 @@
   become: yes
   user: name="{{minecraft_user}}" home="{{minecraft_dir}}"
 
-- name: install jre
-  become: yes
-  apt: name="default-jre-headless"
+- name: install adoptopenjdk
+  include_tasks: adoptopenjdk.yaml
 
 - name: set minecraft fork
   set_fact: minecraft_url="{{minecraft_vanilla_url}}"
diff -r 9a0b90751216 -r 740231770c7c rpi-base/defaults/main.yaml
--- a/rpi-base/defaults/main.yaml	Sat May 29 11:25:11 2021 -0500
+++ b/rpi-base/defaults/main.yaml	Sun Jun 27 13:24:22 2021 -0500
@@ -15,3 +15,4 @@
   - "iperf3"
   - "python3-pip"
   - "unzip"
+  - "apt-transport-https"