diff --git a/.gitignore b/.gitignore index 0e3fcae..5eaffb6 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,11 @@ /server/plugins/LuckPerms/* !/server/plugins/LuckPerms/permission_export.json +# Include BackupOnEvent Config +!/server/plugins/BackupOnEvent/ +/server/plugins/BackupOnEvent/* +!/server/plugins/BackupOnEvent/config.yml + # Include Essentials Config !/server/plugins/Essentials/ /server/plugins/Essentials/* diff --git a/server/lobby/data/raids.dat b/server/lobby/data/raids.dat index 98774c4..803c6b6 100644 Binary files a/server/lobby/data/raids.dat and b/server/lobby/data/raids.dat differ diff --git a/server/lobby/entities/r.-1.-1.mca b/server/lobby/entities/r.-1.-1.mca index 3fb1290..98489f3 100644 Binary files a/server/lobby/entities/r.-1.-1.mca and b/server/lobby/entities/r.-1.-1.mca differ diff --git a/server/lobby/entities/r.-1.0.mca b/server/lobby/entities/r.-1.0.mca index 31afb8c..474f5ff 100644 Binary files a/server/lobby/entities/r.-1.0.mca and b/server/lobby/entities/r.-1.0.mca differ diff --git a/server/lobby/entities/r.0.-1.mca b/server/lobby/entities/r.0.-1.mca index de1442b..3c7e550 100644 Binary files a/server/lobby/entities/r.0.-1.mca and b/server/lobby/entities/r.0.-1.mca differ diff --git a/server/lobby/entities/r.0.0.mca b/server/lobby/entities/r.0.0.mca index d74a841..c6bfbb6 100644 Binary files a/server/lobby/entities/r.0.0.mca and b/server/lobby/entities/r.0.0.mca differ diff --git a/server/lobby/level.dat b/server/lobby/level.dat index d52e2ff..c1ceefc 100644 Binary files a/server/lobby/level.dat and b/server/lobby/level.dat differ diff --git a/server/lobby/level.dat_old b/server/lobby/level.dat_old index 3db6fe7..399ddf1 100644 Binary files a/server/lobby/level.dat_old and b/server/lobby/level.dat_old differ diff --git a/server/lobby/region/r.-1.-1.mca b/server/lobby/region/r.-1.-1.mca index 083d29f..63ca4cd 100644 Binary files a/server/lobby/region/r.-1.-1.mca and b/server/lobby/region/r.-1.-1.mca differ diff --git a/server/lobby/region/r.-1.0.mca b/server/lobby/region/r.-1.0.mca index ae85f82..8087002 100644 Binary files a/server/lobby/region/r.-1.0.mca and b/server/lobby/region/r.-1.0.mca differ diff --git a/server/lobby/region/r.0.-1.mca b/server/lobby/region/r.0.-1.mca index 446050a..7968db3 100644 Binary files a/server/lobby/region/r.0.-1.mca and b/server/lobby/region/r.0.-1.mca differ diff --git a/server/lobby/region/r.0.0.mca b/server/lobby/region/r.0.0.mca index 6fdac54..ada9aad 100644 Binary files a/server/lobby/region/r.0.0.mca and b/server/lobby/region/r.0.0.mca differ diff --git a/server/plugins/BackupOnEvent/config.yml b/server/plugins/BackupOnEvent/config.yml new file mode 100644 index 0000000..1b9f7f1 --- /dev/null +++ b/server/plugins/BackupOnEvent/config.yml @@ -0,0 +1,35 @@ +# BackupWorlds lets you toggle which worlds to include in backups +# You can enable/disable the events that will trigger a backup to happen from RunBackupOn +# repeatInterval runs a backup every time X minutes has passed, 0 means disabled +# Messages and announcements can be hidden +# onJoin and onQuit will hide the 'x has joined the server' messages +# opsOnly restricts the /backup command to ops only +# Setting maxInMegaBytes to 0 will provide unlimited disk space +# Setting minimumIntervalInMinutes to 0 will allow concurrent backups +# AutoUpdate will download the latest version from bukkit.org when an Op joins the server +BackupWorlds: + lobby: false + creative: true + world: true + world_nether: true + world_the_end: true + plugins: false + custom_named_world: false +RunBackupOn: + playerJoin: true + playerQuit: false + lastPlayerQuit: false + repeatIntervals: + minutes: 0 + whenPlayersAreOnline: true +HideMessage: + onJoin: false + onQuit: false + backupAnnouncement: true +BackupCommand: + opsOnly: true +BackupStorage: + maxInMegaBytes: 8192 + minimumIntervalInMinutes: 1 +AutoUpdate: + enabled: true diff --git a/server/plugins/Essentials/config.yml b/server/plugins/Essentials/config.yml index 3474b60..1917c80 100644 --- a/server/plugins/Essentials/config.yml +++ b/server/plugins/Essentials/config.yml @@ -705,11 +705,13 @@ confirm-home-overwrite: false # You can control the values of items that are sold to the server by using the /setworth command. # Defines the balance with which new players begin. Defaults to 0. -starting-balance: 0 +starting-balance: 200 # Defines the cost to use the given commands PER USE. # Some commands like /repair have sub-costs, check the wiki for more information. command-costs: + # /example costs $1000 PER USE + plot-claim: 200 # /example costs $1000 PER USE #example: 1000 # /kit tools costs $1500 PER USE @@ -730,7 +732,7 @@ max-money: 10000000000000 # Set the minimum amount of money a player can have (must be above the negative of max-money). # Setting this to 0, will disable overdrafts/loans completely. Users need 'essentials.eco.loan' perm to go below 0. -min-money: -10000 +min-money: 0 # Enable this to log all interactions with trade/buy/sell signs and sell command. economy-log-enabled: false @@ -740,7 +742,7 @@ economy-log-enabled: false economy-log-update-enabled: false # Minimum acceptable amount to be used in /pay. -minimum-pay-amount: 0.001 +minimum-pay-amount: 0.01 # Enable this to block users who try to /pay another user which ignore them. pay-excludes-ignore-list: false @@ -1022,7 +1024,7 @@ newbies: # When we spawn for the first time, which spawnpoint do we use? # Set to "none" if you want to use the spawn point of the world. - spawnpoint: newbies + spawnpoint: none # Do we want to give users anything on first join? Set to '' to disable # This kit will be given regardless of cost and permissions, and will not trigger the kit delay. diff --git a/server/plugins/Multiverse-Core/worlds.yml b/server/plugins/Multiverse-Core/worlds.yml index ca000af..b0a8d55 100644 --- a/server/plugins/Multiverse-Core/worlds.yml +++ b/server/plugins/Multiverse-Core/worlds.yml @@ -1,8 +1,8 @@ worlds: - lobby: + world: ==: MVWorld hidden: 'false' - alias: lobby + alias: world color: WHITE style: NORMAL pvp: 'true' @@ -27,22 +27,22 @@ worlds: amount: '0.0' hunger: 'true' autoHeal: 'true' - adjustSpawn: 'false' + adjustSpawn: 'true' portalForm: ALL gameMode: SURVIVAL keepSpawnInMemory: 'true' spawnLocation: ==: MVSpawnLocation - x: 0.5075134889622605 - y: 76.0 - z: 0.49779161122677623 - pitch: -1.1581929 - yaw: 0.2744236 + x: 84.42063334337557 + y: 68.0 + z: 238.27648626185643 + pitch: 41.12404 + yaw: -107.05948 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '-537509543960677020' + seed: '4539497276281669999' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -93,10 +93,10 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' - world: + lobby: ==: MVWorld hidden: 'false' - alias: world + alias: lobby color: WHITE style: NORMAL pvp: 'true' @@ -121,22 +121,22 @@ worlds: amount: '0.0' hunger: 'true' autoHeal: 'true' - adjustSpawn: 'true' + adjustSpawn: 'false' portalForm: ALL gameMode: SURVIVAL keepSpawnInMemory: 'true' spawnLocation: ==: MVSpawnLocation - x: 84.42063334337557 - y: 68.0 - z: 238.27648626185643 - pitch: 41.12404 - yaw: -107.05948 + x: 0.5075134889622605 + y: 76.0 + z: 0.49779161122677623 + pitch: -1.1581929 + yaw: 0.2744236 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '4539497276281669999' + seed: '-537509543960677020' generator: 'null' playerLimit: '-1' allowFlight: 'true' diff --git a/server/plugins/PlotSquared/config/settings.yml b/server/plugins/PlotSquared/config/settings.yml index 6b9ca5b..c7bdb72 100644 --- a/server/plugins/PlotSquared/config/settings.yml +++ b/server/plugins/PlotSquared/config/settings.yml @@ -94,7 +94,8 @@ enabled-components: component-presets: true # Enable per user locale per-user-locale: false - # The default locale + # The default locale. Before changing the language, make sure you downloaded the appropriate file and put it in the 'lang' folder. + # You can find additional translations here: https://intellectualsites.crowdin.com/plotsquared default-locale: "en" # Use UUID cache to complete usernames extended-username-completion: true diff --git a/server/server.properties b/server/server.properties index 6f28932..eaef479 100644 --- a/server/server.properties +++ b/server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Wed Jun 30 22:43:28 CEST 2021 +#Thu Jul 01 16:28:52 CEST 2021 enable-jmx-monitoring=false rcon.port=25575 gamemode=survival diff --git a/setup.sh b/setup.sh index 7e8128b..a1f243b 100755 --- a/setup.sh +++ b/setup.sh @@ -2,8 +2,6 @@ BASEDIR=$(pwd) -MANUAL_DOWNLOAD="\nPlease Download these Plugins manually! \n\n" - # Helper get_latest_release() { # Source: https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c curl --silent "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api @@ -55,6 +53,8 @@ cd ${BASEDIR}/server && cp ${BASEDIR}/tools/buildtools/spigot*.jar ./spigot.jar # Download Plugins cd ${BASEDIR}/server/plugins + MANUAL_DOWNLOAD="\nPlease Download these Plugins manually to use the latest Version! \n\n" + # BackupOnEvent https://www.curseforge.com/minecraft/bukkit-plugins/backuponevent LATEST=$(get_latest_release enayet123/BackupOnEventPlugin) curl -OL https://github.com/enayet123/BackupOnEventPlugin/releases/download/${LATEST}/BackupOnEvent.jar @@ -67,10 +67,13 @@ cd ${BASEDIR}/server && cp ${BASEDIR}/tools/buildtools/spigot*.jar ./spigot.jar curl -OL https://github.com/EssentialsX/Essentials/releases/download/${LATEST}/EssentialsXChat-${LATEST}.0.jar # GriefPrevention https://www.curseforge.com/minecraft/bukkit-plugins/grief-prevention MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}GriefPrevention: https://www.curseforge.com/minecraft/bukkit-plugins/grief-prevention \n" + curl -OL https://media.forgecdn.net/files/3173/411/GriefPrevention.jar # ArmorStandEditor https://www.curseforge.com/minecraft/bukkit-plugins/armor-stand-edit MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}ArmorStandEditor: https://www.curseforge.com/minecraft/bukkit-plugins/armor-stand-edit \n" + curl -OL https://media.forgecdn.net/files/2999/757/armorstandeditor-1.16-25.jar # LuckPerms https://github.com/lucko/LuckPerms MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}LuckPerms: https://ci.lucko.me/job/LuckPerms/lastSuccessfulBuild/artifact/bukkit/loader/build/libs/ \n" + curl -OL https://ci.lucko.me/job/LuckPerms/lastSuccessfulBuild/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-5.3.48.jar # floodgate-bukkit Geyser-Spigot https://geysermc.org/ wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/spigot/target/Geyser-Spigot.jar wget https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/lastSuccessfulBuild/artifact/spigot/target/floodgate-spigot.jar @@ -82,24 +85,32 @@ cd ${BASEDIR}/server && cp ${BASEDIR}/tools/buildtools/spigot*.jar ./spigot.jar # Multiverse: Core, Inventries, SignPortals, Portals https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-core MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}Multiverse: \n" MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Core https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-core \n" + curl -OL https://media.forgecdn.net/files/3362/854/Multiverse-Core-4.3.0.jar MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Inventories https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-inventories \n" + curl -OL https://media.forgecdn.net/files/3222/929/Multiverse-Inventories-4.2.2.jar MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Portals https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-portals \n" + curl -OL https://media.forgecdn.net/files/3113/114/Multiverse-Portals-4.2.1.jar MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - SignPortals https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-signportals \n" + curl -OL https://media.forgecdn.net/files/3074/605/Multiverse-SignPortals-4.2.0.jar # StayPut: https://www.spigotmc.org/resources/stayput.34848/ MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}StayPut: https://www.spigotmc.org/resources/stayput.34848/ \n" + # TODO: Get spigot-Download working curl -L stayput.jar https://www.spigotmc.org/resources/stayput.34848/download?version=181463 # Plot² Price: 15€ https://www.spigotmc.org/resources/plotsquared-v6.77506/ MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}Plot² (Payed!): \n" MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Plugin https://www.spigotmc.org/resources/plotsquared-v6.77506 \n" MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Dependency WorldEdit https://www.curseforge.com/minecraft/bukkit-plugins/worldedit \n" + curl -OL https://media.forgecdn.net/files/3283/695/worldedit-bukkit-7.2.5-dist.jar # ChestShop https://www.curseforge.com/minecraft/bukkit-plugins/chestshop - LATEST=$(get_latest_release ChestShop-authors/ChestShop-3) - curl -OL https://github.com/ChestShop-authors/ChestShop-3/releases/download/${LATEST}/ChestShop.jar + curl -OL https://ci.minebench.de/job/ChestShop-3/lastSuccessfulBuild/artifact/target/ChestShop.jar # MoreMobHeads2 https://www.curseforge.com/minecraft/bukkit-plugins/moremobheads2 MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}MoreMobHeads2: https://www.curseforge.com/minecraft/bukkit-plugins/moremobheads2 \n" + curl -OL https://media.forgecdn.net/files/3364/46/MoreMobHeads-1.15_1.0.21.jar # Heart https://www.curseforge.com/minecraft/bukkit-plugins/heart MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}Heart: https://www.curseforge.com/minecraft/bukkit-plugins/heart \n" + curl -OL https://media.forgecdn.net/files/3316/502/Heart-RELEASE-1.0.jar # ImageOnMap https://www.curseforge.com/minecraft/bukkit-plugins/imageonmap LATEST=$(get_latest_release zDevelopers/ImageOnMap) curl -OL https://github.com/zDevelopers/ImageOnMap/releases/download/${LATEST}/ImageOnMap-${LATEST[@]/v/}.jar + printf "${MANUAL_DOWNLOAD}" diff --git a/update.sh b/update.sh index f4344d2..7a166fb 100755 --- a/update.sh +++ b/update.sh @@ -31,6 +31,7 @@ cd ${BASEDIR}/server/plugins/backup && rm *.jar mv ${BASEDIR}/server/plugins/*.jar ${BASEDIR}/server/plugins/backup cd ${BASEDIR}/server/plugins/ +MANUAL_DOWNLOAD="\nPlease Download these Plugins manually! \n\n" # BackupOnEvent https://www.curseforge.com/minecraft/bukkit-plugins/backuponevent LATEST=$(get_latest_release enayet123/BackupOnEventPlugin) curl -OL https://github.com/enayet123/BackupOnEventPlugin/releases/download/${LATEST}/BackupOnEvent.jar @@ -40,13 +41,46 @@ curl -OL https://github.com/MilkBowl/Vault/releases/download/${LATEST}/Vault.jar # Essentials https://www.curseforge.com/minecraft/bukkit-plugins/essentialsx LATEST=$(get_latest_release EssentialsX/Essentials) curl -OL https://github.com/EssentialsX/Essentials/releases/download/${LATEST}/EssentialsX-${LATEST}.0.jar - +curl -OL https://github.com/EssentialsX/Essentials/releases/download/${LATEST}/EssentialsXChat-${LATEST}.0.jar +# GriefPrevention https://www.curseforge.com/minecraft/bukkit-plugins/grief-prevention +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}GriefPrevention: https://www.curseforge.com/minecraft/bukkit-plugins/grief-prevention \n" +# ArmorStandEditor https://www.curseforge.com/minecraft/bukkit-plugins/armor-stand-edit +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}ArmorStandEditor: https://www.curseforge.com/minecraft/bukkit-plugins/armor-stand-edit \n" +# LuckPerms https://github.com/lucko/LuckPerms +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}LuckPerms: https://ci.lucko.me/job/LuckPerms/lastSuccessfulBuild/artifact/bukkit/loader/build/libs/ \n" # floodgate-bukkit Geyser-Spigot https://geysermc.org/ wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/spigot/target/Geyser-Spigot.jar wget https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/lastSuccessfulBuild/artifact/spigot/target/floodgate-spigot.jar +LATEST=$(get_latest_release Camotoy/GeyserSkinManager) +curl -OL https://github.com/Camotoy/GeyserSkinManager/releases/download/${LATEST}/GeyserSkinManager-Spigot.jar +# emotecraft https://www.curseforge.com/minecraft/bukkit-plugins/emotecraft-bukkit +LATEST=$(get_latest_release KosmX/emotes) +curl -OL https://github.com/KosmX/emotes/releases/download/${LATEST}/emotecraft-${LATEST:0:5}-bukkit.jar +# Multiverse: Core, Inventries, SignPortals, Portals https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-core +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}Multiverse: \n" +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Core https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-core \n" +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Inventories https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-inventories \n" +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Portals https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-portals \n" +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - SignPortals https://www.curseforge.com/minecraft/bukkit-plugins/multiverse-signportals \n" +# StayPut: https://www.spigotmc.org/resources/stayput.34848/ +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}StayPut: https://www.spigotmc.org/resources/stayput.34848/ \n" +# Plot² Price: 15€ https://www.spigotmc.org/resources/plotsquared-v6.77506/ +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}Plot² (Payed!): \n" +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Plugin https://www.spigotmc.org/resources/plotsquared-v6.77506 \n" +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD} - Dependency WorldEdit https://www.curseforge.com/minecraft/bukkit-plugins/worldedit \n" +# ChestShop https://www.curseforge.com/minecraft/bukkit-plugins/chestshop +LATEST=$(get_latest_release ChestShop-authors/ChestShop-3) +curl -OL https://github.com/ChestShop-authors/ChestShop-3/releases/download/${LATEST}/ChestShop.jar +# MoreMobHeads2 https://www.curseforge.com/minecraft/bukkit-plugins/moremobheads2 +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}MoreMobHeads2: https://www.curseforge.com/minecraft/bukkit-plugins/moremobheads2 \n" +# Heart https://www.curseforge.com/minecraft/bukkit-plugins/heart +MANUAL_DOWNLOAD="${MANUAL_DOWNLOAD}Heart: https://www.curseforge.com/minecraft/bukkit-plugins/heart \n" +# ImageOnMap https://www.curseforge.com/minecraft/bukkit-plugins/imageonmap +LATEST=$(get_latest_release zDevelopers/ImageOnMap) +curl -OL https://github.com/zDevelopers/ImageOnMap/releases/download/${LATEST}/ImageOnMap-${LATEST[@]/v/}.jar -echo "Please Download the following Plugins manually: \ -GriefPrevention https://www.curseforge.com/minecraft/bukkit-plugins/grief-prevention \ -ArmorStandEditor https://www.curseforge.com/minecraft/bukkit-plugins/armor-stand-edit \ -emotecraft https://github.com/KosmX/emotes/releases/latest \ -LuckPerms https://luckperms.net/ " +printf "${MANUAL_DOWNLOAD}" + + + +read -p "Press Enter to start thes Server"