Merge branch 'develop' into feature/PTDL-472

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,11 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## Unreleased
+### Added
+* Support for CS:GO as a default service option selection.
+* Support for GMOD as a default service option selection.
+
 ## v0.6.4 (Courageous Carniadactylus)
 ### Fixed
 * Fixed the console rendering on page load, I guess people don't like watching it load line-by-line for 10 minutes. Who would have guessed...

database/seeds/DatabaseSeeder.php

@@ -16,6 +16,7 @@ public function run()
 
         $this->call(MinecraftServiceTableSeeder::class);
         $this->call(SourceServiceTableSeeder::class);
+        $this->call(RustServiceTableSeeder::class);
         $this->call(TerrariaServiceTableSeeder::class);
         $this->call(VoiceServiceTableSeeder::class);
 

database/seeds/MinecraftServiceTableSeeder.php

@@ -243,6 +243,43 @@ private function addCoreOptions()
             'startup' => null,
             'script_install' => $script,
         ]);
+
+        $script = <<<'EOF'
+#!/bin/ash
+# Forge Installation Script
+#
+# Server Files: /mnt/server
+apk update
+apk add curl
+
+GET_VERSIONS=$(curl -sl http://files.minecraftforge.net/maven/net/minecraftforge/forge/ | grep -A1 Latest | grep  -o -e '[1]\.[0-9][0-9] - [0-9][0-9]\.[0-9][0-9]\.[0-9]\.[0-9][0-9][0-9][0-9]')
+LATEST_VERSION=$(echo $GET_VERSIONS | sed 's/ //g')
+
+cd /mnt/server
+
+curl -sS http://files.minecraftforge.net/maven/net/minecraftforge/forge/$LATEST_VERSION/forge-$LATEST_VERSION-installer.jar -o installer.jar
+curl -sS http://files.minecraftforge.net/maven/net/minecraftforge/forge/$LATEST_VERSION/forge-$LATEST_VERSION-universal.jar -o server.jar
+
+java -jar installer.jar --installServer
+rm -rf installer.jar
+EOF;
+
+        $this->option['forge'] = ServiceOption::updateOrCreate([
+            'service_id' => $this->service->id,
+            'tag' => 'forge',
+        ], [
+            'name' => 'Forge Minecraft',
+            'description' => 'Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.',
+            'docker_image' => 'quay.io/pterodactyl/core:java',
+            'config_startup' => '{"done": ")! For help, type ", "userInteraction": [ "Go to eula.txt for more info."]}',
+            'config_logs' => '{"custom": false, "location": "logs/latest.log"}',
+            'config_files' => '{"server.properties":{"parser": "properties", "find":{"server-ip": "0.0.0.0", "enable-query": "true", "server-port": "{{server.build.default.port}}", "query.port": "{{server.build.default.port}}"}}}',
+            'config_stop' => 'stop',
+            'config_from' => null,
+            'startup' => 'java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}',
+            'script_install' => $script,
+            'script_container' => 'frolvlad/alpine-oraclejdk8:cleaned',
+        ]);
     }
 
     private function addVariables()
@@ -251,6 +288,7 @@ private function addVariables()
         $this->addSpigotVariables();
         $this->addSpongeVariables();
         $this->addBungeecordVariables();
+        $this->addForgeVariables();
     }
 
     private function addVanillaVariables()
@@ -372,4 +410,19 @@ private function addBungeecordVariables()
             'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
         ]);
     }
+
+    private function addForgeVariables()
+    {
+        ServiceVariable::updateOrCreate([
+            'option_id' => $this->option['forge']->id,
+            'env_variable' => 'SERVER_JARFILE',
+        ], [
+            'name' => 'Server Jar File',
+            'description' => 'The name of the Jarfile to use when running Forge Mod.',
+            'default_value' => 'server.jar',
+            'user_viewable' => 1,
+            'user_editable' => 1,
+            'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
+        ]);
+    }
 }