staff -> admins

* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias) * format almost every file correctly * a few other improvements
2025-06-28 19:26:42 +00:00 · 2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@ -19,7 +19,7 @@ server:
  # MOTD Modification
  motds:
    ban: '&cYou are banned.'
-    staffmode: '&cServer is closed.'
+    adminmode: '&cServer is closed.'
    lockdown: '&cServer is in lock-down.'
    whitelist: '&cWhitelist enabled.'
    full: '&cServer is full.'
@ -34,10 +34,10 @@ server:
    - Wild1145

  # All players who show up as executive
-  executives: []
+  executives: [ ]

  # All those who can manage the master builder list
-  master_builder_management: []
+  master_builder_management: [ ]

  # URL players should appeal for bans at
  ban_url: ''
@ -115,7 +115,7 @@ ptero:
  admin_key: ''
  # Server API key
  server_key: ''
-  
+
 # The shop
 shop:
  # Enable the shop
@ -123,7 +123,7 @@ shop:

  # Shop title
  title: '&e&lTotalFreedom Shop'
-  
+
  # Shop prefix
  prefix: '&8[&eTF Shop&8]'

@ -177,16 +177,16 @@ shop:
    clown_fish: 1500
    login_messages: 5000

-# Staff list
-stafflist:
+# Admin list
+adminlist:

-  # The amount of hours after which staff may be removed from the admin list
+  # The amount of hours after which admins may be removed from the admin list
  clean_threshold_hours: 167

  # Give the default CONSOLE admin privileges.
  # Handy in development environments.
  console_is_admin: true
-  
+
 # CoreProtect
 coreprotect:
  enabled: false
@ -250,9 +250,8 @@ allow:
 # * The first section is a letter which indicates which rank may use this command
 #   Valid ranks:
 #   n - Nobody (Completely disabled)
-#   c - Trial Mods (Console)
-#   m - Admins (Console)
-#   s - Staff (Any in-game admin)
+#   a - Admins (Console)
+#   s - Senior Admins (Console)
 #   o - Ops (Non-Ops won't be able to use it)
 #
 # * The second section is a letter which indicates what to do when a player executes that command.
@ -264,8 +263,8 @@ allow:
 # * The third section is the command to be blocked, prefixed with a slash
 #
 # * The fourth section is the message to send to the player when executing that command.
-#   This should be ommited if unwanted. ChatColors are supported with the &-key. By default
-#   -the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message
+#   This should be omitted if unwanted. ChatColors are supported with the &-key. By default
+#   the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message
 #   by using a single underscore.
 #
 # Examples:
@ -299,46 +298,46 @@ blocked_commands:
  - 'n:b:/bossbar:_'
  - 'n:b://forceload:_'

-  # Staff commands
-  - 's:b:/save-all:_'
-  - 's:b:/kick:_'
-  - 's:b:/socialspy:_'
-  - 's:b:/replaceitem:_'
-  - 's:b:/kill:_'
-  - 's:b://generate:_'
-  - 's:b://:_'
-  - 's:b:/superpickaxe:_'
-  - 's:b:/brush:_'
-  - 's:b:/size:_'
-  - 's:b://mask:_'
-  - 's:b:/mat:_'
-  - 's:b://butcher:_'
-  - 's:b:/scoreboard:_'
-  - 's:b:/setspawn:_'
-  - 's:b://snow:_'
-  - 's:b:/tellraw:_'
-  - 's:b:/forestgen:_'
-  - 's:b:/setidletimeout:_'
-  - 's:b:/mail sendall:_'
-  - 's:b:/eco reset:_'
-  - 's:b:/mask:_'
-  - 's:b:/gmask:_'
-  - 's:b:/lrbuild:_'
-  - 's:b:/defaultgamemode:_'
-  - 's:b:/reload:_'
-  - 's:b:/title:_'
-  - 's:b:/worldborder:_'
-  - 's:b:/weather:_'
-  - 's:b:/tpall:_'
-  - 's:b:/setblock:_'
-  - 's:b:/green:_'
-  - 's:b:/gamerule:_'
-  - 's:b:/togglejail:_'
-  - 's:b:/fill:_'
-  - 's:b:/flood:_'
-  - 's:b:/team:_'
-  - 's:b:/loot:_'
-  - 's:b:/schedule:_'
+  # Admin commands
+  - 'a:b:/save-all:_'
+  - 'a:b:/kick:_'
+  - 'a:b:/socialspy:_'
+  - 'a:b:/replaceitem:_'
+  - 'a:b:/kill:_'
+  - 'a:b://generate:_'
+  - 'a:b://:_'
+  - 'a:b:/superpickaxe:_'
+  - 'a:b:/brush:_'
+  - 'a:b:/size:_'
+  - 'a:b://mask:_'
+  - 'a:b:/mat:_'
+  - 'a:b://butcher:_'
+  - 'a:b:/scoreboard:_'
+  - 'a:b:/setspawn:_'
+  - 'a:b://snow:_'
+  - 'a:b:/tellraw:_'
+  - 'a:b:/forestgen:_'
+  - 'a:b:/setidletimeout:_'
+  - 'a:b:/mail sendall:_'
+  - 'a:b:/eco reset:_'
+  - 'a:b:/mask:_'
+  - 'a:b:/gmask:_'
+  - 'a:b:/lrbuild:_'
+  - 'a:b:/defaultgamemode:_'
+  - 'a:b:/reload:_'
+  - 'a:b:/title:_'
+  - 'a:b:/worldborder:_'
+  - 'a:b:/weather:_'
+  - 'a:b:/tpall:_'
+  - 'a:b:/setblock:_'
+  - 'a:b:/green:_'
+  - 'a:b:/gamerule:_'
+  - 'a:b:/togglejail:_'
+  - 'a:b:/fill:_'
+  - 'a:b:/flood:_'
+  - 'a:b:/team:_'
+  - 'a:b:/loot:_'
+  - 'a:b:/schedule:_'

 # Automatically wipe dropped objects
 auto_wipe: true
