diff --git a/docker-compose.yml b/docker-compose.yml index bd0eb82..f782ad8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,12 +2,6 @@ version: "2" networks: backend: - driver: bridge - ipam: - driver: default - config: - - subnet: "172.21.0.0/24" - # gateway: "172.21.0.1" services: @@ -20,14 +14,13 @@ services: BUNGEE_JAR_REVISION: "1" CFG_MOTD: Powered by Docker REPLACE_ENV_VARIABLES: "true" - SPIGET_PLUGINS: "241,8695,68956,80677" + SPIGET_PLUGINS: "241,8695,68956,80677,95509" # External Download: # - LuckPerms BungeeCord https://luckperms.net/download ports: - "25565:25577" networks: - backend: - ipv4_address: 172.21.0.4 + - backend volumes: - ./mc-bungeecord:/server - ./mc-bungeecord/config.yml:/config/config.yml @@ -56,8 +49,7 @@ services: stdin_open: true restart: unless-stopped networks: - backend: - ipv4_address: 172.21.0.3 + - backend volumes: - ./mc-survival:/data - ./logs/survival.log:/data/logs/latest.log @@ -73,7 +65,7 @@ services: MEMORY: "" JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" ONLINE_MODE: "FALSE" - SPIGET_RESOURCES: "390,6245,7688,25391,63714,70616,71465,28140,1166,80677" + SPIGET_RESOURCES: "390,6245,7688,25391,63714,70616,28140,1166,80677,53036" # External Download: # - Emotecraft https://github.com/KosmX/emotes/releases/latest # - 51321 AntiCooldown https://www.spigotmc.org/resources/anticooldown-1-9-1-18.51321/ @@ -85,8 +77,7 @@ services: stdin_open: true restart: unless-stopped networks: - backend: - ipv4_address: 172.21.0.6 + - backend volumes: - ./mc-main:/data - ./logs/main.log:/data/logs/latest.log @@ -108,8 +99,7 @@ services: image: mysql container_name: mc_mysql networks: - backend: - ipv4_address: 172.21.0.2 + - backend environment: MYSQL_ROOT_PASSWORD: development-password-todo MYSQL_DATABASE: mc-btm diff --git a/mc-bungeecord/plugins/BungeeTeleportManager/config.yml b/mc-bungeecord/plugins/BungeeTeleportManager/config.yml new file mode 100644 index 0000000..e3239d5 --- /dev/null +++ b/mc-bungeecord/plugins/BungeeTeleportManager/config.yml @@ -0,0 +1 @@ +DeleteDeathBackAfterUsing: true diff --git a/mc-bungeecord/plugins/SlashServer/config.yml b/mc-bungeecord/plugins/SlashServer/config.yml new file mode 100644 index 0000000..625e82a --- /dev/null +++ b/mc-bungeecord/plugins/SlashServer/config.yml @@ -0,0 +1,6 @@ +servers: +- server: survival + commands: + - survival + permission: slashserver.server.survival +version: 0 diff --git a/mc-main/commands.yml b/mc-main/commands.yml new file mode 100644 index 0000000..22d38e5 --- /dev/null +++ b/mc-main/commands.yml @@ -0,0 +1,33 @@ +# This is the commands configuration file for Bukkit. +# For documentation on how to make use of this file, check out the Bukkit Wiki at +# https://www.spigotmc.org/go/commands-yml +# +# If you need help on this file, feel free to join us on irc or leave a message +# on the forums asking for advice. +# +# IRC: #spigot @ irc.spi.gt +# (If this means nothing to you, just go to https://www.spigotmc.org/go/irc ) +# Forums: https://www.spigotmc.org/ +# Bug tracker: https://www.spigotmc.org/go/bugs + +command-block-overrides: [] +ignore-vanilla-permissions: false +aliases: + icanhasbukkit: + - version $1- +# Teleportation + survival: + - server survival + lobby: + - spawn lobby + creative: + - spawn creative + +# Home Management + home: + - plot home $1 + sethome: + - plot alias set $1 + - plot sethome + homes: + - plot list mine diff --git a/mc-main/plugins/BungeeTeleportManager/config.yml b/mc-main/plugins/BungeeTeleportManager/config.yml new file mode 100644 index 0000000..71fc334 --- /dev/null +++ b/mc-main/plugins/BungeeTeleportManager/config.yml @@ -0,0 +1,228 @@ +# For more explanation see +# https://www.spigotmc.org/resources/bungeeteleportmanager.80677/ + +Language: ENG +Bungee: true +ServerName: main +Mysql: + Status: true + Host: mc-mysql + Port: 3306 + DatabaseName: mc-btm + SSLEnabled: false + AutoReconnect: true + VerifyServerCertificate: false + User: minecraft + Password: development-minecraft-password-todo +EnableCommands: + Back: false + Deathback: false + Deathzone: false + EntityTransport: false + FirstSpawn: true + Home: false + Portal: true + RandomTeleport: true + Respawn: false + SavePoint: false + TPA: true + Teleport: true + Warp: true +Enable: + AccessPermission: false + InterfaceHub: + Providing: + Teleport: true + Consuming: + Vanish: true + VanillaNetherportal: true + VanillaEndportal: true +SilentTp: + DoVanish: true + VanishCommand: vanish +TPJoinCooldown: 5 +Effects: + BACK: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + DEATHBACK: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + CUSTOM: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + HOME: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + PORTAL: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + RANDOMTELEPORT: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + RESPAWN: + Give: + After: true + Before: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + SAVEPOINT: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + TELEPORT: + Give: + After: true + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + WARP: + Give: + Before: true + After: true + Before: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 + After: + - FIRE_RESISTANCE;40;1 + - DAMAGE_RESISTANCE;40;1 +CancelInviteRun: 15 +BackCooldown: 5 +TpAcceptCooldown: 3 +MinimumTimeBefore: + Back: 2000 + Deathback: 2000 + Custom: 2000 + FirstSpawn: 2000 + Home: 2000 + RandomTeleport: 2000 + SavePoint: 2000 + Teleport: 2000 + Warp: 2000 +CostPer: + Use: + Back: 100.0 + EntityTransport: 100.0 + Home: 100.0 + PortalServerAllowedMaximum: 10000.0 + RandomTeleport: 100.0 + Teleport: 100.0 + WarpServerAllowedMaximum: 100.0 + Create: + Home: 1000.0 + Portal: 9142.0 + Warp: 1000.0 + NotifyAfterWithdraw: + Back: false + Home: false + RandomTeleport: false + Teleport: false + Warp: false +MustConfirmWarpWhereYouPayForIt: true +Use: + CountPerm: + Home: HIGHEST + Portal: f + Warp: HIGHEST + FirstSpawn: + FirstTimePlayedPlayer: + SendToFirstSpawn: true + Spigot: + DoCommandsAtFirstTime: false + CommandAtFirstTime: + AsPlayer: + - dummy + - dummy + AsConsole: + - dummy + - dummy + BungeeCord: + DoCommandsAtFirstTime: false + CommandAtFirstTime: + AsPlayer: + - dummy + - dummy + AsConsole: + - dummy + - dummy + EntityTransport: + TicketMechanic: false + SafeTeleport: + Home: false + SavePoint: false + Warp: false +EntityTransport: + DefaultTicketPerEntity: 1 + TicketList: + - COW;2 + - SHEEP:3 + - SKELETON:25 +Portal: + LoadPortalInRAM: true + BackgroundTask: + RepeatAfterSeconds: 3600 + CooldownAfterUse: + - Owner;0y-0d-0h-0m-5s-5ms + - Member;0y-0d-0h-0m-5s-5ms + - Perm;0y-0d-0h-0m-5s-5ms;btm.portalcooldown.staff + - Perm;0y-0d-0h-10m-0s-0ms;btm.portalcooldown.user +Identifier: + Click: click + Hover: hover +Seperator: + BetweenFunction: '~' + WhithinFuction: '@' + Space: + + HoverNewLine: ~!~ diff --git a/mc-survival/commands.yml b/mc-survival/commands.yml index 5b065de..b3c51ee 100644 --- a/mc-survival/commands.yml +++ b/mc-survival/commands.yml @@ -1,10 +1,10 @@ # This is the commands configuration file for Bukkit. # For documentation on how to make use of this file, check out the Bukkit Wiki at # https://www.spigotmc.org/go/commands-yml -# +# # If you need help on this file, feel free to join us on irc or leave a message # on the forums asking for advice. -# +# # IRC: #spigot @ irc.spi.gt # (If this means nothing to you, just go to https://www.spigotmc.org/go/irc ) # Forums: https://www.spigotmc.org/ @@ -15,3 +15,14 @@ ignore-vanilla-permissions: false aliases: icanhasbukkit: - version $1- +# Teleportation + lobby: + - btm:warp lobby + spawn: + - essentials:warp spawn + creative: + - btm:warp creative + bedwars: + - btm:warp bedwars + shop: + - btm:warp shop diff --git a/player-commands.md b/player-commands.md index e69de29..c4817b3 100644 --- a/player-commands.md +++ b/player-commands.md @@ -0,0 +1,36 @@ +# Player Commands + +## Teleportation + +| Command | Effect | Plugin(s) | Status | +| ----------------- | ------------------------------------------------ | ------------------------------ | ------- | +| /sethome | Sets Home Location | EssentialsX / PlotSquared | Working | +| /home | Teleports you to your Home-Location | EssentialsX / PlotSquared | Working | +| /warps | Lists available Warp-Locations | BungeeTeleportManager | Working | +| /warp | Teleports you to named Warp-Location | BungeeTeleportManager | Working | +| /tpa | Requesting to teleport to player | BungeeTeleportManager | Unknown | +| /tpahere | Requests a player to teleport to you | BungeeTeleportManager | Unknown | +| /tpaccept | Accepts teleportation request | BungeeTeleportManager | Unknown | +| /spawn | Teleports you to the spawn of your current World | Multiverse / EssentialsX | Unknown | +| /lobby | Teleports you into the Server Hub | BungeeCord Alias | Unknown | +| /creative | Teleports you into the Creative World | BungeeTeleportManager Alias | Unknown | +| /survival | Teleports you to the Survival Server | BungeeCord Alias / SlashServer | Unknown | + + + +## Commerce + +| Command | Effect | Plugin(s) | Status | +| ----------------- | ------------------------------------------------ | --------------------------- | ------- | +| /reward | Collect your reward for logging in today | Daily Rewards | Working | +| /money | Shows your current Balance | Vault | Working | + + +## Minigames + +TODO + + +## Plot Management + +TODO diff --git a/readme.md b/readme.md index 5093b78..c2075cd 100644 --- a/readme.md +++ b/readme.md @@ -9,6 +9,9 @@ I use this Repository to run my own Minecraft-Server at kB01.de. # Usage +The following is for this Repository and for the Server Administrator or Developer. +For help using the preconfigured Plugins please refer to [player-commands.md](player-commands.md). + Reqirements: - git - docker @@ -53,6 +56,7 @@ This is the Proxy-Server that listens to the default Minecraft Port `25565` and | 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/) | +| 95509 | Free | SlashServer | Enables /lobby instead /server main and /survival instead /server survival. | [Github](https://github.com/MTM123/SlashServer) [Spigot](https://www.spigotmc.org/resources/95509/) | #### Main Server: Lobby, Creative, Minigames @@ -75,10 +79,9 @@ It runs on Paper because it is Resource friendly. | 51321 | Free | AntiCooldown | Removes Hit-Cooldown of newer Minecraft Versions for faster PvP experience | [Github](https://github.com/YourGameSpace/AntiCooldown) [Spigot](https://www.spigotmc.org/resources/anticooldown-1-9-1-18.51321/) | | 63714 | Free | Screaming Bedwars | PvP GameMode in the Sky, Players are trying to destroy the Respawn-Block (Bed) of the other Teams | [Github](https://github.com/ScreamingSandals/BedWars) [Spigot](https://www.spigotmc.org/resources/63714/) | | 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/) | | 80677 | Free | BungeeTeleportManager | Teleports across Servers and Dimensions. | [GitHub](https://github.com/Avankziar/BungeeTeleportManager) [Spigot](https://www.spigotmc.org/resources/80677/) | - +| 53036 | Free | Custom Images | Creates Map-Items displaying Image Files. Used for TV-Like Custom Signs | [Github](https://github.com/Andavin/Images) [Spigot](https://www.spigotmc.org/resources/53036/) | Planned: