From ab22a5bf29dfd7582194f828a794451061d879c5 Mon Sep 17 00:00:00 2001 From: kb01guy Date: Fri, 15 Jul 2022 12:36:33 +0200 Subject: [PATCH] Added Mod-Support for SimpleVoiceChat, Added BTM Plugin --- docker-compose.yml | 53 +++++++++++++++++++++++++++++++++++++++------- nginx/nginx.conf | 18 ++++++++++++++++ player-commands.md | 0 readme.md | 18 +++++++++------- 4 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 nginx/nginx.conf create mode 100644 player-commands.md diff --git a/docker-compose.yml b/docker-compose.yml index da70259..bd0eb82 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,12 @@ version: "2" networks: backend: + driver: bridge + ipam: + driver: default + config: + - subnet: "172.21.0.0/24" + # gateway: "172.21.0.1" services: @@ -14,13 +20,14 @@ services: BUNGEE_JAR_REVISION: "1" CFG_MOTD: Powered by Docker REPLACE_ENV_VARIABLES: "true" - SPIGET_PLUGINS: "241,8695,68956" + SPIGET_PLUGINS: "241,8695,68956,80677" # External Download: # - LuckPerms BungeeCord https://luckperms.net/download ports: - "25565:25577" networks: - - backend + backend: + ipv4_address: 172.21.0.4 volumes: - ./mc-bungeecord:/server - ./mc-bungeecord/config.yml:/config/config.yml @@ -36,18 +43,21 @@ services: MEMORY: "" JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" ONLINE_MODE: "FALSE" - SPIGET_RESOURCES: "1997,70616,7688,73997,34315,51856,16708,92546,28140,91064" + SPIGET_RESOURCES: "70616,7688,73997,34315,51856,16708,92546,28140,80677" # External Download: # - Emotecraft https://github.com/KosmX/emotes/releases/latest # - 9089 EssentialsX https://essentialsx.net/downloads.html?branch=stable # - 1884 GriefPrevention https://dev.bukkit.org/projects/grief-prevention/files/3173411 - ports: - - "24454:24454" + # - 93738 SimpleVoiceChat https://www.curseforge.com/minecraft/bukkit-plugins/simple-voice-chat/files/all + # - 1.19 Update-Issues 1997 ProtocolLib https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/ + #ports: + # - "24454:24454" tty: true stdin_open: true restart: unless-stopped networks: - - backend + backend: + ipv4_address: 172.21.0.3 volumes: - ./mc-survival:/data - ./logs/survival.log:/data/logs/latest.log @@ -63,7 +73,7 @@ services: MEMORY: "" JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" ONLINE_MODE: "FALSE" - SPIGET_RESOURCES: "390,1997,6245,7688,25391,63714,70616,71465,28140,1166,91064" + SPIGET_RESOURCES: "390,6245,7688,25391,63714,70616,71465,28140,1166,80677" # External Download: # - Emotecraft https://github.com/KosmX/emotes/releases/latest # - 51321 AntiCooldown https://www.spigotmc.org/resources/anticooldown-1-9-1-18.51321/ @@ -75,7 +85,34 @@ services: stdin_open: true restart: unless-stopped networks: - - backend + backend: + ipv4_address: 172.21.0.6 volumes: - ./mc-main:/data - ./logs/main.log:/data/logs/latest.log + + # Nginx Proxy for Mod-support + mc-mod-proxy: + image: nginx + container_name: mc_mod_proxy + ports: + - "24454:24454/udp" # Simple Voice Mod Port (Survival) + networks: + backend: + ipv4_address: 172.21.0.5 + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf + + # MySQL for Minecraft-Plugin-Use + mc-mysql: + image: mysql + container_name: mc_mysql + networks: + backend: + ipv4_address: 172.21.0.2 + environment: + MYSQL_ROOT_PASSWORD: development-password-todo + MYSQL_DATABASE: mc-btm + MYSQL_USER: minecraft + MYSQL_PASSWORD: development-minecraft-password-todo + command: --default-authentication-plugin=mysql_native_password diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..95ecf1f --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,18 @@ + +user root; ## Default: nobody +worker_processes 1; ## Default: 1 +#error_log logs/error.log; + +events { + +} + +stream { + # Minecraft Survival: Simple Voice Chat + server { + listen 24454 udp reuseport; + proxy_timeout 20s; + proxy_pass mc-survival:24454; + } + +} diff --git a/player-commands.md b/player-commands.md new file mode 100644 index 0000000..e69de29 diff --git a/readme.md b/readme.md index 1c5c75b..5093b78 100644 --- a/readme.md +++ b/readme.md @@ -46,12 +46,13 @@ This is the Proxy-Server that listens to the default Minecraft Port `25565` and ##### Plugin List -| Spigot ID | Price | Name | Description | Links | -|:---------:| ----- | -------------------- | -------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | -| | Free | LuckPerms BungeeCord | Manages Permissions for BungeeCord Plugins | [Github](https://github.com/lucko/LuckPerms) [luckperms.net](https://luckperms.net/download) | -| 241 | Free | ServerListPlus | Allows customization of your ServerList Info | [Github](https://github.com/Minecrell/ServerListPlus) [Spigot](https://www.spigotmc.org/resources/241/) | -| 8695 | Free | AdvancedBan | All-In-One Punishment-System | [Github](https://github.com/DevLeoko/AdvancedBan) [Spigot](https://www.spigotmc.org/resources/8695/) | -| 68956 | Free | UltraStaffChat | Allows Communication to the Server-Team, throughout the Network and even beyond thanks to Discord-Integration. | [Github](https://github.com/HyperaOfficial/UltraStaffChat) [Spigot](https://www.spigotmc.org/resources/68956/) | +| Spigot ID | Price | Name | Description | Links | +|:---------:| ----- | --------------------- | -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | +| | Free | LuckPerms BungeeCord | Manages Permissions for BungeeCord Plugins | [Github](https://github.com/lucko/LuckPerms) [luckperms.net](https://luckperms.net/download) | +| 241 | Free | ServerListPlus | Allows customization of your ServerList Info | [Github](https://github.com/Minecrell/ServerListPlus) [Spigot](https://www.spigotmc.org/resources/241/) | +| 8695 | Free | AdvancedBan | All-In-One Punishment-System | [Github](https://github.com/DevLeoko/AdvancedBan) [Spigot](https://www.spigotmc.org/resources/8695/) | +| 68956 | Free | UltraStaffChat | Allows Communication to the Server-Team, throughout the Network and even beyond thanks to Discord-Integration. | [Github](https://github.com/HyperaOfficial/UltraStaffChat) [Spigot](https://www.spigotmc.org/resources/68956/) | +| 80677 | Free | BungeeTeleportManager | Teleports across Servers and Dimensions. | [GitHub](https://github.com/Avankziar/BungeeTeleportManager) [Spigot](https://www.spigotmc.org/resources/80677/) | #### Main Server: Lobby, Creative, Minigames @@ -67,7 +68,6 @@ It runs on Paper because it is Resource friendly. | 1166 | Free | HubThat | Manages the Server-Hub, the welcome Area for joining Players | [git.beatrice.wtf](https://git.beatrice.wtf/SpigotMC/HubThat) [Spigot](https://www.spigotmc.org/resources/hubthat.1166/) | | 28140 | Free | LuckPerms | Manages Permissions | [Github](https://github.com/lucko/LuckPerms) [Spigot](https://www.spigotmc.org/resources/28140/) | | 390 | Free | Multiverse-Core | Allows Multi-World-Configuration, needed to load Custom Worlds and not load Vanilla-Worlds | [Github](https://github.com/Multiverse/Multiverse-Core) [Spigot](https://www.spigotmc.org/resources/390/) | -| 1997 | Free | ProtocolLib | Library Plugin used by Simple Voice Chat | [Github](https://github.com/Multiverse/Multiverse-Core) [Spigot](https://www.spigotmc.org/resources/390/) | | 6245 | Free | PlaceholderAPI | Allows you to use Placeholder in nearly any Config-File | [Github](https://github.com/PlaceholderAPI/PlaceholderAPI) [Spigot](https://www.spigotmc.org/resources/6245/) | | 7688 | Free | Armor Stand Editor [dead] | Allows players in survival to easily edit Armorstand pose and attributes. | [Github](https://github.com/RypoFalem/ArmorStandEditor) [Spigot](https://www.spigotmc.org/resources/armor-stand-editor-dead.7688/) | | 13932 | Free | Fast Async WorldEdit | Allows large Scale World-Modifications, needed by PlotSquared | [Github](https://github.com/IntellectualSites/FastAsyncWorldEdit) [Spigot](https://www.spigotmc.org/resources/13932/) | @@ -77,7 +77,8 @@ It runs on Paper because it is Resource friendly. | 70616 | Free | BackupOnEvent | Automatically creates Backups and manages configured Storage-Space | [Github](https://github.com/enayet123/BackupOnEventPlugin) [Spigot](https://www.spigotmc.org/resources/backuponevent.70616/) | | 71465 | Free | ImageMap | Creates Map-Items displaying Image Files. Used for TV-Like Custom Signs | [Github](https://github.com/gorogoro-space/ImageMap) [Spigot](https://www.spigotmc.org/resources/71465/) | | 77506 | 15€ | PlotSquared | Manages User-Plots for Creative Building | [Github](https://github.com/IntellectualSites/PlotSquared/) [Spigot](https://www.spigotmc.org/resources/plotsquared-v6.77506/) | -| 93738 | Free | Simple Voice Chat | Proximity Voice-Chat, Requires Client Mod! | [Github](https://github.com/henkelmax/simple-voice-chat) [Spigot](https://www.spigotmc.org/resources/simple-voice-chat.93738/) | +| 80677 | Free | BungeeTeleportManager | Teleports across Servers and Dimensions. | [GitHub](https://github.com/Avankziar/BungeeTeleportManager) [Spigot](https://www.spigotmc.org/resources/80677/) | + Planned: @@ -108,3 +109,4 @@ TLDR: Players blame Paper for Things that might not exist. | 51856 | Free | ChestShop | a simple system for making physical shops using signs and chests | [Github](https://github.com/ChestShop-authors/ChestShop-3) [Spigot](https://www.spigotmc.org/resources/chestshop.51856/) | | 16708 | Free | Daily Rewards | Rewards the Player to stay active. Type `/reward` each Day to get in-game Currency | [Github](https://github.com/HalfloveJAR/Daily-Rewards) [Spigot](https://www.spigotmc.org/resources/daily-rewards.16708/) | | 92546 | Free | Heart | Displays Life of Players below their Name. | [Github](https://github.com/PastaLaPate/Heart/) [Spigot](https://www.spigotmc.org/resources/heart.92546/) | +| 80677 | Free | BungeeTeleportManager | Teleports across Servers and Dimensions. | [GitHub](https://github.com/Avankziar/BungeeTeleportManager) [Spigot](https://www.spigotmc.org/resources/80677/) |