From 46dc9bd7c2c8f4bae1db2d71c5404558e9fbc625 Mon Sep 17 00:00:00 2001 From: Chromachine Date: Tue, 19 Jun 2018 11:02:15 +0000 Subject: [PATCH] Rempass fix, DXL, Plotworld perms DungeonsXL config upload Perms: - Added LC chest interact permission for members in plotworld - Removed ChestShop perms for plotworld and allowed interaction in LC in plotworld -- So that players can place signs on signs hmm - Allowed pistons in plotworld Jobs db setup (sqlite for conversion) --- .gitconfig | 4 +- CoreProtect/config.yml | 2 +- DungeonsXL/config.yml | 45 ++++++++++++++ DungeonsXL/dungeons/test.yml | 14 +++++ Jobs/generalConfig.yml | 12 ++-- Multiverse-Core/worlds.yml | 96 +++++++++++++++--------------- PermissionsEx/permissions.yml | 16 +++++ PlotSquared/config/settings.yml | 7 ++- PlotSquared/translations/style.yml | 2 +- Towny/settings/config.yml | 2 +- WorldGuard/config.yml | 2 +- WorldGuard/worlds/.raw/config.yml | 12 ++++ update.sh | 1 + 13 files changed, 152 insertions(+), 63 deletions(-) create mode 100755 DungeonsXL/config.yml create mode 100755 DungeonsXL/dungeons/test.yml create mode 100644 WorldGuard/worlds/.raw/config.yml diff --git a/.gitconfig b/.gitconfig index 1764ce0..e566468 100755 --- a/.gitconfig +++ b/.gitconfig @@ -1,3 +1,5 @@ [filter "rempass"] smudge = cat - clean = sed -E --expression=\"s/(.*)pass(\\S*)\\\\: '.*'/\\1pass\\2: 'NOPE'/g\" + clean = sed -E --expression=\"s/(^\\s*(.*[_-]){0,1})pass(\\S*)\\\\: .*/\\1pass\\3: 'NOPE'/g\" +# sed doesn't support (?:) so we're ignoring the 2nd group + diff --git a/CoreProtect/config.yml b/CoreProtect/config.yml index 7888116..41da0d6 100755 --- a/CoreProtect/config.yml +++ b/CoreProtect/config.yml @@ -13,7 +13,7 @@ mysql-host: 127.0.0.1 mysql-port: 3306 mysql-database: database mysql-username: root -mysql-password: +mysql-password: 'NOPE' # If enabled, CoreProtect will check for updates when your server starts up. # If an update is available, you'll be notified via your server console. diff --git a/DungeonsXL/config.yml b/DungeonsXL/config.yml new file mode 100755 index 0000000..ad0139a --- /dev/null +++ b/DungeonsXL/config.yml @@ -0,0 +1,45 @@ +configVersion: 15 +language: en +enableEconomy: false +tutorial: + activated: false + dungeon: tutorial + startGroup: default + endgroup: player +sendFloorTitle: true +editCommandWhitelist: [] +default: {} +chatEnabled: true +chatFormatGame: '&2[Game] %group_color%%player_name%: &r' +chatFormatGroup: '&2%group_color%[%group_name%] %player_name%: &r' +chatFormatSpy: '&2[Chat Spy] %player_name%: &r' +groupColorPriority: +- DARK_BLUE +- LIGHT_RED +- YELLOW +- LIGHT_GREEN +- PURPLE +- ORANGE +- WHITE +- BLACK +- LIGHT_BLUE +- DARK_GREEN +- DARK_RED +- LIGHT_GRAY +- CYAN +- MAGENTA +- DARK_GRAY +announcementInterval: 30.0 +globalDeathMessagesDisabled: true +externalMobProviders: {} +resourcePacks: {} +maxInstances: 10 +tweaksEnabled: false +secureMode: + enabled: false + openInventories: false + dropItems: false + checkInterval: 5.0 + editCommandWhitelist: [] +backupMode: ON_DISABLE_AND_SAVE +editPermissions: [] diff --git a/DungeonsXL/dungeons/test.yml b/DungeonsXL/dungeons/test.yml new file mode 100755 index 0000000..d496834 --- /dev/null +++ b/DungeonsXL/dungeons/test.yml @@ -0,0 +1,14 @@ +#The first floor the players enter. Needs at least lobby, ready, start and floor signs. +startFloor: MyDungeon_floor_01 +#The last floor the players enter. Needs at least start and end signs. +endFloor: MyDungeon_floor_12 +#A list of all other floors in the dungeon. Needs at least lobby, ready, start and floor signs. +floors: + - MyDungeon_floor_02 + + +#How many floors shall be selected randomly from the list before the player gets teleported to the endFloor? +floorCount: 1 + +#If true, the floors will get removed from the list when finished sothat one floor cannot be selected multiple times. +removeWhenPlayed: false diff --git a/Jobs/generalConfig.yml b/Jobs/generalConfig.yml index cb906c4..cb7e331 100755 --- a/Jobs/generalConfig.yml +++ b/Jobs/generalConfig.yml @@ -3,19 +3,17 @@ # to broadcast a message to the server when a user goes up a skill level. # It also allows admins to set the maximum number of jobs a player can have at # any one time. - +# # Default language. # Example: en, ru # File in locale folder with same name should exist. Example: messages_ru.yml locale-language: en storage: - # storage method, can be MySQL or sqlite - method: sqlite -# Requires Mysql. -mysql-username: root -mysql-password: NOPE + method: SqLite +mysql-username: jobsreborn +mysql-password: 'NOPE' mysql-hostname: localhost:3306 -mysql-database: minecraft +mysql-database: jobs mysql-table-prefix: jobs_ verify-server-certificate: false use-ssl: false diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index dba7abf..5849993 100755 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -95,54 +95,6 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' - world_the_end: - ==: MVWorld - hidden: 'false' - alias: world_the_end - color: WHITE - style: NORMAL - pvp: 'true' - scale: '16.0' - respawnWorld: '' - allowWeather: 'true' - difficulty: EASY - spawning: - ==: MVSpawnSettings - animals: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - monsters: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - entryfee: - ==: MVEntryFee - amount: '0.0' - currency: '-1' - hunger: 'true' - autoHeal: 'true' - adjustSpawn: 'true' - portalForm: ALL - gameMode: SURVIVAL - keepSpawnInMemory: 'true' - spawnLocation: - ==: MVSpawnLocation - x: -4.710357902146693 - y: 59.0 - z: 0.6541565622183771 - pitch: 2.5500019 - yaw: -91.005165 - autoLoad: 'true' - bedRespawn: 'true' - worldBlacklist: [] - environment: THE_END - seed: '2133291894169730654' - generator: 'null' - playerLimit: '-1' - allowFlight: 'true' world: ==: MVWorld hidden: 'false' @@ -191,6 +143,54 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' + world_the_end: + ==: MVWorld + hidden: 'false' + alias: world_the_end + color: WHITE + style: NORMAL + pvp: 'true' + scale: '16.0' + respawnWorld: '' + allowWeather: 'true' + difficulty: EASY + spawning: + ==: MVSpawnSettings + animals: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + monsters: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + entryfee: + ==: MVEntryFee + amount: '0.0' + currency: '-1' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'true' + portalForm: ALL + gameMode: SURVIVAL + keepSpawnInMemory: 'true' + spawnLocation: + ==: MVSpawnLocation + x: -4.710357902146693 + y: 59.0 + z: 0.6541565622183771 + pitch: 2.5500019 + yaw: -91.005165 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: THE_END + seed: '2133291894169730654' + generator: 'null' + playerLimit: '-1' + allowFlight: 'true' test: ==: MVWorld hidden: 'false' diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index c2b6de2..7bc7ad8 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -64,6 +64,11 @@ groups: - multiverse.core.list.* - plots.use - plots.permpack.basic + worlds: + plotworld: + permissions: + - -essentials.gamemode + - -chestshop.shop.* member: inheritance: - default @@ -86,6 +91,13 @@ groups: - plots.plot.1 options: rank: '60' + worlds: + plotworld: + permissions: + - limitedcreative.nolimit.break + - limitedcreative.nolimit.use + - limitedcreative.nolimit.interact + - limitedcreative.nolimit.chest donator: inheritance: - member @@ -117,6 +129,10 @@ groups: - multiverse.teleport.other.test options: rank: '40' + worlds: + plotworld: + permissions: + - -essentials.gamemode worldeditor: inheritance: - builder diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 7569df5..d748bcd 100755 --- a/PlotSquared/config/settings.yml +++ b/PlotSquared/config/settings.yml @@ -1,9 +1,9 @@ # These first 4 aren't configurable issues: "https://github.com/IntellectualSites/PlotSquared/issues" wiki: "https://github.com/IntellectualSites/PlotSquared/wiki" -date: "12 Jul 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2010" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/6ed6f60" +date: "18 Jul 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2012" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/d454602" platform: "Bukkit" # Show additional information in console debug: true @@ -161,6 +161,7 @@ auto-clear: required-plots: -1 confirmation: true days: 7 + skip-account-age-days: -1 worlds: - "*" # See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis diff --git a/PlotSquared/translations/style.yml b/PlotSquared/translations/style.yml index 533914f..f516450 100755 --- a/PlotSquared/translations/style.yml +++ b/PlotSquared/translations/style.yml @@ -1,4 +1,4 @@ -version: PlotSquared-18.6.12-6ed6f60-2010 +version: PlotSquared-18.6.18-d454602-2012 color: '3': '8' '4': '3' diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml index 9d09de7..f55187b 100755 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -445,7 +445,7 @@ plugin: dbname: towny table_prefix: towny_ username: root - password: NOPE + password: 'NOPE' ssl: 'false' # Flatfile backup settings. diff --git a/WorldGuard/config.yml b/WorldGuard/config.yml index 6c87f11..98fc99b 100755 --- a/WorldGuard/config.yml +++ b/WorldGuard/config.yml @@ -28,7 +28,7 @@ regions: use: false dsn: jdbc:mysql://localhost/worldguard username: worldguard - password: worldguard + password: 'NOPE' table-prefix: '' enable: true invincibility-removes-mobs: false diff --git a/WorldGuard/worlds/.raw/config.yml b/WorldGuard/worlds/.raw/config.yml new file mode 100644 index 0000000..1782911 --- /dev/null +++ b/WorldGuard/worlds/.raw/config.yml @@ -0,0 +1,12 @@ +# +# WorldGuard's world configuration file +# +# This is a world configuration file. Anything placed into here will only +# affect this world. If you don't put anything in this file, then the +# settings will be inherited from the main configuration file. +# +# If you see {} below, that means that there are NO entries in this file. +# Remove the {} and add your own entries. +# + +{} diff --git a/update.sh b/update.sh index f919fc1..c98099a 100755 --- a/update.sh +++ b/update.sh @@ -16,6 +16,7 @@ git add -f 'PlotSquared/*' ':!:PlotSquared/*storage*' git add -f 'PermissionsEx/permissions.yml' git add -f 'Multiverse-Core/worlds.yml' git add -f 'ServerRunner/config.yml' # Not a plugin +git add -f 'DungeonsXL/dungeons' 'DungeonsXL/scripts' git add -f update.sh download.sh