From ab00e8c15a0420cd19e42ca6df6e1719f1f95523 Mon Sep 17 00:00:00 2001 From: Chromachine Date: Fri, 20 Nov 2020 17:12:49 +0000 Subject: [PATCH] Update before server update --- Chroma-Chat/config.yml | 20 +++- {ChromaCore => Chroma-Core}/config.yml | 10 +- Chroma-Discord/config.yml | 37 +++++++- Multiverse-Core/worlds.yml | 122 ++++++++++++------------- Server/server.properties | 10 +- Towny/settings/config.yml | 18 +++- 6 files changed, 146 insertions(+), 71 deletions(-) rename {ChromaCore => Chroma-Core}/config.yml (85%) diff --git a/Chroma-Chat/config.yml b/Chroma-Chat/config.yml index 8f8b8d0..08ed6d9 100644 --- a/Chroma-Chat/config.yml +++ b/Chroma-Chat/config.yml @@ -13,7 +13,10 @@ components: # This color is applied to the player names in chat and on Dynmap, if used. TownColorComponent: enabled: true + # If enabled, players will have a nation-defined color in addition to town colors, white by default. + # They can change how much of each color they want with this as well. useNationColors: true + # The amount of town colors allowed. If more than one is used, players can change how many letters to be in a specific color using /u ncolor. colorCount: 1 towncolors: seedshire: @@ -26,18 +29,22 @@ components: # This was the original goal of this plugin when it was made. FlairComponent: enabled: false + # The Reddit thread to check for account connections. Re-enable the component if this was empty. flairThreadURL: https://www.reddit.com/r/Chromagamers/comments/51ys94/flair_thread_for_the_mc_server/ # Displays the configured messages at the set interval when someone is online. AnnouncerComponent: enabled: true + # The messages to display to players. announceMessages: - §eCheck out the subreddit! https://www.reddit.com/r/Chromagamers/ - '§bJoin Discord: https://discord.gg/gxmTS8N' - '§bLike the server? Vote: http://goo.gl/HDRW0a' + # The time in milliseconds between the messages. Use /u announce settime to set minutes. announceTime: 900000 # Random things I added over the years. FunComponent: enabled: true + # The strings that count as laughs, see unlol. laughStrings: - xd - lel @@ -47,7 +54,12 @@ components: - hue - hah - rofl + # The "Press F to pay respects" meme in Minecraft. It will randomly appear on player death and keep track of how many "F"s are said in chat. + # You can hover over a player's name to see their respect. respect: true + # This is an inside joke on our server. + # It keeps track of laughs (lols and what's defined in laughStrings) and if someone does /unlol or /unlaugh it will unlaugh the last person who laughed. + # Which also blinds the laughing person for a few seconds. This action can only be performed once per laugh. unlol: true # Allows players to append tableflips and other things to their messages. Everything is configurable here. AppendTextComponent: @@ -84,9 +96,10 @@ components: appendedText: ¯\\\_(ツ)\_/¯ # This component handles the custom processing of chat messages. If this component is disabled channels won't be supported in Minecraft. # If you only want to disable the formatting features, set allowFormatting to false. - # If you're using another chat plugin, you should disable the whole component. + # If you're using another chat plugin, you should disable the whole component but that will make it impossible to use channels. FormatterComponent: enabled: true + # Determines whether Markdown formatting, name mentioning and similar features are enabled. allowFormatting: true bold: enabled: true @@ -124,8 +137,13 @@ components: enabled: true someone: enabled: true + # The sound to play when a player is mentioned. Leave empty to use default. notificationSound: '' + # The pitch of the notification sound. notificationPitch: 1.0 rpc: enabled: true + # The minimum time between messages in milliseconds. minTimeBetweenMessages: 100 + greentext: + enabled: true diff --git a/ChromaCore/config.yml b/Chroma-Core/config.yml similarity index 85% rename from ChromaCore/config.yml rename to Chroma-Core/config.yml index fcc2355..e16da12 100644 --- a/ChromaCore/config.yml +++ b/Chroma-Core/config.yml @@ -11,9 +11,11 @@ global: components: PluginUpdaterComponent: enabled: true - # Provides commands such as /schrestart (restart after a countdown) and /primerestart (restart when nobody is online) + # Provides commands such as /schrestart (restart after a countdown) and /primerestart (restart when nobody is online). + # Also can automatically restart at a given time. RestartComponent: enabled: true + # Specifies the hour of day when the server should be restarted. Set to -1 to disable. restartAt: 12 # Manages chat channels. If disabled, only global channels will be registered. ChannelComponent: @@ -81,6 +83,8 @@ components: rp: enabled: true IDs: [] + displayName: §7RP§f + color: Gray # Teleport player to random location within world border. # Every five players teleport to the same general area, and then a new general area is randomly selected for the next five players. # Author: github.com/iiegit @@ -89,8 +93,11 @@ components: # Allows giving a 'member' group over some time elapsed OR played. MemberComponent: enabled: true + # The amount of days passed since first login registeredForDays: 7 + # The amount of hours needed to play before promotion playedHours: 12 + # The permission group to give to the player memberGroup: member # Automatically renames Towny players if they changed their Minecraft name TownyComponent: @@ -102,4 +109,5 @@ components: # Provides a /spawn command that works with BungeeCord. Make sure to set up on each server. SpawnComponent: enabled: true + # The BungeeCord server that has the spawn. Set to empty if this server is the target. targetServer: '' diff --git a/Chroma-Discord/config.yml b/Chroma-Discord/config.yml index 09eb0f6..f3cf7b4 100644 --- a/Chroma-Discord/config.yml +++ b/Chroma-Discord/config.yml @@ -10,7 +10,7 @@ global: # The role that allows using mod-only Discord commands. # If empty (''), then it will only allow for the owner. modRole: Moderator -serverup: true +serverup: false components: # Uses a bit of a hacky method of getting all broadcasted messages, including advancements and any other message that's for everyone. # If this component is enabled then these messages will show up on Discord. @@ -19,15 +19,30 @@ components: # Provides Minecraft chat connection to Discord. Commands may be used either in a public chat (limited) or in a DM. MinecraftChatModule: enabled: true + # The channel to use as the public Minecraft chat - everything public gets broadcasted here chatChannel: 613506700099584050 + # The plugins to exclude from fake player events used for the 'mcchat' command - some plugins may crash, add them here excludedPlugins: - ProtocolLib - LibsDisguises - JourneyMapServer + # If this setting is on then players logged in through the 'mcchat' command will be able to teleport using plugin commands. + # They can then use commands like /tpahere to teleport others to that place.
+ # If this is off, then teleporting will have no effect. allowFakePlayerTeleports: false + # If this is on, each chat channel will have a player list in their description. + # It only gets added if there's no description yet or there are (at least) two lines of "----" following each other. + # Note that it will replace everything above the first and below the last "----" but it will only detect exactly four dashes. + # So if you want to use dashes for something else in the description, make sure it's either less or more dashes in one line. showPlayerListOnDC: true + # This setting controls whether custom chat connections can be created (existing connections will always work). + # Custom chat connections can be created using the channelcon command and they allow players to display town chat in a Discord channel for example. + # See the channelcon command for more details. allowCustomChat: true + # This setting allows you to control if players can DM the bot to log on the server from Discord. + # This allows them to both chat and perform any command they can in-game. allowPrivateChat: true + # A list of commands that can be used in public chats - Warning: Some plugins will treat players as OPs, always test before allowing a command! whitelistedCommands: - list - u @@ -49,32 +64,50 @@ components: groupid: everyone toggles: 0 brtoggles: [] + # If set, message authors appearing on Discord will link to this URL. A 'type' and 'id' parameter will be added with the user's platform (Discord, Minecraft, ...) and ID. profileURL: https://tbmcplugins.github.io/profile.html + # Enables support for running vanilla commands through Discord, if you ever need it. enableVanillaCommands: true + muteRole: Muted + # Whether players logged on from Discord (mcchat command) should be recognised by other plugins. Some plugins might break if it's turned off. + # But it's really hacky. + addFakePlayersToBukkit: false + # Set by the component to report crashes. + serverUp: true # Listens for errors from the Chroma plugins and posts them to Discord, ignoring repeating errors so it's not that spammy. ExceptionListenerModule: enabled: true + # The channel to post the errors to. channel: 239519012529111040 + # The role to ping if an error occurs. Set to empty ('') to disable. pingRole: Coder # Automatically collects roles with a certain color. # Users can add these roles to themselves using the /role Discord command. GameRoleModule: enabled: true + # The channel where the bot logs when it detects a role change that results in a new game role or one being removed. logChannel: 0 + # The role color that is used by game roles. + # Defaults to the second to last in the upper row - #95a5a6. roleColor: '#0095a5a6' # Posts new posts from Reddit to the specified channel(s). It will pin the regular posts (not the mod posts). AnnouncerModule: enabled: true + # Automatically unpins all messages except the last few. Set to 0 or >50 to disable keepPinned: 40 lastAnnouncementTime: 1577850597 lastSeenTime: 1577850597 + # Channel to post new posts. channel: 125813020357165056 + # The subreddit to pull the posts from subredditURL: https://www.reddit.com/r/ChromaGamers + # Channel where distinguished (moderator) posts go. modChannel: 126795071927353344 # All kinds of random things. # The YEEHAW event uses an emoji named :YEEHAW: if available FunModule: enabled: true + # Answers for a recognized question. Selected randomly. serverReadyAnswers: - In one week from now - Between now and the heat-death of the universe. @@ -91,6 +124,7 @@ components: - After HL3 comes out - Next time you ask - When will *you* be open? + # Questions that the bot will choose a random answer to give to. serverReady: - when will the server be open - when will the server be ready @@ -100,4 +134,5 @@ components: - when's the server ready - when's the server open - Vhen vill ze server be open? + # The channel to post the full house to. fullHouseChannel: 0 diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index a1462af..faad97a 100644 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -1,51 +1,4 @@ worlds: - world_the_end: - ==: MVWorld - hidden: 'false' - alias: world_the_end - color: WHITE - style: NORMAL - pvp: 'true' - scale: '16.0' - respawnWorld: world - allowWeather: 'true' - difficulty: NORMAL - 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: 'false' - spawnLocation: - ==: MVSpawnLocation - x: 0.0 - y: 62.0 - z: 0.0 - pitch: 0.0 - yaw: 0.0 - autoLoad: 'true' - bedRespawn: 'true' - worldBlacklist: [] - environment: THE_END - seed: '1923020019' - generator: 'null' - playerLimit: '-1' - allowFlight: 'true' world: ==: MVWorld hidden: 'false' @@ -93,6 +46,53 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' + world_the_end: + ==: MVWorld + hidden: 'false' + alias: world_the_end + color: WHITE + style: NORMAL + pvp: 'true' + scale: '16.0' + respawnWorld: world + allowWeather: 'true' + difficulty: NORMAL + 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: 'false' + spawnLocation: + ==: MVSpawnLocation + x: 0.0 + y: 62.0 + z: 0.0 + pitch: 0.0 + yaw: 0.0 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: THE_END + seed: '1923020019' + generator: 'null' + playerLimit: '-1' + allowFlight: 'true' world_nether: ==: MVWorld hidden: 'false' @@ -187,16 +187,16 @@ worlds: generator: PlotSquared playerLimit: '-1' allowFlight: 'true' - worldhub: + flatworld: ==: MVWorld hidden: 'false' - alias: worldhub + alias: flatworld color: WHITE style: NORMAL pvp: 'true' scale: '1.0' respawnWorld: '' - allowWeather: 'false' + allowWeather: 'true' difficulty: NORMAL spawning: ==: MVSpawnSettings @@ -207,7 +207,7 @@ worlds: exceptions: [] monsters: ==: MVSpawnSubSettings - spawn: 'false' + spawn: 'true' spawnrate: '-1' exceptions: [] entryfee: @@ -221,16 +221,16 @@ worlds: keepSpawnInMemory: 'false' spawnLocation: ==: MVSpawnLocation - x: 162.5 + x: -256.0 y: 4.0 - z: -95.5 + z: -96.0 pitch: 0.0 yaw: 0.0 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '-5692829584426207714' + seed: '4622440486943241231' generator: 'null' playerLimit: '-1' allowFlight: 'true' @@ -281,16 +281,16 @@ worlds: generator: 'null' playerLimit: '-1' allowFlight: 'true' - flatworld: + worldhub: ==: MVWorld hidden: 'false' - alias: flatworld + alias: worldhub color: WHITE style: NORMAL pvp: 'true' scale: '1.0' respawnWorld: '' - allowWeather: 'true' + allowWeather: 'false' difficulty: NORMAL spawning: ==: MVSpawnSettings @@ -301,7 +301,7 @@ worlds: exceptions: [] monsters: ==: MVSpawnSubSettings - spawn: 'true' + spawn: 'false' spawnrate: '-1' exceptions: [] entryfee: @@ -315,16 +315,16 @@ worlds: keepSpawnInMemory: 'false' spawnLocation: ==: MVSpawnLocation - x: -256.0 + x: 162.5 y: 4.0 - z: -96.0 + z: -95.5 pitch: 0.0 yaw: 0.0 autoLoad: 'true' bedRespawn: 'true' worldBlacklist: [] environment: NORMAL - seed: '4622440486943241231' + seed: '-5692829584426207714' generator: 'null' playerLimit: '-1' allowFlight: 'true' diff --git a/Server/server.properties b/Server/server.properties index dd25553..a69bbf0 100644 --- a/Server/server.properties +++ b/Server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Thu Oct 22 15:57:22 UTC 2020 +#Fri Nov 20 12:01:39 UTC 2020 spawn-protection=16 max-tick-time=60000 query.port=25565 @@ -41,12 +41,12 @@ spawn-animals=true white-list=false rcon.password= generate-structures=true -online-mode=false max-build-height=256 +online-mode=false level-seed=1923020019 -prevent-proxy-connections=false use-native-transport=true +prevent-proxy-connections=false enable-jmx-monitoring=false -motd=Chromacraft v5 -enable-rcon=false rate-limit=0 +enable-rcon=false +motd=Chromacraft v5 diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml index 2905d48..8563757 100755 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -1,8 +1,8 @@ version: # This is the current version of Towny. Please do not edit. - version: 0.96.2.21 + version: 0.96.3.0 # This is for showing the changelog on updates. Please do not edit. - last_run_version: 0.96.2.21 + last_run_version: 0.96.3.0 # The language file you wish to use language: english.yml @@ -40,6 +40,7 @@ levels: townBlockLimit: 4 upkeepModifier: 0.1 townOutpostLimit: 0 + debtCapModifier: '1.0' - numResidents: 1 namePostfix: ' (Settlement)' mayorPrefix: 'Hermit ' @@ -49,6 +50,7 @@ levels: townBlockLimit: 64 upkeepModifier: 0.1 townOutpostLimit: 0 + debtCapModifier: '1.0' - numResidents: 2 namePostfix: ' (Hamlet)' mayorPrefix: 'Chief ' @@ -58,6 +60,7 @@ levels: townBlockLimit: 128 upkeepModifier: 0.1 townOutpostLimit: 1 + debtCapModifier: '1.0' - numResidents: 6 namePostfix: ' (Village)' mayorPrefix: 'Baron Von ' @@ -67,6 +70,7 @@ levels: townBlockLimit: 384 upkeepModifier: 0.2 townOutpostLimit: 1 + debtCapModifier: '1.0' - numResidents: 10 namePostfix: ' (Town)' mayorPrefix: 'Viscount ' @@ -76,6 +80,7 @@ levels: townBlockLimit: 640 upkeepModifier: 0.3 townOutpostLimit: 2 + debtCapModifier: '1.0' - numResidents: 14 namePostfix: ' (Large Town)' mayorPrefix: 'Count Von ' @@ -85,6 +90,7 @@ levels: townBlockLimit: 896 upkeepModifier: 0.4 townOutpostLimit: 2 + debtCapModifier: '1.0' - numResidents: 20 namePostfix: ' (City)' mayorPrefix: 'Earl ' @@ -94,6 +100,7 @@ levels: townBlockLimit: 4280 upkeepModifier: 0.5 townOutpostLimit: 3 + debtCapModifier: '1.0' - numResidents: 24 namePostfix: ' (Large City)' mayorPrefix: 'Duke ' @@ -103,6 +110,7 @@ levels: townBlockLimit: 4536 upkeepModifier: 0.6 townOutpostLimit: 3 + debtCapModifier: '1.0' - numResidents: 28 namePostfix: ' (Metropolis)' mayorPrefix: 'Lord ' @@ -112,6 +120,7 @@ levels: townBlockLimit: 4792 upkeepModifier: 0.7 townOutpostLimit: 4 + debtCapModifier: '1.0' # default Nation levels. nation_level: - kingPostfix: '' @@ -1349,6 +1358,11 @@ economy: # making all towns have the same debt cap. override: '0.0' + # When true the debt_cap.override price will be multiplied by the debtCapModifier in the town_level + # section of the config. (Ex: debtCapModifier of 3.0 and debt_cap.override of 1000.0 would set + # a debtcap of 3.0 x 1000 = 3000. + debt_cap_uses_town_levels: 'false' + upkeep: # If a town has reached their debt cap and is unable to pay the upkeep with debt,