@ -386,7 +385,7 @@ flatlands:
  generate_params: 16,stone,32,dirt,1,grass_block

 # Admin-Only Mode
-staff_only_mode: false
+admin_only_mode: false

 # Toggle Chat
 toggle_chat: true
@ -408,36 +407,36 @@ announcer:
  prefix: '&5[&eTotalFreedom&5] &b'

  announcements:
-  - 'Be sure to visit our forums at &6https://forum.totalfreedom.me/'
-  - 'If you are not OP, be sure to ask!'
-  - 'Somebody breaking the rules? Report it! /report <user> <reason>'
-  - 'Griefing is not allowed!'
-  - 'Hacked clients are allowed!'
-  - 'Interested in becoming admin? Type "/ai" for more information!'
-  - 'You may view all online administrators via "/list -s"'
-  - 'Save your buildings via WorldEdit! http://totalfreedom.me for more information!'
-  - 'You may contact TotalFreedom support on Twitter! https://tiny.re/tfsupport'
-  - 'You may download TotalFreedomMod here: https://tiny.re/tfm+'
-  - 'Wild1145 is the owner of TotalFreedom.'
-  - 'markbyron is the founder of TotalFreedom.'
-  - 'Server lagging? Check the lag via "/tps"'
-  - 'You are allowed to record and stream videos on TotalFreedom.'
-  - 'Player vs player while in creative or god mode is forbidden!'
-  - 'Spawn killing is forbidden!'
-  - 'Invisible potions are allowed!'
-  - 'Serial griefing and trolling will result in an indefinite ban!'
-  - 'Racism, nazism, and sexism are strictly forbidden!'
-  - 'Join our Discord server! Link: https://discord.com/invite/PW4savJR9a'
+    - 'Be sure to visit our forums at &6https://forum.totalfreedom.me/'
+    - 'If you are not OP, be sure to ask!'
+    - 'Somebody breaking the rules? Report it! /report <user> <reason>'
+    - 'Griefing is not allowed!'
+    - 'Hacked clients are allowed!'
+    - 'Interested in becoming admin? Type "/ai" for more information!'
+    - 'You may view all online administrators via "/list -s"'
+    - 'Save your buildings via WorldEdit! http://totalfreedom.me for more information!'
+    - 'You may contact TotalFreedom support on Twitter! https://tiny.re/tfsupport'
+    - 'You may download TotalFreedomMod here: https://tiny.re/tfm+'
+    - 'Wild1145 is the owner of TotalFreedom.'
+    - 'markbyron is the founder of TotalFreedom.'
+    - 'Server lagging? Check the lag via "/tps"'
+    - 'You are allowed to record and stream videos on TotalFreedom.'
+    - 'Player vs player while in creative or god mode is forbidden!'
+    - 'Spawn killing is forbidden!'
+    - 'Invisible potions are allowed!'
+    - 'Serial griefing and trolling will result in an indefinite ban!'
+    - 'Racism, nazism, and sexism are strictly forbidden!'
+    - 'Join our Discord server! Link: https://discord.com/invite/PW4savJR9a'

-# What to display in the staffinfo command.
-staffinfo:
-  - '&bHow to apply for staff on the TotalFreedom Server:'
-  - ' &6- Do not ask for staff in game'
+# What to display in the admininfo command.
+admininfo:
+  - '&bHow to apply for admin on the TotalFreedom Server:'
+  - ' &6- Do not ask for admin in game'
  - ' &2- Be helpful within the server'
  - ' &6- Report those breaking the rules'
  - ' &2- And apply on our forums at the link:'
  - '    &9https://forum.totalfreedom.me/'
-  
+
 # What to display in the vote command.
 votinginfo:
  - '&bVoting Links:'
@ -526,9 +525,9 @@ autokick:

  # Time, in seconds, after which a player should be kicked when inactive
  time: 120
-  
+
 # Blocked Chat Codes - Use &code,&code2,&code3 (No spaces)
 blocked_chatcodes: '&0,&k,&m,&n'

 # Enables certain things like debug logs and console bypasses
-developer_mode: false
+developer_mode: false
--- a/src/main/resources/permissions.yml
+++ b/src/main/resources/permissions.yml
@ -1,10 +1,10 @@
 #
-# TotalFreedomMod 5.5 Permissions
+# TotalFreedomMod Permissions
 # by ZeroEpoch1969
 #

 # Note that every group inherits the previous groups' permissions
-# Meaning Telnet Admins have the permissions of Operators and Super Admins, and etc
+# Meaning Senior Admins have the permissions of Operators and Admins, and etc

 # This is used to remove all permission begging with the root node
 # This is useful when a plugin gives all permissions to a player because they are opped