From 3fd6ae270531162b0376c58024bc42eeb621137a Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 11 Jul 2018 16:24:41 -0400 Subject: [PATCH] repo re-org and readme update This is gonna be a fun one. --- GTA/FiveM/README.md | 3 + GTA/README.md | 2 + GTA/RageMP/README.MD | 2 + GTA/samp/README.md | 2 + GTA/{SA-MP => samp}/egg-sa-mp.json | 0 Minecraft/README.md | 28 ++++ .../forge-enhanced/egg-forge--enhanced.json | 0 .../feed-the-beast/egg-feed-the-beast.json | 0 .../ftb-revelation/egg-f-t-b-revelation.json | 0 .../paper-spigot/egg-paper-spigot.json | 0 .../spigot-enhanced/egg-spigot--enhanced.json | 0 .../taco-spigot/egg-taco-spigot.json | 0 .../blightfall/egg-blightfall.json | 0 .../{ => technic}/hexxit/egg-hexxit.json | 0 .../tekkit-legends/egg-tekkit-legends.json | 0 README.md | 125 ++++-------------- .../discord/atlbot/bot}/egg-a-t-l-bot.json | 0 .../discord}/parkertron/egg-parkertron.json | 0 .../discord/pixelbot}/egg-pixel-bot.json | 0 .../discord/sinusbot}/egg-sinusbot.json | 0 .../nukkit/egg-nukkit.json | 0 .../nukkit/nukkit.yml | 0 .../nukkit/server.properties | 0 .../pocketmine_mp}/egg-pocketmine-m-p.json | 0 .../pocketmine_mp}/server.properties | 0 .../waterfall/egg-waterfall.json | 0 .../7 Days To Die}/egg-7-days-to-die.json | 0 .../PixARK}/egg-pix-a-r-k.json | 0 .../rocketmod}/egg-rocketmod.json | 0 29 files changed, 66 insertions(+), 96 deletions(-) create mode 100644 GTA/FiveM/README.md create mode 100644 GTA/README.md create mode 100644 GTA/RageMP/README.MD create mode 100644 GTA/samp/README.md rename GTA/{SA-MP => samp}/egg-sa-mp.json (100%) create mode 100644 Minecraft/README.md rename Minecraft/{ => forge}/forge-enhanced/egg-forge--enhanced.json (100%) rename Minecraft/{ => ftb}/feed-the-beast/egg-feed-the-beast.json (100%) rename Minecraft/{ => ftb}/ftb-revelation/egg-f-t-b-revelation.json (100%) rename Minecraft/{ => spigot}/paper-spigot/egg-paper-spigot.json (100%) rename Minecraft/{ => spigot}/spigot-enhanced/egg-spigot--enhanced.json (100%) rename Minecraft/{ => spigot}/taco-spigot/egg-taco-spigot.json (100%) rename Minecraft/{ => technic}/blightfall/egg-blightfall.json (100%) rename Minecraft/{ => technic}/hexxit/egg-hexxit.json (100%) rename Minecraft/{ => technic}/tekkit-legends/egg-tekkit-legends.json (100%) rename {discordbots/ATLbot => bots/discord/atlbot/bot}/egg-a-t-l-bot.json (100%) rename {discordbots => bots/discord}/parkertron/egg-parkertron.json (100%) rename {discordbots/pixel-bot => bots/discord/pixelbot}/egg-pixel-bot.json (100%) rename {discordbots/Sinusbot => bots/discord/sinusbot}/egg-sinusbot.json (100%) rename {Minecraft PE => minecraft_pe}/nukkit/egg-nukkit.json (100%) rename {Minecraft PE => minecraft_pe}/nukkit/nukkit.yml (100%) rename {Minecraft PE => minecraft_pe}/nukkit/server.properties (100%) rename {Minecraft PE/PocketmineMP => minecraft_pe/pocketmine_mp}/egg-pocketmine-m-p.json (100%) rename {Minecraft PE/PocketmineMP => minecraft_pe/pocketmine_mp}/server.properties (100%) rename {Minecraft Proxy => minecraft_proxy}/waterfall/egg-waterfall.json (100%) rename {7 Days To Die => source_servers/7 Days To Die}/egg-7-days-to-die.json (100%) rename {PixARK => source_servers/PixARK}/egg-pix-a-r-k.json (100%) rename {Unturned => unturned/rocketmod}/egg-rocketmod.json (100%) diff --git a/GTA/FiveM/README.md b/GTA/FiveM/README.md new file mode 100644 index 00000000..7acbc5c9 --- /dev/null +++ b/GTA/FiveM/README.md @@ -0,0 +1,3 @@ +# FiveM +The [FiveM](https://fivem.net/) GTA 5 dedicated server +- Only installs latest version versions are no selectable. diff --git a/GTA/README.md b/GTA/README.md new file mode 100644 index 00000000..9e657128 --- /dev/null +++ b/GTA/README.md @@ -0,0 +1,2 @@ +# Grand Theft Auto +#### A collection of GTA service eggs for the pterodactyl panel \ No newline at end of file diff --git a/GTA/RageMP/README.MD b/GTA/RageMP/README.MD new file mode 100644 index 00000000..a4434bca --- /dev/null +++ b/GTA/RageMP/README.MD @@ -0,0 +1,2 @@ +# Rage-MP +The [Rage-MP](https://rage.mp/) GTA 5 dedicated server \ No newline at end of file diff --git a/GTA/samp/README.md b/GTA/samp/README.md new file mode 100644 index 00000000..d4fcf00c --- /dev/null +++ b/GTA/samp/README.md @@ -0,0 +1,2 @@ +# SA:MP +The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server \ No newline at end of file diff --git a/GTA/SA-MP/egg-sa-mp.json b/GTA/samp/egg-sa-mp.json similarity index 100% rename from GTA/SA-MP/egg-sa-mp.json rename to GTA/samp/egg-sa-mp.json diff --git a/Minecraft/README.md b/Minecraft/README.md new file mode 100644 index 00000000..41d0bf53 --- /dev/null +++ b/Minecraft/README.md @@ -0,0 +1,28 @@ +# Minecraft + +#### Spigot Enhanced +This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar. +- (It's noted that building the jar is intensive and time consuming) + +#### Forge Enhanced +This is a direct fork of the default forge service +- Has a version detection fix for "latest" + +#### FTB Packs +##### Feed The Beast - generic +[FTB](https://www.feed-the-beast.com/modpacks) +Generic egg to handle any standard FTB modpack. +Supply values to 2 variables to use +- MODPACK_URL: from the url to the pack https://www.feed-the-beast.com/projects/{MODPACK_URL} +- MODPACK_VERSION: version of the modpack to install + +##### FTB Revelation +[FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation) + +#### Tekkit Packs +##### Hexxit +[Hexxit](https://www.technicpack.net/modpack/hexxit.552552) +##### Blightfall +[Blightfall](https://www.technicpack.net/modpack/blightfall.592618) +##### Tekkit-Legends +[Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends.735902) diff --git a/Minecraft/forge-enhanced/egg-forge--enhanced.json b/Minecraft/forge/forge-enhanced/egg-forge--enhanced.json similarity index 100% rename from Minecraft/forge-enhanced/egg-forge--enhanced.json rename to Minecraft/forge/forge-enhanced/egg-forge--enhanced.json diff --git a/Minecraft/feed-the-beast/egg-feed-the-beast.json b/Minecraft/ftb/feed-the-beast/egg-feed-the-beast.json similarity index 100% rename from Minecraft/feed-the-beast/egg-feed-the-beast.json rename to Minecraft/ftb/feed-the-beast/egg-feed-the-beast.json diff --git a/Minecraft/ftb-revelation/egg-f-t-b-revelation.json b/Minecraft/ftb/ftb-revelation/egg-f-t-b-revelation.json similarity index 100% rename from Minecraft/ftb-revelation/egg-f-t-b-revelation.json rename to Minecraft/ftb/ftb-revelation/egg-f-t-b-revelation.json diff --git a/Minecraft/paper-spigot/egg-paper-spigot.json b/Minecraft/spigot/paper-spigot/egg-paper-spigot.json similarity index 100% rename from Minecraft/paper-spigot/egg-paper-spigot.json rename to Minecraft/spigot/paper-spigot/egg-paper-spigot.json diff --git a/Minecraft/spigot-enhanced/egg-spigot--enhanced.json b/Minecraft/spigot/spigot-enhanced/egg-spigot--enhanced.json similarity index 100% rename from Minecraft/spigot-enhanced/egg-spigot--enhanced.json rename to Minecraft/spigot/spigot-enhanced/egg-spigot--enhanced.json diff --git a/Minecraft/taco-spigot/egg-taco-spigot.json b/Minecraft/spigot/taco-spigot/egg-taco-spigot.json similarity index 100% rename from Minecraft/taco-spigot/egg-taco-spigot.json rename to Minecraft/spigot/taco-spigot/egg-taco-spigot.json diff --git a/Minecraft/blightfall/egg-blightfall.json b/Minecraft/technic/blightfall/egg-blightfall.json similarity index 100% rename from Minecraft/blightfall/egg-blightfall.json rename to Minecraft/technic/blightfall/egg-blightfall.json diff --git a/Minecraft/hexxit/egg-hexxit.json b/Minecraft/technic/hexxit/egg-hexxit.json similarity index 100% rename from Minecraft/hexxit/egg-hexxit.json rename to Minecraft/technic/hexxit/egg-hexxit.json diff --git a/Minecraft/tekkit-legends/egg-tekkit-legends.json b/Minecraft/technic/tekkit-legends/egg-tekkit-legends.json similarity index 100% rename from Minecraft/tekkit-legends/egg-tekkit-legends.json rename to Minecraft/technic/tekkit-legends/egg-tekkit-legends.json diff --git a/README.md b/README.md index cedf2a76..e0f1ec51 100644 --- a/README.md +++ b/README.md @@ -6,110 +6,43 @@ With that I am also accepting PR's for new service and also updates to the curre If you are submitting PR's try and keep names and titles the same. - ## Please read the CONTRIBUTING.md before submitting PRs +## Bot Eggs -#### Please read the CONTRIBUTING.md as it container important information. +[Discord](./bots/discord/) +* [ATL Bot](./bots/discord/atlbot) +* [parkertron](./bots/discord/parkertron/) +* [pixel-bot](./bots/discord/pixelbot/) +* [sinuxbot](./bots/discord/) ## Game Eggs -### GTA -#### GTA V +[Factorio](./factorio/factorio/) +[Grand Theft Auto](./gta/) +* [FiveM](./gta/fivem/) +* [RageMP](./gta/ragemp/) -#### FiveM -The [FiveM](https://fivem.net/) GTA 5 dedicated server -- Only installs latest version versions are no selectable. +[Minecraft](./minecraft/) +* [Forge](./minecraft/forge/) +* [Feed The Beast](./minecraft/ftb/) +* [Spigot](./minecraft/pigot/) +* [Technic](./minecraft/technic/) -#### Rage-MP -The [Rage-MP](https://rage.mp/) GTA 5 dedicated server +[MinecraftPE](./minecraft_pe/) +* [Nukkit](./minecraft_pe/nukkit/) +* [PocketMine MP](./minecraft_pe/pocketmine_mp/) -#### San Andreas +[Minecraft Proxies](./minecraft_proxy/) +* [Watterfall](./minecraft_proxy/waterfall/) -#### SA:MP -The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server +[Source](./source_servers/) +* [7 Days to Die](./source_servers/7dtd/) +* [PixARK](./source_servers/pixark/) -### Factorio -#### factorio -The [Factorio](https://factorio.com/) dedicated server - -### Terraria -#### tShock -The [tShock](https://tshock.co) modded server. -- This requires a minimum of 1g (1024m) to actually create a map. This will get OOM if you have less. - -### Unturned -#### RocketMod -The [RocketMod](https://rocketmod.net/) unturned server. - -### 7 Days To Die -#### 7 Days To Die -The Vanilla [7 Days To Die](https://7daystodie.com) server - -### Minecraft -#### Spigot Enhanced -This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar. -- (It's noted that building the jar is intensive and time consuming) - -#### Forge Enhanced -This is a direct fork of the default forge service -- Has a version detection fix for "latest" - -#### FTB Packs -##### Feed The Beast - generic -[FTB](https://www.feed-the-beast.com/modpacks) -Generic egg to handle any standard FTB modpack. -Supply values to 2 variables to use -- MODPACK_URL: from the url to the pack https://www.feed-the-beast.com/projects/{MODPACK_URL} -- MODPACK_VERSION: version of the modpack to install - -##### FTB Revelation -[FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation) - -#### Tekkit Packs -##### Hexxit -[Hexxit](https://www.technicpack.net/modpack/hexxit.552552) -##### Blightfall -[Blightfall](https://www.technicpack.net/modpack/blightfall.592618) -##### Tekkit-Legends -[Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends.735902) - -### Minecraft PE -#### Nukkit -The [Nukkit](https://nukkit.io/) Minecraft PE server - -#### PocketmineMP -The [Pocketmine MP](https://pmmp.io/) Minecraft PE server - -### PixARK -#### PixARK -The [PixARK](https://store.steampowered.com/app/593600/PixARK/) dedicated server -More info at [gamepedia](https://pixark.gamepedia.com/Pixark) -- As a note this uses the new wine-source image and may not perform up to standard - -### Squad -#### Squad Dedicated -The [Squad](https://joinsquad.com/) official dedicated server - -### Xonotic -#### xonotic -The [xonotic](http://www.xonotic.org/) official dedicated server. -- Disk space needs to be at least 1 gig for the full package. - -## Bot Eggs -### Discord - -#### ATLBot - NodeJS -The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) - -#### parkertron - Golang (custom image) -My own chat bot [parkertron](https://github.com/parkervcp/parkertron) - - Currently runs as the SupportBot in the pterodactyl discord server. - - Requires you to set up the yaml fils before it can start properly. - -#### pixel-bot - Python -[pixel-bot](https://github.com/Ispira/pixel-bot) - - More of a reason/way to test a python container. - -#### Sinusbot -TS3 and Discord music bot. [sinusbot](https://www.sinusbot.com/) +[Squad](./squad/) +[Terraria](./terraria/) +* [tshock](./terraria/tshock/) +[Unturned](./unturned/) +* [RocketMod](./unturned/rockermod/) +[Xonotic](./xonotic/) diff --git a/discordbots/ATLbot/egg-a-t-l-bot.json b/bots/discord/atlbot/bot/egg-a-t-l-bot.json similarity index 100% rename from discordbots/ATLbot/egg-a-t-l-bot.json rename to bots/discord/atlbot/bot/egg-a-t-l-bot.json diff --git a/discordbots/parkertron/egg-parkertron.json b/bots/discord/parkertron/egg-parkertron.json similarity index 100% rename from discordbots/parkertron/egg-parkertron.json rename to bots/discord/parkertron/egg-parkertron.json diff --git a/discordbots/pixel-bot/egg-pixel-bot.json b/bots/discord/pixelbot/egg-pixel-bot.json similarity index 100% rename from discordbots/pixel-bot/egg-pixel-bot.json rename to bots/discord/pixelbot/egg-pixel-bot.json diff --git a/discordbots/Sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json similarity index 100% rename from discordbots/Sinusbot/egg-sinusbot.json rename to bots/discord/sinusbot/egg-sinusbot.json diff --git a/Minecraft PE/nukkit/egg-nukkit.json b/minecraft_pe/nukkit/egg-nukkit.json similarity index 100% rename from Minecraft PE/nukkit/egg-nukkit.json rename to minecraft_pe/nukkit/egg-nukkit.json diff --git a/Minecraft PE/nukkit/nukkit.yml b/minecraft_pe/nukkit/nukkit.yml similarity index 100% rename from Minecraft PE/nukkit/nukkit.yml rename to minecraft_pe/nukkit/nukkit.yml diff --git a/Minecraft PE/nukkit/server.properties b/minecraft_pe/nukkit/server.properties similarity index 100% rename from Minecraft PE/nukkit/server.properties rename to minecraft_pe/nukkit/server.properties diff --git a/Minecraft PE/PocketmineMP/egg-pocketmine-m-p.json b/minecraft_pe/pocketmine_mp/egg-pocketmine-m-p.json similarity index 100% rename from Minecraft PE/PocketmineMP/egg-pocketmine-m-p.json rename to minecraft_pe/pocketmine_mp/egg-pocketmine-m-p.json diff --git a/Minecraft PE/PocketmineMP/server.properties b/minecraft_pe/pocketmine_mp/server.properties similarity index 100% rename from Minecraft PE/PocketmineMP/server.properties rename to minecraft_pe/pocketmine_mp/server.properties diff --git a/Minecraft Proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json similarity index 100% rename from Minecraft Proxy/waterfall/egg-waterfall.json rename to minecraft_proxy/waterfall/egg-waterfall.json diff --git a/7 Days To Die/egg-7-days-to-die.json b/source_servers/7 Days To Die/egg-7-days-to-die.json similarity index 100% rename from 7 Days To Die/egg-7-days-to-die.json rename to source_servers/7 Days To Die/egg-7-days-to-die.json diff --git a/PixARK/egg-pix-a-r-k.json b/source_servers/PixARK/egg-pix-a-r-k.json similarity index 100% rename from PixARK/egg-pix-a-r-k.json rename to source_servers/PixARK/egg-pix-a-r-k.json diff --git a/Unturned/egg-rocketmod.json b/unturned/rocketmod/egg-rocketmod.json similarity index 100% rename from Unturned/egg-rocketmod.json rename to unturned/rocketmod/egg-rocketmod.json