From c55974fcc398113eeee418a6836eaf2c81806aac Mon Sep 17 00:00:00 2001 From: Chromachine Date: Sun, 20 Oct 2019 13:33:52 +0000 Subject: [PATCH] Add plotworld and flatworld, backup fix Excluding museum worlds from the backup (Drastically reducing backup size) --- Chroma-Chat/config.yml | 2 + Chroma-Discord/config.yml | 2 +- Jobs/actionBarBossbar.yml | 41 ++++---- Multiverse-Core/worlds.yml | 94 ++++++++++++++++++ PlotSquared/config/commands.yml | 75 ++++++++------ PlotSquared/config/settings.yml | 4 +- PlotSquared/config/worlds.yml | 53 ++++++++++ PlotSquared/config/worlds.yml.old | 54 ++++++++++ .../plotworld/intersection.schematic | Bin 0 -> 254 bytes .../plotworld/sideroad.schematic | Bin 0 -> 216 bytes PlotSquared/scripts/automerge.js | 18 ++-- PlotSquared/templates/bridge.template | Bin PlotSquared/templates/skyblock.template | Bin PlotSquared/templates/town.template | Bin SimpleBackupReloaded/config.yml | 8 +- Votifier/config.yml | 2 +- WorldGuard/worlds/flatworld/config.yml | 12 +++ WorldGuard/worlds/plotworld/config.yml | 12 +++ 18 files changed, 317 insertions(+), 60 deletions(-) mode change 100644 => 100755 PlotSquared/config/commands.yml mode change 100644 => 100755 PlotSquared/config/settings.yml mode change 100644 => 100755 PlotSquared/config/worlds.yml create mode 100644 PlotSquared/config/worlds.yml.old create mode 100755 PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/intersection.schematic create mode 100755 PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/sideroad.schematic mode change 100644 => 100755 PlotSquared/scripts/automerge.js mode change 100644 => 100755 PlotSquared/templates/bridge.template mode change 100644 => 100755 PlotSquared/templates/skyblock.template mode change 100644 => 100755 PlotSquared/templates/town.template create mode 100644 WorldGuard/worlds/flatworld/config.yml create mode 100644 WorldGuard/worlds/plotworld/config.yml diff --git a/Chroma-Chat/config.yml b/Chroma-Chat/config.yml index 9bb826a..26ee8a8 100644 --- a/Chroma-Chat/config.yml +++ b/Chroma-Chat/config.yml @@ -11,6 +11,8 @@ components: towncolors: praxis: - DarkRed + cliffnautica: + - Blue ignatios_antonos: - DarkGray uh-oh: diff --git a/Chroma-Discord/config.yml b/Chroma-Discord/config.yml index 286aa18..1c6faae 100644 --- a/Chroma-Discord/config.yml +++ b/Chroma-Discord/config.yml @@ -4,7 +4,7 @@ global: prefix: / inviteLink: '' modRole: Moderator -serverup: true +serverup: false components: GeneralEventBroadcasterModule: enabled: true diff --git a/Jobs/actionBarBossbar.yml b/Jobs/actionBarBossbar.yml index c0b05b9..a51741e 100644 --- a/Jobs/actionBarBossbar.yml +++ b/Jobs/actionBarBossbar.yml @@ -1,28 +1,33 @@ bossBar: + TaffySwordsman: true TheShyPig: true jarrxth: true AtlanticMercyyy: true matyello: true xPoonSlayer_69x: true Deoplo: true - Alisolarflare: true - PrincessFox: true - thewindmillman: true - creepachu: true - Dizzle8949: true - SyK7: true - cedricvh27: true - Ghostise: true - justscooby: true - Mr_Byzantine: true -actionBar: - TheShyPig: true - jarrxth: true - AtlanticMercyyy: true - matyello: true - xPoonSlayer_69x: true - Deoplo: true - NorbiPeti: true + VanillaVela: true + Alisolarflare: true + PrincessFox: true + thewindmillman: true + DubbleBerger: true + creepachu: true + Dizzle8949: true + SyK7: true + cedricvh27: true + Ghostise: true + justscooby: true + Mr_Byzantine: true +actionBar: + TaffySwordsman: true + TheShyPig: true + jarrxth: true + AtlanticMercyyy: true + matyello: true + xPoonSlayer_69x: true + Deoplo: true + NorbiPeti: true + VanillaVela: true Alisolarflare: true PrincessFox: true thewindmillman: true diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index 79c2762..f7a87ba 100644 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -140,6 +140,100 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' + plotworld: + ==: MVWorld + hidden: 'false' + alias: '' + color: WHITE + style: NORMAL + pvp: 'true' + scale: '1.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' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'true' + portalForm: ALL + gameMode: CREATIVE + keepSpawnInMemory: 'true' + spawnLocation: + ==: MVSpawnLocation + x: -100.0 + y: 65.0 + z: 361.0 + pitch: 0.0 + yaw: 0.0 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: NORMAL + seed: '-7282589520118052005' + generator: PlotSquared + playerLimit: '-1' + allowFlight: 'true' + flatworld: + ==: MVWorld + hidden: 'false' + alias: '' + color: WHITE + style: NORMAL + pvp: 'true' + scale: '1.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' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'true' + portalForm: ALL + gameMode: SURVIVAL + keepSpawnInMemory: 'true' + spawnLocation: + ==: MVSpawnLocation + x: -256.0 + y: 4.0 + z: -96.0 + pitch: 0.0 + yaw: 0.0 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: NORMAL + seed: '4622440486943241231' + generator: 'null' + playerLimit: '-1' + allowFlight: 'true' v1: ==: MVWorld hidden: 'false' diff --git a/PlotSquared/config/commands.yml b/PlotSquared/config/commands.yml old mode 100644 new mode 100755 index 381d904..d058503 --- a/PlotSquared/config/commands.yml +++ b/PlotSquared/config/commands.yml @@ -31,7 +31,7 @@ load: aliases: - load - restore - usage: /plot load + usage: /plot restore description: Load your plot confirmation: false confirm: @@ -50,9 +50,16 @@ download: aliases: - download - dl - usage: /plot download [schematic|world] + usage: /plot download [schematic|bo3|world] description: Download your plot confirmation: false +changelog: + aliases: + - changelog + - cl + usage: /plot changelog + description: View the changelog + confirmation: false setup: aliases: - setup @@ -138,34 +145,35 @@ clear: - clear - reset usage: /plot clear - description: Clear the plot you stand on + description: Clear a plot confirmation: true delete: aliases: - delete - dispose - del + - reset usage: /plot delete - description: Delete the plot you stand on + description: Delete a plot confirmation: true trust: aliases: - trust - t usage: /plot trust - description: Allow a user to build in a plot while you are offline + description: Allow a player to build in a plot confirmation: false add: aliases: - add usage: /plot add - description: Allow a user to build in a plot while you are online + description: Allow a user to build while you are online confirmation: false leave: aliases: - leave usage: '' - description: Removes self from being trusted or a member of the plot + description: Leave a plot confirmation: false deny: aliases: @@ -191,7 +199,7 @@ info: aliases: - info - i - usage: /plot info [-f, to force info] + usage: /plot info description: Display plot info confirmation: false near: @@ -221,7 +229,6 @@ schematic: aliases: - schematic - sch - - schem usage: /plot schematic description: Schematic command confirmation: false @@ -229,7 +236,7 @@ plugin: aliases: - plugin - version - usage: /plot plugin + usage: '' description: Show plugin information confirmation: false purge: @@ -242,14 +249,13 @@ purge: reload: aliases: - reload - - rl usage: /plot reload - description: Reload translations and world settings + description: Reload configurations confirmation: false relight: aliases: - relight - usage: /plot relight + usage: '' description: Relight your plot confirmation: false merge: @@ -264,24 +270,30 @@ debugpaste: - debugpaste - dp usage: /plot debugpaste - description: Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your - latest.log to https://athion.net/ISPaster/paste + description: Upload settings.yml, worlds.yml, commands.yml and latest.log to www.hastebin.com confirmation: false unlink: aliases: - unlink - u - unmerge - usage: /plot unlink [createroads] + usage: /plot unlink description: Unlink a mega-plot confirmation: true kick: aliases: - kick - k - usage: /plot kick + usage: description: Kick a player from your plot confirmation: false +rate: + aliases: + - rate + - rt + usage: /plot rate [#|next|purge] + description: Rate the plot + confirmation: false debugclaimtest: aliases: - debugclaimtest @@ -320,14 +332,13 @@ music: aliases: - music usage: /plot music - description: Play music in your plot + description: Player music in a plot confirmation: false debugroadregen: aliases: - debugroadregen - usage: /plot debugroadregen - description: Regenerate roads in the plot or region the user is, based on the road - schematic + usage: /plot debugroadregen + description: Regenerate all roads based on the road schematic confirmation: false debugexec: aliases: @@ -404,6 +415,13 @@ continue: usage: '' description: Continue a plot that was previously marked as done confirmation: false +bo3: + aliases: + - bo3 + - bo2 + usage: '' + description: Mark a plot as done + confirmation: false middle: aliases: - middle @@ -466,7 +484,7 @@ sethome: - sh - seth usage: /plot sethome [none] - description: Set the plot home to your current position + description: Set the plot home confirmation: false cluster: aliases: @@ -481,13 +499,6 @@ debugimportworlds: usage: '' description: Import worlds by player name confirmation: false -rate: - aliases: - - rate - - rt - usage: /plot rate [#|next|purge] - description: Rate the plot - confirmation: false toggle: aliases: - toggle @@ -569,3 +580,9 @@ generatebiome: usage: /plots generatebiome description: Generate a biome in your plot confirmation: false +moveto512: + aliases: + - moveto512 + usage: /plots moveto512 [world] + description: Move plots to a 512 sized region + confirmation: false diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml old mode 100644 new mode 100755 index db8c735..832f068 --- a/PlotSquared/config/settings.yml +++ b/PlotSquared/config/settings.yml @@ -169,10 +169,10 @@ chunk-processor: # This is an auto clearing task called `task1` auto-clear: task1: - threshold: -1 + threshold: 1 required-plots: -1 confirmation: true - days: 90 + days: 7 skip-account-age-days: -1 worlds: - "*" diff --git a/PlotSquared/config/worlds.yml b/PlotSquared/config/worlds.yml old mode 100644 new mode 100755 index e69de29..639257b --- a/PlotSquared/config/worlds.yml +++ b/PlotSquared/config/worlds.yml @@ -0,0 +1,53 @@ +configuration_version: post_flattening +worlds: + plotworld: + plot: + height: 62 + biome: FOREST + size: 42 + filling: stone:100 + auto_merge: false + bedrock: true + create_signs: true + floor: grass_block:100 + wall: + filling: stone:100 + block_claimed: sandstone_slab:100 + height: 62 + block: stone_slab:100 + misc_spawn_unowned: false + road: + block: quartz_block:100 + height: 62 + width: 7 + home: + nonmembers: side + default: side + schematic: + specify_on_claim: false + on_claim: false + file: 'null' + schematics: [] + economy: + prices: + merge: 100 + sell: 100 + claim: 100 + use: false + chat: + enabled: false + limits: + max-members: 128 + world: + max_height: 256 + gamemode: creative + min_height: 1 + border: false + event: + spawn: + egg: false + breeding: false + custom: true + natural_mob_spawning: false + mob_spawner_spawning: false + flags: {} diff --git a/PlotSquared/config/worlds.yml.old b/PlotSquared/config/worlds.yml.old new file mode 100644 index 0000000..c98ec2d --- /dev/null +++ b/PlotSquared/config/worlds.yml.old @@ -0,0 +1,54 @@ +worlds: + plotworld: + plot: + height: 64 + biome: FOREST + size: 42 + filling: + - '1:0' + auto_merge: false + bedrock: true + create_signs: true + floor: + - '2:0' + wall: + filling: '1:0' + block_claimed: '44:1' + height: 64 + block: '44:0' + misc_spawn_unowned: false + road: + block: '155:0' + height: 64 + width: 7 + home: + nonmembers: side + default: side + schematic: + specify_on_claim: false + on_claim: false + file: 'null' + economy: + prices: + merge: 100 + sell: 100 + claim: 100 + use: false + chat: + enabled: false + limits: + max-members: 128 + world: + max_height: 256 + gamemode: creative + min_height: 1 + border: false + event: + spawn: + egg: false + breeding: false + custom: true + natural_mob_spawning: false + mob_spawner_spawning: false + flags: {} + mob_damage: false diff --git a/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/intersection.schematic b/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/intersection.schematic new file mode 100755 index 0000000000000000000000000000000000000000..ceb0bc0a58abd3be9fc507333d15c0f6f59d0937 GIT binary patch literal 254 zcmVi|A%+( z+}K3~ymR5kA|l|OCkF}?PeyUQ9X80{KD&;%fP7G_2U2E4c5OadC6L}KR)@eIX*!iV ze)yfgE~gSs5)ogDcOD}TdX)3zfW-L=8NKY8nDjWemlDMhpCP~3eZwup8RTmDSl6TG zS1Sd){NV#N)UOZpE6~?|)t#oMWn_WXMy~>HS6|MMt?1o8if;e_0RR6301x^oli30Q E07Wf&CjbBd literal 0 HcmV?d00001 diff --git a/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/sideroad.schematic b/PlotSquared/schematics/GEN_ROAD_SCHEMATIC/plotworld/sideroad.schematic new file mode 100755 index 0000000000000000000000000000000000000000..b0154d14cea49a7fa08c74094c120cc240db49c2 GIT binary patch literal 216 zcmV;}04M(+iwFP!000001MHIB3W7ioMnBD5S9+3&o}nV43!|W*pS#Ug9o#H*did^Y zBgiiD2^U26j5@R;K(IE7(`$8s zf4Ub1aR9kgtSeHcMt^E}47Vz4Enqmqe9*P*?X2!7m! zAL}yX9K#;uE?T8&t$A-#4L^LnqKwMpOCOE=@zZLdDa#pd"); - MainUtil.class.static.sendMessage(PlotPlayer, "$1 is true or false if you want to remove roads when auto merging"); } +else { + C_COMMAND_SYNTAX.send(PlotPlayer, "/plot debugexec automerge.js "); + MainUtil.sendMessage(PlotPlayer, "$1 is true or false if you want to remove roads when auto merging"); +} \ No newline at end of file diff --git a/PlotSquared/templates/bridge.template b/PlotSquared/templates/bridge.template old mode 100644 new mode 100755 diff --git a/PlotSquared/templates/skyblock.template b/PlotSquared/templates/skyblock.template old mode 100644 new mode 100755 diff --git a/PlotSquared/templates/town.template b/PlotSquared/templates/town.template old mode 100644 new mode 100755 diff --git a/SimpleBackupReloaded/config.yml b/SimpleBackupReloaded/config.yml index ec49b0f..8dd7fed 100644 --- a/SimpleBackupReloaded/config.yml +++ b/SimpleBackupReloaded/config.yml @@ -1,7 +1,13 @@ # The time of day to make backups (makes sense with daily backups) start-time: 03:00 backup-interval-hours: 24.0 -backup-worlds: [] +backup-worlds: +- world +- world_nether +- world_the_end +- worldhub +- flatworld +- plotworld backup-file: backups/ backup-date-format: yyyy-MM-dd-HH-mm-ss backup-empty-server: false diff --git a/Votifier/config.yml b/Votifier/config.yml index ee20880..64eedca 100644 --- a/Votifier/config.yml +++ b/Votifier/config.yml @@ -13,7 +13,7 @@ disable-v1-protocol: false # All tokens, labeled by the serviceName of each server list. tokens: # Default token for all server lists, if another isn't supplied. - default: voreuavh6vd07b1v98ogie1p4s + default: kcah732f9hecgrvh42ir1dmds5 # Configuration section for all vote forwarding to NuVotifier forwarding: diff --git a/WorldGuard/worlds/flatworld/config.yml b/WorldGuard/worlds/flatworld/config.yml new file mode 100644 index 0000000..1782911 --- /dev/null +++ b/WorldGuard/worlds/flatworld/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/WorldGuard/worlds/plotworld/config.yml b/WorldGuard/worlds/plotworld/config.yml new file mode 100644 index 0000000..1782911 --- /dev/null +++ b/WorldGuard/worlds/plotworld/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. +# + +{}