diff --git a/ButtonChat/config.yml b/ButtonChat/config.yml deleted file mode 100644 index e58c9cb..0000000 --- a/ButtonChat/config.yml +++ /dev/null @@ -1,59 +0,0 @@ -global: - notificationSound: '' -components: - TownyComponent: - enabled: true - TownColorComponent: - enabled: true - colorCount: 1 - towncolors: - violetford: - - DarkPurple - - DarkGray - aurelia: - - Gray - port_purpura: - - LightPurple - - Gold - new_cairo: - - Yellow - - Aqua - greywatch: - - DarkGray - fellreach: - - DarkPurple - knightfall: - - DarkGray - ashport: - - Yellow - marine_city: - - DarkGray - britguard: - - DarkRed - iwa: - - Aqua - redguard: - - DarkRed - - DarkRed - pyralis: - - DarkAqua - alderon: - - Gold - treavis: - - DarkGreen - forfgorne: - - DarkGray - nationcolors: - albion: DarkBlue - pressia: Aqua - aurora: Gold - expanse: Gray - FlairComponent: - enabled: true - flairThreadURL: https://www.reddit.com/r/Chromagamers/comments/51ys94/flair_thread_for_the_mc_server/ - AnnouncerComponent: - enabled: true - announceTime: 900000 - announceMessages: [] - FunComponent: - enabled: true diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index 48aec77..a6d9df3 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -5,6 +5,7 @@ groups: prefix: '[Newcomer]' rank: '100' permissions: + - thorpe.command.* - multiverse.portal.access.Plotworld - essentials.motd - movecraft.movecraft.* @@ -61,6 +62,7 @@ groups: inheritance: - default permissions: + - thorpe.command.* - jobs.maxfurnaces.19042 - jobs.maxbrewingstands.19042 - essentials.motd @@ -353,7 +355,7 @@ users: name: MC_Brendan a34194de-b4f1-4bb2-9355-76cd34e3fefb: options: - name: Ikizen + name: kzDeku group: - member f67bee95-b84f-483d-af00-c6448f742780: @@ -592,7 +594,7 @@ users: group: - member options: - name: antifloral + name: Applesaurus 102a2198-4f54-4d0a-9725-63ae6376b1ed: group: - member @@ -612,7 +614,7 @@ users: group: - member options: - name: yTobi + name: Quankerstein f23ecada-fd76-477d-80e5-d059d6fcf4a2: group: - member @@ -819,7 +821,7 @@ users: group: - member options: - name: WarpUnresulting + name: airmad 575e3ade-000a-4e89-8ef1-5967b03ec85f: group: - member @@ -839,7 +841,7 @@ users: group: - member options: - name: JustDaddy_ + name: TheFeralGirl c8f6c4a1-ff1a-4d3d-a7d5-1200df958d08: group: - member @@ -869,7 +871,7 @@ users: group: - member options: - name: Emilylikesmc + name: PersonPlayMC 47e05e6b-5443-42a4-9a06-b29ff6425ee2: group: - member @@ -955,3 +957,103 @@ users: - member options: name: Ninja_Gaiden1 + 56fb8e2d-a5e8-46af-a663-1d2894c06ab6: + group: + - member + options: + name: master_pvp15 + 7a76f6de-b318-4c1b-bd77-435d2d391234: + group: + - member + options: + name: FROOOOOOOOOOOOOG + e985a149-501f-4fc7-8fb6-e9bcd9e3d97f: + group: + - member + options: + name: Cosmic_Wendy + 84150001-e84f-443e-bdba-26b5e44c2e24: + group: + - member + options: + name: Realmion + f6496248-de57-474c-b133-c24e34e056e7: + group: + - member + options: + name: gods_of_MC + 39512899-2f6a-43f4-95f4-8818ba6d86d5: + group: + - member + options: + name: CrumblinSquirrlz + ac9d630f-aafb-4873-af7f-da657076c3a7: + group: + - member + options: + name: tanruss1 + 3bc4dec4-e83d-40c4-8bcf-449a88095942: + group: + - member + options: + name: Deoplo + a768c46d-45f3-4b9c-9b32-02c4fc427d3b: + group: + - member + options: + name: nadirmuki + 2875cece-b356-4fab-8bad-2d4e34200bc6: + group: + - member + options: + name: CookieChiken + 1486b04a-0136-4f5f-829d-be6fe456b580: + group: + - member + options: + name: CaptainRumbIy + 49d0c635-d00c-426d-a153-23ab332363dd: + group: + - member + options: + name: XanMan11 + 4e996119-6a52-4640-a136-1efcc6fc7e98: + group: + - member + options: + name: DerpyPanda27 + f6a7ae21-9297-4219-a1a3-d09f7b077226: + group: + - member + options: + name: Death599 + b867cc93-ae3d-4931-8fc9-e8cc66df24a7: + group: + - member + options: + name: faSpetru + 1e4135f6-e789-4325-8822-6ff9208c3591: + group: + - member + options: + name: meaningoflife42 + 28419b54-c225-46ba-84d6-4a3de86a583d: + group: + - member + options: + name: GodsPotion + 421195d4-1e52-410b-9516-49ac6b31bed0: + group: + - member + options: + name: MrsKawaiii + bf197c71-3725-48c9-9f33-fbf7a8583446: + group: + - member + options: + name: Dragonslayer271 + 7137de0e-f65e-46c6-acd5-675e194afec4: + group: + - member + options: + name: uzou diff --git a/Server/logsearch.sh b/Server/logsearch.sh new file mode 100755 index 0000000..d6279d1 --- /dev/null +++ b/Server/logsearch.sh @@ -0,0 +1,16 @@ +#!/bin/bash +echo "$1" +#if [[ -n "$1" ]]; then +# echo "Specify what to search for." +# exit +#fi + +shopt -s nullglob +fs=(*.gz) +#echo "${fs[@]}" +for f in "${fs[@]}" +do + echo File: $f + gunzip -c $f | grep "$1" +done + diff --git a/Thorpe-Chat/config.yml b/Thorpe-Chat/config.yml new file mode 100644 index 0000000..aa4d470 --- /dev/null +++ b/Thorpe-Chat/config.yml @@ -0,0 +1,103 @@ +global: + notificationSound: '' + notificationPitch: 1.0 +components: + TownyComponent: + enabled: true + TownColorComponent: + enabled: true + colorCount: 1 + towncolors: + violetford: + - DarkPurple + - DarkGray + aurelia: + - Gray + port_purpura: + - LightPurple + - Gold + greywatch: + - DarkGray + fellreach: + - DarkPurple + knightfall: + - DarkGray + ashport: + - Yellow + marine_city: + - DarkGray + britguard: + - DarkRed + iwa: + - Aqua + vordan: + - Yellow + redguard: + - DarkRed + - DarkRed + pyralis: + - DarkAqua + alderon: + - Gold + treavis: + - DarkGreen + forfgorne: + - DarkGray + nationcolors: + albion: DarkBlue + pressia: Aqua + aurora: Gold + expanse: DarkGreen + useNationColors: true + FlairComponent: + enabled: true + flairThreadURL: https://www.reddit.com/r/Chromagamers/comments/51ys94/flair_thread_for_the_mc_server/ + AnnouncerComponent: + enabled: true + announceTime: 900000 + announceMessages: [] + FunComponent: + enabled: true + unlol: true + laughStrings: + - xd + - lel + - lawl + - kek + - lmao + - hue + - hah + - rofl + respect: true + AppendTextComponent: + enabled: true + texts: + ww: + helpText: + - §6---- Wait what ---- + - Wait what + appendedText: wait what + lenny: + helpText: + - §6---- Lenny ---- + - This command appends a Lenny face after your message + - Or just sends one + appendedText: ( ͡° ͜ʖ ͡°) + unflip: + helpText: + - §6---- Unflip ---- + - This command appends an unflip after your message + - Or just unflips as you + appendedText: ┬─┬ ノ( ゜-゜ノ) + tableflip: + helpText: + - §6---- Tableflip ---- + - This command appends a tableflip after your message + - Or just makes you tableflip + appendedText: (╯°□°)╯︵ ┻━┻ + shrug: + helpText: + - §6---- Shrug ---- + - This command appends a shrug after your message + - Or just makes you shrug + appendedText: ¯\\\_(ツ)\_/¯ diff --git a/ThorpeCore/config.yml b/ThorpeCore/config.yml index 686a2ff..8107a44 100644 --- a/ThorpeCore/config.yml +++ b/ThorpeCore/config.yml @@ -1,6 +1,8 @@ test: false global: writePluginList: true + test: false + chatFormat: '[{origin}|{channel}] <{name}> {message}' components: PluginUpdaterComponent: enabled: true @@ -46,6 +48,8 @@ components: tc: enabled: true IDs: [] + displayName: §3TC§f + color: DarkAqua nc: enabled: true IDs: [] @@ -54,10 +58,17 @@ components: rp: enabled: true IDs: [] + displayName: §7RP§f + color: Gray RandomTPComponent: enabled: true MemberComponent: enabled: true memberGroup: member + registeredForDays: 7 + playedHours: 12 TownyComponent: enabled: true + VotifierComponent: + enabled: true + rewardAmount: 0.0 diff --git a/dynmap/worlds.txt b/dynmap/worlds.txt index ed57780..6bc7228 100755 --- a/dynmap/worlds.txt +++ b/dynmap/worlds.txt @@ -1,154 +1,73 @@ -# These are examples of world-specific settings - customize your content as you see fit -# -# NOTES: -# All lines here are commented with the # symbol - delete the # symbol on copied lines you wish to enable -# Definitions of a world made here will superecede any world definition with the same name in configuration.txt -# Deleting this file will result in a fresh copy being produced by dynmap.jar on the next startup. -# -#worlds: - # Worlds can be handled by templates, based on world type - # You can override the properties of the template by specifying them in this section - # for example 'Title: "My Awesome World"' - #- name: world - # title: "World" - # Use 'enabled: false' to disable a certain world. - # enabled: false - # Use sendposition: false to prevent player positions from showing when on this world (if sendposition is globally enabled) - # sendposition: false - # Use sendhealth: false ot prevent player health from showing when on this world (if sendhealth is globally enabled) - # sendhealth: false - # # If world isn't contiguous chunks (due to teleporting, for example), fullrender needs to be given other locations to scan for tiles on each patch of chunks - # fullrenderlocations: - # - x: 10000 - # y: 64 - # z: 20000 - # - x: -15000 - # y: 64 - # z: -5000 - # # Use visibilitylimits to restrict which areas of maps on your world to render (zero or more shapes can be defined) - # # For a rectangle, the area is defined by x0, z0 to x1, z1 - # # For a circle, the area is defined by a center at x,z with a radius 'r' - # visibilitylimits: - # - x0: -1000 - # z0: -1000 - # x1: 1000 - # z1: 1000 - # - x: -2000 - # z: -1000 - # r: 200 - # # Use hiddenlimits to specifically hide portions of your world (the opposite of visibilitylimits) - # # For a rectangle, the area is defined by x0, z0 to x1, z1 - # # For a circle, the area is defined by a center at x,z with a radius 'r' - # hiddenlimits: - # - x0: 100 - # z0: 0 - # x1: 200 - # z1: 0 - # - x: -2000 - # z: -1000 - # r: 200 - # # Use hidestyle to control how hidden-but-existing chunks are to be rendered (air=empty air (same as ungenerated), stone=a flat stone plain, ocean=a flat ocean) - # hidestyle: stone - # Use 'template: mycustomtemplate' to use the properties specified in the template 'mycustomtemplate' to this world. Default it is set to the environment-name (normal or nether). - # template: mycustomtemplate - # Rest of comes from template - uncomment to tailor for world specifically - # # World center - default is spawn point - # center: - # x: 0 - # y: 64 - # z: 0 - # # If bigworld set to true, use alternate directory layout better suited to large worlds - # bigworld: true - # # Number of extra zoom-out levels for world (each level is twice as big as the previous one) - # extrazoomout: 3 - # # Default delay on processing of updated tiles, in seconds. This can reduce potentially expensive re-rendering - # # of frequently updated tiles (such as due to machines, pistons, quarries or other automation). Value can also be set on - # # individual maps. - # tileupdatedelay: 30 - # maps: - # - class: org.dynmap.hdmap.HDMap - # name: flat - # title: "Flat" - # prefix: flat - # perspective: iso_S_90_lowres - # shader: stdtexture - # lighting: shadows - # mapzoomin: 1 - # - class: org.dynmap.hdmap.HDMap - # name: surface - # title: "Surface" - # prefix: t - # perspective: iso_SE_30_hires - # shader: stdtexture - # lighting: shadows - # mapzoomin: 1 - # - class: org.dynmap.hdmap.HDMap - # name: cave - # title: "Cave" - # prefix: ct - # perspective: iso_SE_60_lowres - # shader: cave - # lighting: default - # mapzoomin: 3 - # - # To just label world, and inherit rest from template, just provide name and title - #- name: world2 - # title: "Second World" - # - #- name: nether - # title: "Nether" - # center: - # x: 0 - # y: 64 - # z: 0 - # # Number of extra zoom-out levels for world (each level is twice as big as the previous one) - # extrazoomout: 3 - # maps: - # - class: org.dynmap.hdmap.HDMap - # name: flat - # title: "Flat" - # prefix: flat - # perspective: iso_S_90_lowres - # shader: stdtexture - # lighting: nethershadows - # # Map background color (day or night) - # background: "#300806" - # mapzoomin: 1 - # - class: org.dynmap.hdmap.HDMap - # name: nether - # title: "Surface" - # prefix: nt - # perspective: iso_SE_30_hires - # shader: stdtexture - # lighting: nethershadows - # # Map background color (day or night) - # background: "#300806" - # mapzoomin: 1 - worlds: - - name: world +- name: world + title: world enabled: true - template: normal-vlowres #Disabled by default - + extrazoomout: 2 + maps: + - class: org.dynmap.hdmap.HDMap + name: flat + title: Flat + prefix: flat + perspective: iso_S_90_vlowres + shader: stdtexture + lighting: shadows + mapzoomin: 2 + template: normal-vlowres hiddenlimits: - - x0: 430 + - x0: 430 z0: 2850 x1: 600 z1: 3000 hidestyle: stone - extrazoomout: 2 bigworld: true - - - name: plotworld +- name: plotworld + title: plotworld enabled: true - template: normal-vlowres #Disabled by default - - - name: luna + extrazoomout: 2 + maps: + - class: org.dynmap.hdmap.HDMap + name: flat + title: Flat + prefix: flat + perspective: iso_S_90_vlowres + shader: stdtexture + lighting: shadows + mapzoomin: 2 + template: normal-vlowres +- name: luna + title: luna enabled: true - template: normal-vlowres #Disabled by default + extrazoomout: 2 + maps: + - class: org.dynmap.hdmap.HDMap + name: flat + title: Flat + prefix: flat + perspective: iso_S_90_vlowres + shader: stdtexture + lighting: shadows + mapzoomin: 2 + template: normal-vlowres visibilitylimits: - - x: -60 - z: 40 - r: 250 + - x: -60 + z: 40 + r: 250 mapzoomin: 3 hidestyle: air +- name: world_nether + title: world_nether +- name: world_the_end + title: world_the_end +- name: Dungeons + title: Dungeons +- name: BACKUP_world + title: BACKUP_world +- name: test + title: test +- name: flatworld + title: flatworld +- name: OldRegionFiles + title: OldRegionFiles +- name: DXL_Game_0 + title: DXL_Game_0 + enabled: false