SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Merge pull request #134 from ImCarib/1.6.x"

Browse Source 
This reverts commit 0b677cb4de, reversing
changes made to a355b1d0c8.
This commit is contained in:
DroppingAnvil
2020-06-08 15:52:29 -04:00
parent 7b94367eb4
commit cdc07ed5eb
43 changed files with 2322 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
src/main/resources/config.yml
View File

@@ -422,6 +422,7 @@ help:
# 2nd: The Action GUI, here you define the permission of the clicked Action using click types,
# depending on the click type it will set the permission differently:
# Left Click: ALLOW
# Middle Click: UNDEFINED
# Right Click: DENY
#
#
@@ -433,14 +434,10 @@ help:
# indicating the current relation (Uses relation item placeholder)
# 2nd: Dummy items, these items server no other purpose than to look good, they have their own
# items defined in dummy items, and can later be assigned to specific slots in the GUI's
# If you would like to set default permissions in the /f perms gui find the option 'useDefaultPermissions' in conf.json.
# This can be useful if you would like to create
# A template for factions in your server to have for /f perms.
fperm-gui:
relation:
# GUI Name
name: '&7Faction Permissions'
name: '&8&lFaction Permissions'
# Amount of inventory rows, No larger than 5
rows: 4
# These are the slots where the relations are going to be placed on the first GUI
@@ -466,13 +463,14 @@ fperm-gui:
enemy: DIAMOND_AXE
neutral: WOOD_AXE
Placeholder-Item:
Name: '&cClick to edit {relation} permissions!'
Name: '&c{relation}&f permissions!'
action:
name: 'Faction Permissions'
rows: 6
Access-Colors:
Allow: '&a'
Deny: '&c'
Undefined: '&7'
Materials:
build: COBBLESTONE
destroy: DIAMOND_PICKAXE
@@ -502,7 +500,6 @@ fperm-gui:
check: WATCH
drain: BUCKET
spawner: MOB_SPAWNER
shield: DIAMOND_CHESTPLATE
home: ENDER_EYE
slots:
# Uses same format as above to inform the player of clicked relation
@@ -538,19 +535,19 @@ fperm-gui:
check: 50
spawner: 38
drain: 49
shield: 51
home: 48
# {action} Action name eg: Setwarp, Kick
# {action-access} Access name eg: Allow, Deny
# {action-access-color} Access color eg: Allow;GREEN
placeholder-item:
name: '&e&l(!) &ePermission: &6&n{action}'
name: '&c&lPermission to {action}'
lore:
- ''
- '&6&l * &eStatus: &8[{action-access-color}{action-access}&8]'
- '&4&l* &cStatus: &f{action-access-color}{action-access}'
- ''
- '&7Left click to &a&nAllow&7.'
- '&7Right click to &c&nDeny&7.'
- '&2&l* &aLeft click to &a&lAllow&a.'
- '&4&l* &cRight click to &c&lDeny&c.'
- '&8&l* &7Middle click to &7&lUndefine&7.'
# Back item will be take you to the previous GUI
back-item:
Type: ARROW
@@ -563,6 +560,7 @@ fperm-gui:
Name: ' '
Lore:
- ' '
############################################################
# +------------------------------------------------------+ #
# | Faction Warp GUI | #
@@ -1434,112 +1432,6 @@ Tntfill:
############################################################
# +------------------------------------------------------+ #
# | Faction Shields | #
# +------------------------------------------------------+ #
############################################################
Shields:
Frame:
Main-Menu:
Title: '&c&lShield'
Frame-Type:
Barrier:
Type: BARRIER
Name: ' '
Lore:
- ' '
Slots:
- 24
- 25
- 26
Info-Item:
Type: PAPER
Display-Name: '&e&lShield Information'
Lore:
- '&fDuring Shielded Times, a faction cannot'
- '&fbe raided by cannons/explosions.'
- ''
- '&fChanging the Shield window'
- '&ftakes &e1 day &fto update.'
- ''
- '&cAbuse of this mechanic in any way will be'
- '&cpunished severely!'
NoShield-Pending:
Type: CLOCK
Display-Name: '&e&lPending Shield Change'
Lore:
- ' '
- '&cThere is no pending change to'
- '&cyour faction''s Shield window.'
Shield-Pending:
Type: CLOCK
Display-Name: '&e&lPending Shield Change'
Lore:
- ' '
- '&fYour faction is currently awaiting a shield change!'
- '&fYour shield will be updated in:'
- ' '
- '&a{remaining-time} &fto &a&l{new-start} &f&m--->&a&l {new-end}'
Current-Frame:
Type: GREEN_STAINED_GLASS_PANE
Display-Name: ' '
Lore:
- ' '
- ' &aYour shield hours are currently'
- ' '
- ' &e&l{start-time} &f&m--->&e&l {end-time}'
- ' &eTotal Time: &f12 Hours.'
- ' '
- ' &7( Current Time: {time-currently} )'
New-Frame:
Type: ORANGE_STAINED_GLASS_PANE
Display-Name: ' '
Lore:
- ' '
- ' &fYour factions shielded window is'
- ' &fcurrently set to change in &e{remaining-time} &fto'
- ' '
- ' &e&l{start-time} &f&m--->&e&l {end-time}'
- ' &eTotal Time: &f12 Hours.'
- ' '
- ' &7( Current Time: {time-currently} )'
Regular-Frame:
Type: RED_STAINED_GLASS_PANE
Display-Name: ' '
Lore:
- ' '
- ' &aClick to change the shield window to'
- ' '
- ' &e&l{start-time} &f&m--->&e&l {end-time}'
- ' &eTotal Time: &f12 Hours.'
- ' '
- ' &7( Current Time: {time-currently} )'
Change:
Size: 3
Title: '&e&lShield Confirmation'
Items:
Accept:
Type: GREEN_STAINED_GLASS_PANE
Display-Name: '&a&lConfirm Shield Change'
Lore:
- ' '
Deny:
Type: RED_STAINED_GLASS_PANE
Display-Name: '&c&lCancel Shield Change'
Lore:
- ' '
Info:
Type: CLOCK
Display-Name: ' '
Lore:
- ' '
- ' &aClick confirm to change your shield to'
- ' &e&l{start-time} &f&m--->&e&l {end-time}'
- ' &eTotal Time: 12 Hours.'
- ' '
- ' &7( Current Time: {current-time} )'
- ' &7( Change takes 24 hours to apply! )'
############################################################
# +------------------------------------------------------+ #
# | Faction Wild | #
# +------------------------------------------------------+ #
############################################################
@@ -1556,51 +1448,51 @@ Wild:
FillMaterial: BLACK_STAINED_GLASS_PANE
Zones:
# You may create your own zones here please just follow the original format #
Close:
World: world
Range:
MinX: -200
MaxX: 200
MinZ: -200
MaxZ: 200
Cost: 5000
Material: IRON_INGOT
Lore:
- '&eTeleport to a random location close by'
- '&e X &b-200 &f- &b200 &eZ &b-200 &f- &b200'
- '&2&l&o$5000'
Name: '&cLow Range'
Slot: 1
Medium:
World: world
Range:
MinX: -400
MaxX: 400
MinZ: -400
MaxZ: 400
Cost: 10000
Material: GOLD_INGOT
Lore:
- '&eTeleport to a random location in a medium proximity'
- '&e X &b-400 &f- &b400 &eZ &b-400 &f- &b400'
- '&2&l&o$10000'
Name: '&cMedium Range'
Slot: 4
Far:
World: world
Range:
MinX: -800
MaxX: 800
MinZ: -800
MaxZ: 800
Cost: 15000
Material: DIAMOND
Lore:
- '&eTeleport to a random location far away'
- '&e X &b-800 &f- &b800 &eZ &b-800 &f- &b800'
- '&2&l&o$15000'
Name: '&cHigh Range'
Slot: 7
Close:
World: world
Range:
MinX: -200
MaxX: 200
MinZ: -200
MaxZ: 200
Cost: 5000
Material: IRON_INGOT
Lore:
- '&eTeleport to a random location close by'
- '&e X &b-200 &f- &b200 &eZ &b-200 &f- &b200'
- '&2&l&o$5000'
Name: '&cLow Range'
Slot: 1
Medium:
World: world
Range:
MinX: -400
MaxX: 400
MinZ: -400
MaxZ: 400
Cost: 10000
Material: GOLD_INGOT
Lore:
- '&eTeleport to a random location in a medium proximity'
- '&e X &b-400 &f- &b400 &eZ &b-400 &f- &b400'
- '&2&l&o$10000'
Name: '&cMedium Range'
Slot: 4
Far:
World: world
Range:
MinX: -800
MaxX: 800
MinZ: -800
MaxZ: 800
Cost: 15000
Material: DIAMOND
Lore:
- '&eTeleport to a random location far away'
- '&e X &b-800 &f- &b800 &eZ &b-800 &f- &b800'
- '&2&l&o$15000'
Name: '&cHigh Range'
Slot: 7
# Settings that change how a player arrives to their random location #
Arrival:
# if FallDamage is false and the player is about to take fall damage while in the FallDamageWindow it will be denied #