This breaks literally the entire panel.

Author: DaneEveritt

…ory/ServiceOptionRepositoryInterface.php …ts/Repository/EggRepositoryInterface.phpapp/Contracts/Repository/ServiceOptionRepositoryInterface.php renamed to app/Contracts/Repository/EggRepositoryInterface.php app/Contracts/Repository/ServiceOptionRepositoryInterface.php renamed to app/Contracts/Repository/EggRepositoryInterface.php

@@ -9,49 +9,49 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
 use Illuminate\Database\Eloquent\Collection;
 
-interface ServiceOptionRepositoryInterface extends RepositoryInterface
+interface EggRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return a service option with the variables relation attached.
+     * Return an egg with the variables relation attached.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithVariables(int $id): ServiceOption;
+    public function getWithVariables(int $id): Egg;
 
     /**
-     * Return all of the service options and their relations to be used in the daemon API.
+     * Return all eggs and their relations to be used in the daemon API.
      *
      * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getAllWithCopyAttributes(): Collection;
 
     /**
-     * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
+     * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
      *
      * @param int|string $value
      * @param string     $column
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      */
-    public function getWithCopyAttributes($value, string $column = 'id'): ServiceOption;
+    public function getWithCopyAttributes($value, string $column = 'id'): Egg;
 
     /**
      * Return all of the data needed to export a service.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithExportAttributes(int $id): ServiceOption;
+    public function getWithExportAttributes(int $id): Egg;
 
     /**
-     * Confirm a copy script belongs to the same service as the item trying to use it.
+     * Confirm a copy script belongs to the same nest as the item trying to use it.
      *
      * @param int $copyFromId
      * @param int $service

…ry/OptionVariableRepositoryInterface.php …itory/EggVariableRepositoryInterface.phpapp/Contracts/Repository/OptionVariableRepositoryInterface.php renamed to app/Contracts/Repository/EggVariableRepositoryInterface.php app/Contracts/Repository/OptionVariableRepositoryInterface.php renamed to app/Contracts/Repository/EggVariableRepositoryInterface.php

@@ -9,6 +9,6 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-interface OptionVariableRepositoryInterface extends RepositoryInterface
+interface EggVariableRepositoryInterface extends RepositoryInterface
 {
 }

…epository/ServiceRepositoryInterface.php …s/Repository/NestRepositoryInterface.phpapp/Contracts/Repository/ServiceRepositoryInterface.php renamed to app/Contracts/Repository/NestRepositoryInterface.php app/Contracts/Repository/ServiceRepositoryInterface.php renamed to app/Contracts/Repository/NestRepositoryInterface.php

@@ -9,37 +9,37 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 
-interface ServiceRepositoryInterface extends RepositoryInterface
+interface NestRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return a service or all services with their associated options, variables, and packs.
+     * Return a nest or all nests with their associated eggs, variables, and packs.
      *
      * @param int $id
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptions(int $id = null);
+    public function getWithEggs(int $id = null);
 
     /**
-     * Return a service or all services and the count of options, packs, and servers for that service.
+     * Return a nest or all nests and the count of eggs, packs, and servers for that nest.
      *
      * @param int|null $id
-     * @return \Pterodactyl\Models\Service|\Illuminate\Database\Eloquent\Collection
+     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithCounts(int $id = null);
 
     /**
-     * Return a service along with its associated options and the servers relation on those options.
+     * Return a nest along with its associated eggs and the servers relation on those eggs.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\Service
+     * @return \Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptionServers(int $id): Service;
+    public function getWithEggServers(int $id): Nest;
 }

app/Contracts/Repository/PackRepositoryInterface.php

@@ -14,12 +14,12 @@
 interface PackRepositoryInterface extends RepositoryInterface, SearchableInterface
 {
     /**
-     * Return a paginated listing of packs with their associated option and server count.
+     * Return a paginated listing of packs with their associated egg and server count.
      *
      * @param int $paginate
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
-    public function paginateWithOptionAndServerCount($paginate = 50);
+    public function paginateWithEggAndServerCount($paginate = 50);
 
     /**
      * Return a pack with the associated server models attached to it.

app/Contracts/Repository/ServiceVariableRepositoryInterface.php

@@ -11,7 +11,7 @@
 
 use Fractal;
 use Illuminate\Http\Request;
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Transformers\Admin\ServiceTransformer;
 
@@ -28,7 +28,7 @@ public function index(Request $request)
         $this->authorize('service-list', $request->apiKey());
 
         return Fractal::create()
-            ->collection(Service::all())
+            ->collection(Nest::all())
             ->transformWith(new ServiceTransformer($request))
             ->withResourceName('service')
             ->toArray();
@@ -45,7 +45,7 @@ public function view(Request $request, $id)
     {
         $this->authorize('service-view', $request->apiKey());
 
-        $service = Service::findOrFail($id);
+        $service = Nest::findOrFail($id);
         $fractal = Fractal::create()->item($service);
 
         if ($request->input('include')) {

app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php

@@ -11,7 +11,7 @@
 
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionConfigurationFileService;
 
 class OptionRetrievalController extends Controller
@@ -22,18 +22,18 @@ class OptionRetrievalController extends Controller
     protected $configurationFileService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
     /**
      * OptionUpdateController constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface    $repository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface              $repository
      * @param \Pterodactyl\Services\Services\Options\OptionConfigurationFileService $configurationFileService
      */
     public function __construct(
-        ServiceOptionRepositoryInterface $repository,
+        EggRepositoryInterface $repository,
         OptionConfigurationFileService $configurationFileService
     ) {
         $this->configurationFileService = $configurationFileService;

app/Http/Controllers/API/Admin/ServiceController.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggController extends Controller
+{
+    protected $repository;
+
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function view(Egg $egg): View
+    {
+        return view('admin.eggs.view', [
+            'egg' => $egg,
+        ]);
+    }
+}

app/Http/Controllers/API/Remote/OptionRetrievalController.php

@@ -7,54 +7,54 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Controllers\Admin\Services\Options;
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
 
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\RedirectResponse;
-use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Controllers\Controller;
 use Symfony\Component\HttpFoundation\Response;
+use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
+use Pterodactyl\Services\Services\Sharing\EggImporterService;
 use Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest;
-use Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService;
-use Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService;
 
-class OptionShareController extends Controller
+class EggShareController extends Controller
 {
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggExporterService
      */
     protected $exporterService;
 
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService
+     * @var \Pterodactyl\Services\Services\Sharing\EggImporterService
      */
     protected $importerService;
 
     /**
      * OptionShareController constructor.
      *
-     * @param \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService $exporterService
-     * @param \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService $importerService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService     $exporterService
+     * @param \Pterodactyl\Services\Services\Sharing\EggImporterService $importerService
      */
     public function __construct(
-        ServiceOptionExporterService $exporterService,
-        ServiceOptionImporterService $importerService
+        EggExporterService $exporterService,
+        EggImporterService $importerService
     ) {
         $this->exporterService = $exporterService;
         $this->importerService = $importerService;
     }
 
     /**
-     * @param \Pterodactyl\Models\ServiceOption $option
+     * @param \Pterodactyl\Models\Egg $egg
      * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function export(ServiceOption $option): Response
+    public function export(Egg $egg): Response
     {
-        return response($this->exporterService->handle($option->id), 200, [
+        return response($this->exporterService->handle($egg->id), 200, [
             'Content-Transfer-Encoding' => 'binary',
             'Content-Description' => 'File Transfer',
-            'Content-Disposition' => 'attachment; filename=' . kebab_case($option->name) . '.json',
+            'Content-Disposition' => 'attachment; filename=egg-' . kebab_case($egg->name) . '.json',
             'Content-Type' => 'application/json',
         ]);
     }
@@ -71,8 +71,8 @@ public function export(ServiceOption $option): Response
      */
     public function import(OptionImportFormRequest $request): RedirectResponse
     {
-        $option = $this->importerService->handle($request->file('import_file'), $request->input('import_to_service'));
+        $egg = $this->importerService->handle($request->file('import_file'), $request->input('import_to_nest'));
 
-        return redirect()->route('admin.services.option.view', ['option' => $option->id]);
+        return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
     }
 }