Added Geyser minecraft plugin. Cleaned up minecraft role.

7 files changed, 52 insertions, 15 deletions

diff --git a/minecraft/server/defaults/main.yaml b/minecraft/server/defaults/main.yaml
index a1cd6b2..330d413 100644
--- a/minecraft/server/defaults/main.yaml
+++ b/minecraft/server/defaults/main.yaml
@@ -8,7 +8,18 @@ minecraft_mem: "2G"
 minecraft_seed: ""
 minecraft_difficulty: "hard"
 
-minecraft_paper_version: "1.17.1"
-minecraft_paper_build: "87"
 minecraft_vanilla_hash: "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"
-minecraft_dynmap_version: "3.2-beta-1-spigot"
+
+# https://papermc.io
+minecraft_paper_version: "1.17.1"
+minecraft_paper_build: "98"
+
+minecreat_paper_plugins_enabled:
+  - "dynmap"
+  - "geyser"
+
+# https://www.reddit.com/r/Dynmap/
+minecraft_dynmap_version: "3.2-beta-2"
+
+# https://geysermc.org
+minecraft_geyser_vesrion: "752"
diff --git a/minecraft/server/tasks/dynmap.yaml b/minecraft/server/tasks/dynmap.yaml
index 07281e3..a8ce154 100644
--- a/minecraft/server/tasks/dynmap.yaml
+++ b/minecraft/server/tasks/dynmap.yaml
@@ -1,16 +1,13 @@
 ---
 
-- name: create minecraft plugins dir
+- name: create minecraft dynmap plugin dir
   become: yes
   file:
-    path: "{{minecraft_dir}}/{{item}}"
+    path: "{{minecraft_dir}}/dynmap"
     owner: "{{minecraft_user}}"
     group: "{{minecraft_user}}"
     mode: "0755"
     state: "directory"
-  loop:
-    - "plugins"
-    - "plugins/dynmap"
 
 - name: download dynmap
   become: yes
diff --git a/minecraft/server/tasks/geyser.yaml b/minecraft/server/tasks/geyser.yaml
new file mode 100644
index 0000000..be22a49
--- /dev/null
+++ b/minecraft/server/tasks/geyser.yaml
@@ -0,0 +1,18 @@
+---
+
+- name: create minecraft geyser plugin dir
+  become: yes
+  file:
+    path: "{{minecraft_dir}}/geyser"
+    owner: "{{minecraft_user}}"
+    group: "{{minecraft_user}}"
+    mode: "0755"
+    state: "directory"
+
+- name: download geyser
+  become: yes
+  get_url:
+    url: "{{minecraft_geyser_url}}"
+    dest: "{{minecraft_dir}}/plugins/geyser.jar"
+    mode: "0755"
+  notify: restart minecraft
diff --git a/minecraft/server/tasks/main.yaml b/minecraft/server/tasks/main.yaml
index e0f7421..e75c0d1 100644
--- a/minecraft/server/tasks/main.yaml
+++ b/minecraft/server/tasks/main.yaml
@@ -52,8 +52,18 @@
     group: "{{minecraft_user}}"
   notify: restart minecraft
 
+- name: create minecraft plugins dir
+  become: yes
+  file:
+    path: "{{minecraft_dir}}/plugins"
+    owner: "{{minecraft_user}}"
+    group: "{{minecraft_user}}"
+    mode: "0755"
+    state: "directory"
+
 - name: install plugins
-  include_tasks: dynmap.yaml
+  include_tasks: "{{item}}.yaml"
+  loop: "{{minecreat_paper_plugins_enabled}}"
   when: minecraft_fork == "paper"
 
 - name: create server.properties
diff --git a/minecraft/server/templates/configuration.txt.j2 b/minecraft/server/templates/configuration.txt.j2
index 6fbc05e..cb08709 100644
--- a/minecraft/server/templates/configuration.txt.j2
+++ b/minecraft/server/templates/configuration.txt.j2
@@ -326,7 +326,7 @@ webserver-port: 8123
 max-sessions: 30
 
 # Disables Webserver portion of Dynmap (Advanced users only)
-disable-webserver: false
+disable-webserver: true
 
 # Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default))
 allow-symlinks: true
diff --git a/minecraft/server/templates/ops.json.j2 b/minecraft/server/templates/ops.json.j2
index 7170fc2..2e9449f 100644
--- a/minecraft/server/templates/ops.json.j2
+++ b/minecraft/server/templates/ops.json.j2
@@ -1,10 +1,8 @@
 [
-  {% if minecraft_ops_uuid %}
-  {
+  {% if minecraft_ops_uuid %}{
     "uuid": "{{minecraft_ops_uuid}}",
     "name": "{{minecraft_ops_name}}",
     "level": 4,
     "bypassesPlayerLimit": true
-  }
-  {% endif %}
+  }{% endif %}
 ]
diff --git a/minecraft/server/vars/main.yaml b/minecraft/server/vars/main.yaml
index 3039bfa..ded1dc0 100644
--- a/minecraft/server/vars/main.yaml
+++ b/minecraft/server/vars/main.yaml
@@ -3,4 +3,7 @@
 minecraft_dir: "{{minecraft_parent_dir}}/minecraft/{{minecraft_fork}}"
 minecraft_paper_url: "https://papermc.io/api/v1/paper/{{minecraft_paper_version}}/{{minecraft_paper_build}}/download"
 minecraft_vanilla_url: "https://launcher.mojang.com/v1/objects/{{minecraft_vanilla_hash}}/server.jar"
-minecraft_dynmap_url: "http://dynmap.us/builds/dynmap/Dynmap-{{minecraft_dynmap_version}}.jar"
+
+# paper is a spigot derivative
+minecraft_dynmap_url: "http://dynmap.us/builds/dynmap/Dynmap-{{minecraft_dynmap_version}}-spigot.jar"
+minecraft_geyser_url: "https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/{{minecraft_geyser_vesrion}}/artifact/bootstrap/spigot/target/Geyser-Spigot.jar"