From 72da16e5eb4941fa1545d6bbcc66d8d58d8d138d Mon Sep 17 00:00:00 2001 From: Chromachine Date: Sun, 16 Feb 2020 17:46:13 +0000 Subject: [PATCH] Update before 1.15.2 1.14.4 --- Chroma-Chat/config.yml | 19 ++++++ Chroma-Discord/config.yml | 25 ++++++- ChromaCore/config.yml | 14 ++++ Jobs/actionBarBossbar.yml | 18 ++--- Multiverse-Core/worlds.yml | 126 +++++++++++++++++------------------ Server/server.properties | 8 +-- ServerRunner/config.yml | 1 - Towny/settings/applyPatch.sh | 2 +- Towny/settings/config.yml | 20 +++++- 9 files changed, 151 insertions(+), 82 deletions(-) mode change 100644 => 100755 Towny/settings/applyPatch.sh mode change 100755 => 100644 Towny/settings/config.yml diff --git a/Chroma-Chat/config.yml b/Chroma-Chat/config.yml index 64c1c15..6d728c5 100644 --- a/Chroma-Chat/config.yml +++ b/Chroma-Chat/config.yml @@ -1,9 +1,16 @@ global: notificationSound: '' notificationPitch: 1.0 + # If enabled, stores and displays the last 10 messages the player can see (public, their town chat etc.) + # Can be used with the Discord plugin so players can see some of the conversation they missed that's visible on Discord anyways. + storeChatHistory: true components: + # This component manages the town and nation chat. It's also needed for the TownColorComponent. + # It provides the TC and NC channels, and posts Towny messages (global, town, nation) to the correct channels for other platforms like Discord. TownyComponent: enabled: true + # Town colors for Towny. It allows mayors and kings to set a color for their town/nation (nation can be disabled). + # This color is applied to the player names in chat and on Dynmap, if used. TownColorComponent: enabled: true useNationColors: true @@ -17,14 +24,19 @@ components: - Gold liria: - DarkPurple + winterforge: + - Aqua xoll: - DarkBlue nationcolors: peoples_republic: Red leagueofcrafters: Gold + # This component checks a specific Reddit thread every 10 seconds for comments such as "IGN: NorbiPeti" to link Reddit accounts and to determine their /r/thebutton flair. + # This was the original goal of this plugin when it was made. FlairComponent: enabled: true 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 announceMessages: @@ -32,6 +44,7 @@ components: - '§bJoin Discord: https://discord.gg/gxmTS8N' - '§bLike the server? Vote: http://goo.gl/HDRW0a' announceTime: 900000 + # Random things I added over the years. FunComponent: enabled: true laughStrings: @@ -45,6 +58,7 @@ components: - rofl respect: true unlol: true + # Allows players to append tableflips and other things to their messages. Everything is configurable here. AppendTextComponent: enabled: true texts: @@ -77,6 +91,9 @@ components: - This command appends a shrug after your message - Or just makes you shrug 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. FormatterComponent: enabled: true allowFormatting: true @@ -116,3 +133,5 @@ components: enabled: true someone: enabled: true + notificationSound: '' + notificationPitch: 1.0 diff --git a/Chroma-Discord/config.yml b/Chroma-Discord/config.yml index 17fb8b8..c459a52 100644 --- a/Chroma-Discord/config.yml +++ b/Chroma-Discord/config.yml @@ -1,13 +1,22 @@ global: + # The main server where the roles and other information is pulled from. It's automatically set to the first server the bot's invited to. mainServer: 125813020357165056 + # The (bot) channel to use for Discord commands like /role. commandChannel: 209720707188260864 + # The prefix to use with Discord commands like /role. It only works in the bot channel. prefix: '|' + # The invite link to show by /discord invite. If empty, it defaults to the first invite if the bot has access. inviteLink: https://discord.gg/gxmTS8N + # The role that allows using mod-only Discord commands. + # If empty (''), then it will only allow for the owner. modRole: Moderator serverup: true 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. GeneralEventBroadcasterModule: enabled: true + # Provides Minecraft chat connection to Discord. Commands may be used either in a public chat (limited) or in a DM. MinecraftChatModule: enabled: true chatChannel: 613506700099584050 @@ -41,15 +50,26 @@ components: toggles: 0 brtoggles: [] profileURL: https://tbmcplugins.github.io/profile.html + # Listens for errors from the Chroma plugins and posts them to Discord, ignoring repeating errors so it's not that spammy. ExceptionListenerModule: enabled: true + channel: 239519012529111040 + pingRole: Coder + # Automatically collects roles with a certain color (the second to last in the upper row - #95a5a6). + # Users can add these roles to themselves using the /role Discord command. GameRoleModule: enabled: true + # Posts new posts from Reddit to the specified channel(s). It will pin the regular posts (not the mod posts). AnnouncerModule: enabled: true keepPinned: 40 - lastAnnouncementTime: 1563726352 - lastSeenTime: 1563726352 + lastAnnouncementTime: 1577850597 + lastSeenTime: 1577850597 + channel: 125813020357165056 + subredditURL: https://www.reddit.com/r/ChromaGamers + modChannel: 126795071927353344 + # All kinds of random things. + # The YEEHAW event uses an emoji named :YEEHAW: if available FunModule: enabled: true serverReadyAnswers: @@ -77,3 +97,4 @@ components: - when's the server ready - when's the server open - Vhen vill ze server be open? + fullHouseChannel: 0 diff --git a/ChromaCore/config.yml b/ChromaCore/config.yml index d3aa1d7..9d0cb9a 100644 --- a/ChromaCore/config.yml +++ b/ChromaCore/config.yml @@ -1,12 +1,19 @@ global: + # Sets whether the plugin should write a list of installed plugins in a txt file. + # It can be useful if some other software needs to know the plugins. writePluginList: true + # Print some debug information. test: false + # The chat format to use for messages from other platforms if Chroma-Chat is not installed. chatFormat: '[{origin}|{channel}] <{name}> {message}' components: + # Downloads plugin updates built from their source using JitPack - doesn't work anymore PluginUpdaterComponent: enabled: true + # Provides commands such as /schrestart (restart after a countdown) and /primerestart (restart when nobody is online) RestartComponent: enabled: true + # Manages chat channels. If disabled, only global channels will be registered. ChannelComponent: enabled: true g: @@ -58,18 +65,25 @@ components: rp: enabled: true IDs: [] + # 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 RandomTPComponent: enabled: false + # Allows giving a 'member' group over some time elapsed OR played. MemberComponent: enabled: true registeredForDays: 7 playedHours: 12 memberGroup: member + # Automatically renames Towny players if they changed their Minecraft name TownyComponent: enabled: true + # Do not use (EULA) VotifierComponent: enabled: true rewardAmount: 0.0 + # Provides a /spawn command that works with BungeeCord. Make sure to set up on each server. SpawnComponent: enabled: true targetServer: '' diff --git a/Jobs/actionBarBossbar.yml b/Jobs/actionBarBossbar.yml index cce6891..b772206 100644 --- a/Jobs/actionBarBossbar.yml +++ b/Jobs/actionBarBossbar.yml @@ -12,6 +12,7 @@ bossBar: NorbiPeti: true Alisolarflare: true PrincessFox: true + Dral_Flore: true thewindmillman: true DubbleBerger: true creepachu: true @@ -23,27 +24,28 @@ bossBar: SafireMister: true Mr_Byzantine: true actionBar: - TaffySwordsman: true jedipadwan: true TheShyPig: true jarrxth: true - AtlanticMercyyy: true - matyello: true HasOkayInternet: true Serxen: true xPoonSlayer_69x: true Deoplo: true - NorbiPeti: true VanillaVela: true - Alisolarflare: true - PrincessFox: true + Dral_Flore: true thewindmillman: true DubbleBerger: true + Ghostise: true + Mr_Byzantine: true + TaffySwordsman: true + AtlanticMercyyy: true + matyello: true + NorbiPeti: true + Alisolarflare: true + PrincessFox: true creepachu: true Dizzle8949: true SyK7: true cedricvh27: true - Ghostise: true justscooby: true SafireMister: true - Mr_Byzantine: true diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index 2287df5..41c4c5a 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: 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: '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: 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: '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: EASY spawning: ==: MVSpawnSettings @@ -207,7 +207,7 @@ worlds: exceptions: [] monsters: ==: MVSpawnSubSettings - spawn: 'false' + spawn: 'true' spawnrate: '-1' exceptions: [] entryfee: @@ -217,20 +217,20 @@ worlds: autoHeal: 'true' adjustSpawn: 'true' portalForm: ALL - gameMode: ADVENTURE + gameMode: SURVIVAL 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: EASY spawning: ==: MVSpawnSettings @@ -301,7 +301,7 @@ worlds: exceptions: [] monsters: ==: MVSpawnSubSettings - spawn: 'true' + spawn: 'false' spawnrate: '-1' exceptions: [] entryfee: @@ -311,20 +311,20 @@ worlds: autoHeal: 'true' adjustSpawn: 'true' portalForm: ALL - gameMode: SURVIVAL + gameMode: ADVENTURE 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 2f8eb98..63b0bda 100644 --- a/Server/server.properties +++ b/Server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Wed Jan 29 12:01:26 UTC 2020 +#Sun Feb 16 12:01:24 UTC 2020 spawn-protection=16 max-tick-time=60000 query.port=25565 @@ -38,10 +38,10 @@ spawn-animals=true white-list=false rcon.password= generate-structures=true -max-build-height=256 online-mode=false +max-build-height=256 level-seed=1923020019 -use-native-transport=true prevent-proxy-connections=false -enable-rcon=false +use-native-transport=true motd=Chromacraft v5 +enable-rcon=false diff --git a/ServerRunner/config.yml b/ServerRunner/config.yml index 670763f..18e8930 100644 --- a/ServerRunner/config.yml +++ b/ServerRunner/config.yml @@ -1,5 +1,4 @@ !!buttondevteam.serverrunner.Config {restartAt: 12, serverParams: -Djline.terminal=jline.UnixTerminal -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=100 -XX:+DisableExplicitGC -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=50 -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -Dusing.aikars.flags=mcflags.emc.gs - -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=64832 -Dcom.sun.management.jmxremote.local.only=false -Djava.rmi.server.hostname=67.205.165.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xms2G -Xmx5G, serverVersion: 1.14.4, customJar: paper.jar} diff --git a/Towny/settings/applyPatch.sh b/Towny/settings/applyPatch.sh old mode 100644 new mode 100755 index 32d8bb6..d282721 --- a/Towny/settings/applyPatch.sh +++ b/Towny/settings/applyPatch.sh @@ -1,2 +1,2 @@ -git apply -v -C 0 --reject TownyConfig2.patch +git apply -v -C 0 --reject TownyConfig.patch diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml old mode 100755 new mode 100644 index 07dc3ab..0a8e41d --- 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.95.2.0 + version: 0.95.2.12 # This is for showing the changelog on updates. Please do not edit. - last_run_version: 0.95.2.0 + last_run_version: 0.95.2.12 # The language file you wish to use language: english.yml @@ -682,7 +682,7 @@ protection: # PigZombie, Sheep, Skeleton, Slime, Spider, Squid, WaterMob, Wolf, Zombie # Protect living entities within a town's boundaries from being killed by players. - mob_types: Animals,WaterMob,NPC,Snowman,ArmorStand + mob_types: Animals,WaterMob,NPC,Snowman,ArmorStand,Villager # permitted Potion Types https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/potion/PotionType.html # ABSORPTION, BLINDNESS, CONFUSION, DAMAGE_RESISTANCE, FAST_DIGGING, FIRE_RESISTANCE, HARM, HEAL, HEALTH_BOOST, HUNGER, @@ -742,6 +742,10 @@ notification: outpostblock: '&b[Outpost]' forsale: '&e[For Sale: %s]' type: '&6[%s]' + # When set to true, town's names are the long form (townprefix)(name)(townpostfix) configured in the town_level section. + # When false, it is only the town name. + town_names_are_verbose: 'true' + group: '&f[%s]' # If set to true MC's Title and Subtitle feature will be used when crossing into a town. # Could be seen as intrusive/distracting, so false by default. using_titles: 'false' @@ -761,6 +765,10 @@ notification: # If the notification.owner option should show name or {title} name. # Titles are the ones granted by nation kings. owner_shows_nation_title: 'false' + # This setting only applies to servers running spigot, paper or bungeecord. + # On servers using craftbukkit.jar the notifications will always appear in the chat. + # When set to false the notifications will appear in the chat rather than the action bar. + notifications_appear_in_action_bar: 'true' @@ -1194,7 +1202,13 @@ war: costs_townblocks: 'false' # If set to true when a town drops an enemy townblock's HP to 0, the attacking town takes full control of the townblock. # One available (bonus) claim is given to the victorious town, one available (bonus) claim is removed from the losing town. + # Will not have any effect if war.event.winner_takes_ownership_of_town is set to true. winner_takes_ownership_of_townblocks: 'false' + # If set to true when a town knocks another town out of the war, the losing town will join the winning town's nation. + # The losing town will enter a conquered state and be unable to leave the nation until the conquered time has passed. + winner_takes_ownership_of_town: 'false' + # Number of Towny new days until a conquered town loses its conquered status. + conquer_time: '7' points: points_townblock: '1'