From 2ae954f2e88f667f370560293f894c2dfd67b565 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Fri, 1 Jan 2021 00:33:02 -0600
Subject: [PATCH] Add a new Minecraft server "New"

---
 playbooks/game.yml | 78 +++++++++++++++++++++++++++++++++++-----------
 roles/minecraft    |  2 +-
 2 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/playbooks/game.yml b/playbooks/game.yml
index 3c09090..4cccaa4 100755
--- a/playbooks/game.yml
+++ b/playbooks/game.yml
@@ -7,34 +7,19 @@
     - role: backup
       vars:
         backup_s3backup_list_extra:
+          - /opt/minecraft/dammit
           - /opt/minecraft/valhelsia
           - /opt/minecraft/vanilla
           - /opt/factorio
         backup_s3backup_exclude_list_extra:
+          - /opt/minecraft/dammit/backups
           - /opt/minecraft/valhelsia/backups
           - /opt/minecraft/vanilla/backups
       become: yes
       tags: [ backup ]
     - role: minecraft
       vars:
-        minecraft_name: vanilla
-        minecraft_version: 1.16.4
-        minecraft_jre_xmx: 1G
-        minecraft_jre_xms: 512M
-        minecraft_server_properties:
-          - opt: difficulty
-            value: normal
-          - opt: motd
-            value: "brett's new serber"
-          - opt: server-port
-            value: 25565
-          - opt: spawn-protection
-            value: 4
-          - opt: view-distance
-            value: 12
-        minecraft_paper_install: yes
-    - role: minecraft
-      vars:
+        minecraft_enabled: no
         minecraft_name: valhelsia
         minecraft_version: 1.16.3
         minecraft_jre_xmx: 5G
@@ -74,3 +59,60 @@
           admins: [ "rehashed_salt" ]
       become: yes
       tags: [ game, factorio ]
+- hosts: game1.thefuck.how
+  roles:
+    - role: minecraft
+      vars:
+        minecraft_enabled: no
+        minecraft_name: vanilla
+        minecraft_version: 1.16.4
+        minecraft_jre_xmx: 1G
+        minecraft_jre_xms: 512M
+        minecraft_server_properties:
+          - opt: difficulty
+            value: normal
+          - opt: motd
+            value: "brett's new serber"
+          - opt: server-port
+            value: 25565
+          - opt: spawn-protection
+            value: 4
+          - opt: view-distance
+            value: 12
+        minecraft_paper_install: yes
+      become: yes
+      tags: [ game, minecraft, paper, vanilla ]
+- hosts: game1.thefuck.how
+  roles:
+    - role: minecraft
+      vars:
+        minecraft_name: dammit
+        minecraft_version: 1.7.10
+        minecraft_jre_xmx: 4G
+        minecraft_server_properties:
+          - opt: difficulty
+            value: hard
+          - opt: motd
+            value: "I can't believe that I actually exist"
+          - opt: server-port
+            value: 25567
+          - opt: view-distance
+            value: 12
+        minecraft_forge_install: yes
+        minecraft_forge_version: 10.13.4.1614
+        minecraft_forge_versionstring: "{{ minecraft_version }}-{{ minecraft_forge_version }}-{{ minecraft_version }}"
+        minecraft_forge_jar_name: "forge-{{ minecraft_forge_versionstring }}-universal.jar"
+        minecraft_forge_packurl: "https://www.9iron.club/files/magic-1.7.10-2.zip"
+        minecraft_forge_mods_remove:
+          - DynamicSurroundings-1.7.10-1.0.6.2.jar
+          - favorites-1.2.jar
+          - FullscreenWindowed-1.7.10-1.3.0b.jar
+          - MouseTweaks-2.4.4-mc1.7.10.jar
+          - "Neat 1.0-1.jar"
+          - OptiFine_1.7.10_HD_U_E7.jar
+          - SoundFilters-0.8_for_1.7.X.jar
+          - Stellar+API-0.1.3.8.jar
+          - Stellar+Sky-0.1.5.7.jar
+          - World-Tooltips-1.7.10-1.2.3-79.jar
+      become: yes
+      tags: [ game, minecraft, forge, dammit ]
diff --git a/roles/minecraft b/roles/minecraft
index 1d5f6ce..fa9a239 160000
--- a/roles/minecraft
+++ b/roles/minecraft
@@ -1 +1 @@
-Subproject commit 1d5f6ced7f0eb268f5c925cd3cbe8c98ad283f6c
+Subproject commit fa9a2397a708636e2ece8886a128ed27894caf92