Upstream/AreaShop
1
0
Fork 0
mirror of https://github.com/NLthijs48/AreaShop.git synced 2024-11-26 12:16:29 +01:00
Code Issues Projects Releases Wiki Activity

Adds all function from version 2.0.0

Browse Source
This commit is contained in:
Thijs Wiefferink 2014-08-28 11:45:36 +02:00
parent 63e8f10e20
commit b3ea7f7e73
46 changed files with 3649 additions and 1517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
AreaShop/config.yml
View File

@ -16,31 +16,165 @@ moneyCharacterAfter: ''
debug: false debug: false
## The .yml language file that should be used, provided by this plugin: EN, NL ## The .yml language file that should be used, provided by this plugin: EN, NL
language: EN language: EN
## Maximum total amount of rents and buys together
maximumTotal: 1
## Enable Schematic saving and restoring in general ## Enable Schematic saving and restoring in general
enableSchematics: true enableSchematics: true
## Maximum number of blocks to save to or restore from a .schemetic ## Maximum number of blocks to save to or restore from a .schemetic
maximumBlocks: 1000000 maximumBlocks: 1000000
## Enable sending stats to http://mcstats.org/ (Metrics plugin) ## Enable sending stats to http://mcstats.org/ (Metrics plugin)
sendStats: true sendStats: true
## Use colors when sending messages to console and log files
useColorsInConsole: false
## Post error messages in the console when a command run from the config fails (from the 'runCommands' section for example)
postCommandErrors: true
## Version of the config, do not change! ## Version of the config, do not change!
version: 1.3.0 version: 2.0.0
## The y location within the region to start searching for safe teleport spots (x and z will be in the middle of the region) ## The y location within the region to start searching for safe teleport spots (x and z will be in the middle of the region)
## Possible values: bottom, middle, top ## Possible values: bottom, middle, top
teleportLocationY: bottom teleportLocationY: bottom
## The different tags you can write on the sign to trigger the plugin
signTags:
## Tag for adding a rent region
rent: '[rent]'
## Tag for adding a buy region
buy: '[buy]'
## Tag for adding a sign to an existing region
add: '[as]'
## Configure the max total regions, max rent regions and max buy regions with different groups (-1 is unlimited)
## Assign a group to players by giving them the permission 'areashop.limits.<group>'
## Every player already has the group 'default' and ops have the unlimited group
## If a player has multiple groups the highest numbers are used
limitGroups:
default:
total: 1
rents: 1
buys: 1
unlimited:
total: -1
rents: -1
buys: -1
## Below are profiles for the signs, you can assign profiles to regions
## by setting 'general.signProfile' in default.yml, groups or individual regions
signProfiles:
default:
## Below is the format for each sign state, the following tags can be used for signs and commands:
## %region%, %player%, %uuid%, %price%, %duration%, %world%, %type%, %until%, %untilshort%
## The following sections can be added for performing certain commands when the sign is clicked:
## rightClickPlayer, rightClickConsole, shiftRightClickPlayer, shiftRightClickConsole,
## leftClickPlayer, leftClickConsole, shiftLeftClickPlayer, shiftLeftClickConsole
## Sections with 'Player' at the end will be run by the clicking player and 'Console' ones from the console
forrent:
line1: '&2&l[For Rent]'
line2: '%region%'
line3: '%duration%'
line4: '%price%'
rightClickPlayer:
- 'as rent %region%'
leftClickPlayer:
- 'as info region %region%'
rented:
line1: '&4&l[Rented]'
line2: '%region%'
line3: '%player%'
line4: '%untilshort%'
rightClickPlayer:
- 'as rent %region%'
leftClickPlayer:
- 'as info region %region%'
shiftRightClickPlayer:
- 'as unrent %region%'
forsale:
line1: '&2&l[For Sale]'
line2: '%region%'
line3: '%price%'
line4:
rightClickPlayer:
- 'as buy %region%'
leftClickPlayer:
- 'as info region %region%'
sold:
line1: '&4&l[Sold]'
line2: '%region%'
line3: '%player%'
line4:
rightClickPlayer:
- 'as buy %region%'
leftClickPlayer:
- 'as info region %region%'
shiftRightClickPlayer:
- 'as sell %region%'
## Option to run certain commands when one of these events happen
## Commands at a 'before' section will execute before the region details are changed in the AreaShop system
## and before any other actions occurred (changing signs, saving/loading schematics, etc.),
## the 'after' commands will be run when all changes are done.
## After 'before' or 'after' you can create a list of commands (see example at the created event)
eventCommandProfiles:
default:
created:
before:
after:
## - "say An AreaShop region has been created: %region%"
deleted:
before:
after:
rented:
before:
after:
extended:
before:
after:
unrented:
before:
after:
bought:
before:
after:
sold:
before:
after:
## For the following events you can specify if you want to restore or save the region to a schematic
## After 'save:' or 'restore:' you enter the name of the file, %region% will be replaced by the region name (.schematic will be added automatically)
## %type% represents the type of the region, could be 'rent' or 'buy'
## If your regions are all the same size you could use just 1 file as the restore file, just enter a name without %region%
## Be carefull with these options, it could crash your server or destroy (parts of) your world if used wrong!
schematicProfiles:
default:
created:
save: '%type%-%region%'
restore: ''
deleted:
save: ''
restore: '%type%-%region%'
rented:
save: ''
restore: ''
unrented:
save: ''
restore: '%type%-%region%'
bought:
save: ''
restore: ''
sold:
save: ''
restore: '%type%-%region%'
## Flag profiles to specify what flags should be set on the WorldGuard regions
## All region flags can be used + members, owners, priority and parent.
flagProfiles:
default:
forrent:
members: -%player%
greeting: '&2[AreaShop]&f %region% can be rented for %price% per %duration%'
rented:
members: +%player%
greeting: '&2[AreaShop]&f %region% is rented by %player% until %until%'
forsale:
members: -%player%
greeting: '&2[AreaShop]&f %region% can be bought for %price%'
sold:
members: +%player%
greeting: '&2[AreaShop]&f %region% is bought by %player%'
########## RENTING ########## ########## RENTING ##########
## The tag you have to write on the sign for renting a region
rentSign: '[rent]'
## The line that should be placed on the sign when the region is not rented
signRentable: '&2&l[For Rent]'
## The line that should be placed on the sign when the region is rented
signRented: '&4&l[Rented]'
## How much regions a player can rent at the same time, -1 for not limited
maximumRents: 1
## The percentage of the renting price you get back if you unrent the region (price of time left will be multiplied by this/100)
rentMoneyBack: 100
## How much seconds between checking if renting has expired (don't put this to low) ## How much seconds between checking if renting has expired (don't put this to low)
checkDelay: 60 checkDelay: 60
## Timeformat to use on the signs, default is like '30-06 14:52', US format: 'MM-dd KK:mm a' ## Timeformat to use on the signs, default is like '30-06 14:52', US format: 'MM-dd KK:mm a'
@ -56,78 +190,5 @@ hours: [h, hour, hours, uur, uren]
days: [d, day, days, dag, dagen] days: [d, day, days, dag, dagen]
months: [M, month, months, maanden, maand] months: [M, month, months, maanden, maand]
years: [y, year, years, jaar, jaren] years: [y, year, years, jaar, jaren]
## Flags for the 'For Rent' regions, flags and options to apply when the region is not rented
## All region flags can be used + members, owners, priority and parent.
flagsForRent:
members: -%player%
greeting: '%region% can be rented for %price% per %duration%'
## Flags for the 'Rented' regions, flags and options to apply when the region is rented
## All region flags can be used + members, owners, priority and parent.
flagsRented:
members: +%player%
greeting: '%region% is rented by %player% until %until%'
## Enable or disable saving and restoring for rents that don't have their individual option set
useRentRestore: false
## For the following events you can specify if you want to restore or save the region to a schematic
## After 'save:' or 'restore:' you enter the name of the file, %region% will be replaced by the region name (.schematic will be added automatically)
## If your regions are all the same size you could use just 1 file as the restore file, just enter a name without %region%
## Be carefull with these options, it could crash your server or destroy (parts of) your world if used wrong!
rentSchematicProfiles:
default:
created:
save: 'rent-%region%'
restore: ''
deleted:
save: ''
restore: 'rent-%region%'
rented:
save: ''
restore: ''
unrented:
save: ''
restore: 'rent-%region%'
########## BUYING ##########
## The tag you have to write on the sign for renting a region
buySign: '[buy]'
## The line that should be placed on the sign when the region is not sold
signBuyable: '&2&l[For Sale]'
## The line that should be placed on the sign when the region is sold
signBuyed: '&4&l[Sold]'
## How much regions a player can buy at the same time, -1 for not limited
maximumBuys: 1
## The percentage of the buying price you get back if you sell the region
buyMoneyBack: 100
## Flags for the 'For Sale' regions, flags and options to apply when the region is for sale
## All region flags can be used + members, owners, priority and parent.
flagsForSale:
members: -%player%
greeting: '%region% can be bought for %price%'
## Flags for the 'Sold' regions, flags and options to apply when the region is rented
## All region flags can be used + members, owners, priority and parent.
flagsSold:
members: +%player%
greeting: '%region% is bought by %player%'
## Enable or disable saving and restoring for buys that don't have their individual option set
useBuyRestore: false
## For the following events you can specify if you want to restore or save the region to a schematic
## After 'save:' or 'restore:' you enter the name of the file, %region% will be replaced by the region name (.schematic will be added automatically)
## If your regions are all the same size you could use just 1 file as the restore file, just enter a name without %region%
## Be carefull with these options, it could crash your server or destroy (parts of) your world if used wrong!
## ('bought' and 'sold' are from the players perspective)
buySchematicProfiles:
default:
created:
save: 'buy-%region%'
restore: ''
deleted:
save: ''
restore: 'buy-%region%'
bought:
save: ''
restore: ''
sold:
save: ''
restore: 'buy-%region%'

59
AreaShop/default.yml
View File

@ -1,17 +1,56 @@
### All settings below are default settings and can be overridden
### by group settings or region settings (copy a section to a region or group and change them there)
########## GENERAL ########## ########## GENERAL ##########
general: general:
## Set this to true to enable saving/restoring for regions as specified in the profile below, which is specified in the config
########## RENTING ##########
rent:
price: 1000
duration: '1 day'
### Enable or disable saving and restoring for rents that don't have their individual option set
enableRestore: false enableRestore: false
restoreProfile: 'default' ## The schematic profile as specified in the config
schematicProfile: 'default'
## The event commands profile as specified in the config
eventCommandProfile: 'default'
## The profile for the format of the sign as specified in the config
signProfile: 'default'
## The profile for the WorldGuard flags as specified in the config
flagProfile: 'default'
runCommands:
created:
before:
after:
- "say An AreaShop region has been created: %region%"
deleted:
before:
after:
rented:
before:
after:
extended:
before:
after:
unrented:
before:
after:
bought:
before:
after:
sold:
before:
after:
########## RENTING ##########
rent:
## The default price of a renting region
price: 1000
## The default duration of a renting region
duration: '1 day'
## The percentage of the renting price you get back if you unrent the region (price of time left will be multiplied by this/100)
moneyBack: 100
## Maximum number of extends a player can do (-1 for infinite, 0 for no extending)
maxExtends: -1
########## BUYING ########## ########## BUYING ##########
buy: buy:
## The default price of a buying region
price: 1000 price: 1000
### Enable or disable saving and restoring for buys that don't have their individual option set ## The percentage of the buying price you get back if you sell the region
enableRestore: false moneyBack: 100
restoreProfile: 'default'

227
AreaShop/lang/EN.yml
View File

@ -6,13 +6,50 @@
# the config to the filename (excluding .yml) # # the config to the filename (excluding .yml) #
################################################### ###################################################
########## Command strings ########## General strings
total-maximum: "You can't rent and buy more than %0% region(s) in total" total-maximum: "You can't rent and buy more than %0% region(s) in total"
cmd-notValid: "That command is not valid, use '/as help' for info" cmd-notValid: "That command is not valid, use '/as help' for info"
cmd-onlyByPlayer: "This command can only be run by a player" cmd-onlyByPlayer: "This command can only be run by a player"
cmd-weOnlyByPlayer: "Using a WorldEdit selection is only possible as a player, specify the region name as extra argument"
cmd-noSelection: "You don't have a WorldEdit selection"
cmd-noRegionsFound: "No regions registered in AreaShop are found in your selection"
cmd-noWERegionsFound: "No WorldEdit regions intersecting your selection are found"
rent-help: "/as rent <regionname>" ########## Help command strings
help-header: "Help page, commands that you can execute"
help-alias: "Command aliases: /areashop, /as"
help-help: "&6/as help &7-&r Shows this help page"
help-info: "&6/as info &7-&r Get info about current regions"
help-rent: "&6/as rent &7-&r Rent a region or extend your current rent"
help-buy: "&6/as buy &7-&r Buy a region"
help-unrent: "&6/as unrent &7-&r Unrent a region"
help-unrentOwn: "&6/as unrent &7-&r Unrent your own region"
help-sell: "&6/as sell &7-&r Sell a region"
help-sellOwn: "&6/as sell &7-&r Sell your own region"
help-updaterents: "&6/as updaterents &7-&r Update all rent signs and regions"
help-updatebuys: "&6/as updatebuys &7-&r Update all buy signs and regions"
help-reload: "&6/as reload &7-&r Reload the config and languages"
help-setrestore: "&6/as setrestore &7-&r Set the profile for restoring and on/off "
help-setprice: "&6/as setprice &7-&r Change the price of a rent region"
help-rentduration: "&6/as rentduration &7-&r Change the duration of a rent region"
help-teleport: "&6/as tp &7-&r Teleport to your bought/rented regions"
help-teleportAll: "&6/as tp &7-&r Teleport to a rent/buy region"
help-setteleport: "&6/as settp &7-&r Set teleport position for bought/rented regions"
help-setteleportAll: "&6/as settp &7-&r Set teleport position for a region"
help-find: "&6/as find &7-&r Find an empty buy or rent"
help-groupadd: "&6/as groupadd &7-&r Add a region to a group"
help-groupdel: "&6/as groupdel &7-&r Delete a region from a group"
help-grouplist: "&6/as grouplist &7-&r Display all groups currently registered"
help-groupinfo: "&6/as groupinfo &7-&r Display information about a group"
help-schemevent: "&6/as schemevent &7-&r Trigger a schematic event for a region"
help-add: "&6/as add &7-&r Register a region as rent or buy"
help-del: "&6/as del &7-&r Delete a registered region from AreaShop"
help-addsign: "&6/as addsign &7-&r Add a sign to an existing region"
help-delsign: "&6/as delsign &7-&r Delete the sign you are looking at"
############ Other command strings
rent-help: "/as rent [regionname], the region you stand in will be used if not specified"
rent-noPermission: "You don't have permission to rent a region" rent-noPermission: "You don't have permission to rent a region"
rent-maximum: "You can't rent more than %0% region(s)" rent-maximum: "You can't rent more than %0% region(s)"
rent-payError: "Something went wrong with paying, try again later" rent-payError: "Something went wrong with paying, try again later"
@ -23,8 +60,9 @@ rent-lowMoneyExtend: "You don't have enough money to extend the rent (you have %
rent-lowMoneyRent: "You don't have enough money to rent this region (you have %0% and you need %1%)" rent-lowMoneyRent: "You don't have enough money to rent this region (you have %0% and you need %1%)"
rent-someoneElse: "Someone else already rented this region" rent-someoneElse: "Someone else already rented this region"
rent-notRentable: "That region is not available for renting" rent-notRentable: "That region is not available for renting"
rent-maxExtends: "You cannot extend this rent anymore (the maximum is %0% times), however after the rent is over you can rent this region again"
buy-help: "/as buy <regionname>" buy-help: "/as buy [regionname], the region you stand in will be used if not specified"
buy-noPermission: "You don't have permission to buy a region" buy-noPermission: "You don't have permission to buy a region"
buy-notBuyable: "That region is not available for buying" buy-notBuyable: "That region is not available for buying"
buy-maximum: "You can't buy more than %0% region(s)" buy-maximum: "You can't buy more than %0% region(s)"
@ -34,7 +72,7 @@ buy-lowMoney: "You don't have enough money to buy this region (you have %0% and
buy-yours: "You already own this region" buy-yours: "You already own this region"
buy-someoneElse: "Someone else already bought this region" buy-someoneElse: "Someone else already bought this region"
unrent-help: "/as unrent <regionname>" unrent-help: "/as unrent [regionname], the region you stand in will be used if not specified"
unrent-noPermission: "You don't have permission to unrent a region" unrent-noPermission: "You don't have permission to unrent a region"
unrent-noPermissionOther: "You don't have permission to unrent another region" unrent-noPermissionOther: "You don't have permission to unrent another region"
unrent-notRegistered: "The region can't be unrent because it is not registered for renting" unrent-notRegistered: "The region can't be unrent because it is not registered for renting"
@ -43,7 +81,7 @@ unrent-unrented: "Your region has been unrented"
unrent-other: "The region has been unrented for player %0%" unrent-other: "The region has been unrented for player %0%"
unrent-expired: "Your rent of %0% has expired" unrent-expired: "Your rent of %0% has expired"
sell-help: "/as sell <regionname>" sell-help: "/as sell [regionname], the region you stand in will be used if not specified"
sell-notRegistered: "The region can't be selled because it is not registered for buying" sell-notRegistered: "The region can't be selled because it is not registered for buying"
sell-notBought: "The region can't be selled because it is not someone's property" sell-notBought: "The region can't be selled because it is not someone's property"
sell-sold: "The region has been sold for player %0%" sell-sold: "The region has been sold for player %0%"
@ -63,89 +101,56 @@ reload-reloaded: "The config has been reloaded successfully"
reload-noPermission: "You don't have permission to reload the config" reload-noPermission: "You don't have permission to reload the config"
info-help: "/as info <all|rented|forrent|sold|forsale|player|region>" info-help: "/as info <all|rented|forrent|sold|forsale|player|region>"
info-all-rents: "Regions registered for renting: %0%" info-all-rents: "Regions registered for renting: &7%0%"
info-all-noRents: "There are no regions registered for renting" info-all-noRents: "There are no regions registered for renting"
info-all-buys: "Regions registered for buying: %0%" info-all-buys: "Regions registered for buying: &7%0%"
info-all-noBuys: "There are no regions registered for buying" info-all-noBuys: "There are no regions registered for buying"
info-rented: "Rented regions: %0%" info-rented: "Rented regions: &7%0%"
info-noRented: "No regions are rented" info-noRented: "No regions are rented"
info-unrented: "Unrented regions: %0%" info-unrented: "Unrented regions: &7%0%"
info-noUnrented: "All regions are rented" info-noUnrented: "All regions are rented"
info-sold: "Sold regions: %0%" info-sold: "Sold regions: &7%0%"
info-noSold: "No regions are sold" info-noSold: "No regions are sold"
info-forsale: "Regions for sale: %0%" info-forsale: "Regions for sale: &7%0%"
info-noForsale: "All regions are sold" info-noForsale: "All regions are sold"
info-playerHelp: "/as info player <name>" info-playerHelp: "/as info player <name>"
info-playerRents: "Regions rented by %0%: %1%" info-playerRents: "Regions rented by %0%: &7%1%"
info-playerNoRents: "%0% has not rented a region" info-playerNoRents: "%0% has not rented a region"
info-playerBuys: "Regions bought by %0%: %1%" info-playerBuys: "Regions bought by %0%: &7%1%"
info-playerNoBuys: "%0% has not bought a region" info-playerNoBuys: "%0% has not bought a region"
info-regionHelp: "/as info region <name>" info-regionHelp: "/as info region [name], the region you stand in will be used if not specified"
info-regionNoRenting: "%0% is not registered for renting" info-regionNoRenting: "%0% is not registered for renting"
info-regionRenting: "&6Renting details for %0%" info-regionRenting: "&6Renting details for %0%:"
info-regionRentedBy: "Rented by: %0% until %1%" info-regionRentedBy: "Rented by: &7%0% until %1%"
info-regionNotRented: "Currently not rented" info-regionNotRented: "Currently not rented"
info-regionBuying: "&6Buying details for %0%" info-regionBuying: "&6Buying details for %0%:"
info-regionNoBuying: "%0% is not registered for buying" info-regionNoBuying: "%0% is not registered for buying"
info-regionNotBought: "Currently not sold" info-regionNotBought: "Currently not sold"
info-regionBoughtBy: "Bought by: %0%" info-regionBoughtBy: "Bought by: &7%0%"
info-regionSign: "Sign position: world=%0%, X=%1%, Y=%2%, Z=%3%" info-regionSign: "Sign location(s): %0%"
info-regionPriceDuration: "Price: %0% for each %1%" info-regionSignLocation: "&7(%0%, %1%, %2%, %3%)&r"
info-regionPrice: "Price: %0%" info-regionNoSign: "There is no sign registered for this region"
info-regionRestore: "Restoring enabled: %0%" info-regionPriceDuration: "Price: &7%0% for each %1%"
info-regionRestoreProfile: "Restoring profile: %0%" info-regionPrice: "Price: &7%0%"
info-regionTPLocation: "Teleport position: World=%0%, X=%1%, Y=%2%, Z=%3%, Pitch=%4%, Yaw=%5%" info-regionRestore: "Restoring enabled: &7%0%"
info-regionRestoreProfile: "Restoring profile: &7%0%"
info-regionTPLocation: "Teleport location: &7World=%0%, X=%1%, Y=%2%, Z=%3%, Pitch=%4%, Yaw=%5%"
info-regionNoTP: "No teleport location set" info-regionNoTP: "No teleport location set"
info-regionNotExisting: "Region %0% is not registered"
help-header: "Help page, commands that you can execute" setrestore-help: "/as setrestore <region> <true|false|general> [profile]"
help-alias: "Command aliases: /areashop, /as" setrestore-noPermission: "You don't have permission to change the restore settings"
help-help: "&6/as help &7-&r Shows this help page" setrestore-notRegistered: "%0% is not registered"
help-info: "&6/as info &7-&r Get info about current regions" setrestore-invalidSetting: "'%0%' is not a valid state, should be true, false or general"
help-rent: "&6/as rent &7-&r Rent a region or extend your current rent" setrestore-success: "Succesfully set the restore setting of %0% to '%1%'"
help-buy: "&6/as buy &7-&r Buy a region" setrestore-successProfile: "Succesfully set the restore setting of %0% to '%1%' and the profile to '%2%'"
help-unrent: "&6/as unrent &7-&r Unrent a region"
help-unrentOwn: "&6/as unrent &7-&r Unrent your own region"
help-sell: "&6/as sell &7-&r Sell a region"
help-sellOwn: "&6/as sell &7-&r Sell your own region"
help-updaterents: "&6/as updaterents &7-&r Update all rent signs and regions"
help-updatebuys: "&6/as updatebuys &7-&r Update all buy signs and regions"
help-reload: "&6/as reload &7-&r Reload the config and languages"
help-rentrestore: "&6/as rentrestore &7-&r Set the profile for restoring and on/off "
help-buyrestore: "&6/as buyrestore &7-&r Set the profile for restoring and on/off"
help-rentprice: "&6/as rentprice &7-&r Change the price of a rent region"
help-buyprice: "&6/as buyprice &7-&r Change the price of a buy region"
help-rentduration: "&6/as rentduration &7-&r Change the duration of a rent region"
help-teleport: "&6/as tp &7-&r Teleport to your bought/rented regions"
help-teleportAll: "&6/as tp &7-&r Teleport to a rent/buy region"
help-setteleport: "&6/as settp &7-&r Set teleport position for bought/rented regions"
help-setteleportAll: "&6/as settp &7-&r Set teleport position for a region"
setprice-noPermission: "You don't have permission to change the price of a region"
rentrestore-help: "/as rentrestore <region> <true|false|general> [profile]" setprice-help: "/as setprice <price> [region], the region you stand in will be used if not specified"
rentrestore-noPermission: "You don't have permission to change the restore settings of a rent" setprice-notRegistered: "%0% is not registered in AreaShop"
rentrestore-notRegistered: "%0% is not registered as a rent" setprice-wrongPrice: "'%0%' is not a valid price"
rentrestore-invalidSetting: "'%0%' is not a valid state, should be true, false or general" setprice-successRent: "Price of region %0% changed to %1% per %2%"
rentrestore-success: "Succesfully set the restore setting of %0% to '%1%'" setprice-successBuy: "Price of region %0% changed to %1%"
rentrestore-successProfile: "Succesfully set the restore setting of %0% to '%1%' and the profile to '%2%'"
buyrestore-help: "/as buyrestore <region> <true|false|general> [profile]"
buyrestore-noPermission: "You don't have permission to change the restore settings of a buy"
buyrestore-notRegistered: "%0% is not registered as a buy"
buyrestore-invalidSetting: "'%0%' is not a valid state, should be true, false or general"
buyrestore-success: "Succesfully set the restore setting of %0% to '%1%'"
buyrestore-successProfile: "Succesfully set the restore setting of %0% to '%1%' and the profile to '%2%'"
rentprice-noPermission: "You don't have permission to change the price of a rent"
rentprice-help: "/as rentprice <region> <price>"
rentprice-notRegistered: "%0% is not registered as a rent"
rentprice-wrongPrice: "'%0%' is not a valid price"
rentprice-success: "Price of region %0% changed to %1% per %2%"
buyprice-noPermission: "You don't have permission to change the price of a buy"
buyprice-help: "/as buyprice <region> <price>"
buyprice-notRegistered: "%0% is not registered as a buy"
buyprice-wrongPrice: "'%0%' is not a valid price"
buyprice-success: "Price of region %0% changed to %1%"
rentduration-noPermission: "You don't have permission to change the duration of a rent" rentduration-noPermission: "You don't have permission to change the duration of a rent"
rentduration-help: "/as rentduration <region> <amount> <identifier>" rentduration-help: "/as rentduration <region> <amount> <identifier>"
@ -173,14 +178,14 @@ destroy-noPermissionBuy: "You don't have permission for destroying a sign for bu
destroy-successRent: "Renting of %0% successfully removed" destroy-successRent: "Renting of %0% successfully removed"
destroy-successBuy: "Buying of %0% successfully removed" destroy-successBuy: "Buying of %0% successfully removed"
teleport-help: "/as tp <region>" teleport-help: "/as tp <region> [sign]"
teleport-noRentOrBuy: "Region '%0%' is not registered as rent or buy" teleport-noRentOrBuy: "Region '%0%' is not registered as rent or buy"
teleport-noPermission: "You don't have permission to teleport to a region" teleport-noPermission: "You don't have permission to teleport to a region"
teleport-noPermissionOther: "You don't have permission to teleport to region you do not own" teleport-noPermissionOther: "You don't have permission to teleport to region you do not own"
teleport-success: "You teleported to %0%" teleport-success: "You teleported to %0%"
teleport-noSafe: "No safe position found in region %0%, change the region or set position yourself" teleport-noSafe: "No safe position found in region %0%, change the region or set position yourself"
setteleport-help: "/as settp <region> [reset]" setteleport-help: "/as settp [region] [reset], the region you stand in will be used if not specified"
setteleport-noPermission: "You don't have permission to set the teleport location" setteleport-noPermission: "You don't have permission to set the teleport location"
setteleport-noPermissionAll: "You don't have permission to set the teleport location for a region you do not own" setteleport-noPermissionAll: "You don't have permission to set the teleport location for a region you do not own"
setteleport-noRentOrBuy: "Region '%0%' is not registered as rent or buy" setteleport-noRentOrBuy: "Region '%0%' is not registered as rent or buy"
@ -188,12 +193,74 @@ setteleport-success: "Teleport location of %0% set"
setteleport-notInside: "The location has to be inside the region" setteleport-notInside: "The location has to be inside the region"
setteleport-reset: "Teleport location of %0% has been reset" setteleport-reset: "Teleport location of %0% has been reset"
find-help: "/as find <buy|rent> [maxprice]"
find-noPermission: "You don't have permission to teleport to signs, so you can't use find"
find-success: "Found a %0% region: %1%, while searching with a max price of your balance: %2%"
find-successMax: "Found a %0% region: %1%, while searching with a max price of %2%"
find-wrongMaxPrice: "The specified maximum price is not a correct number: %0%"
find-noneFound: "No %0% region found while searching with a max price of your balance: %1%"
find-noneFoundMax: "No %0% region found while searching with a max price of %1%"
groupadd-help: "/as groupadd <group> [region], if no region specified all regions from your WorldEdit selection are used"
groupadd-noPermission: "You don't have permission to add regions to groups"
groupadd-noRegion: "The specified region is not registered: %0%"
groupadd-success: "Region %0% has been added to group '%1%', this group now has %2% member(s)"
groupadd-failed: "Region %0% is already a member of group '%1%'"
groupadd-weSuccess: "Added to group %0%: &7%1%"
groupadd-weFailed: "Were already in group %0%: &7%1%"
groupdel-help: "/as groupdel <group> [region], if no region specified all regions from your WorldEdit selection are used"
groupdel-noPermission: "You don't have permission to remove regions from groups"
groupdel-noRegion: "The specified region is not registered: %0%"
groupdel-success: "Region %0% has been removed from group '%1%', this group now has %2% member(s)"
groupdel-failed: "Region %0% is not a member of group '%1%'"
groupdel-weSuccess: "Removed from group %0%: &7%1%"
groupdel-weFailed: "Were not in group %0% anyway: &7%1%"
grouplist-noPermission: "You don't have permission to display the registered groups"
grouplist-noGroups: "There are currently no groups registered"
grouplist-success: "The following groups are registered: &7%0%"
groupinfo-help: "/as groupinfo <group>"
groupinfo-noPermission: "You don't have permission to display information about a group"
groupinfo-noGroup: "There is no group registered with the name '%0%', use /as grouplist to check groups"
groupinfo-members: "The following regions are member of group %0%: &7%1%"
groupinfo-noMembers: "Group %0% does not have any members"
schemevent-help: "/as schemevent <region> <created|deleted|rented|unrented|bought|sold>"
schemevent-noRegion: "The specified region is not registered: %0%"
schemevent-wrongEvent: "The specified event '%0%' does not exist, use one of the following: &7%1%"
schemevent-success: "Event '%0%' has succesfully been triggered for region %1%"
add-help: "/as add <rent|buy> [region] [world]"
add-noPermission: "You don't have permission to add a region to AreaShop"
add-success: "Added as %0%: &7%1%"
add-failed: "Already registered: &7%0%"
add-specifyWorld: "Specify the world of the region when using from console"
add-incorrectWorld: "World '%0%' not found, try again (case-sensitive)"
add-noRegion: "Region '%0%' does not exist in this world"
del-noRegion: "Region '%0%' is not registered in AreaShop"
del-noPermission: "You don't have permission to remove regions"
del-success: "Removed regions: &7%0%"
del-failed: "No permission to remove or not registered: &7%0%"
addsign-help: "/as addsign [region] [profile]"
addsign-noSign: "You are not looking at a sign"
addsign-noRegion: "Region '%0%' cannot be found"
addsign-noRegions: "No region found around the sign position"
addsign-couldNotDetect: "Found multiple regions around the sign, specify region as extra argument (2 of the regions that were found: %0% and %1%)"
addsign-couldNotDetectSign: "Found multiple regions around the sign, specify region on the second line (2 of the regions that were found: %0% and %1%)"
addsign-wrongProfile: "The specified profile does not exist, use one of the following (check config): &7%0%"
addsign-success: "The sign has been added to %0%"
addsign-successProfile: "The sign has been added to %0% with profile %1%"
addsign-alreadyRegistered: "That sign is already registered for region %0%"
addsign-noPermission: "You don't have permission to add a sign"
delsign-noSign: "You are not looking at a sign"
delsign-noPermission: "You don't have permission to delete a sign"
delsign-noRegion: "That sign does not belong to an AreaShop region"
delsign-success: "The sign has been removed from region %0%"

2
AreaShop/lang/NL.yml
View File

@ -4,7 +4,7 @@
# Copy this file and change the strings to your # # Copy this file and change the strings to your #
# favor. Then change the 'language' setting in # # favor. Then change the 'language' setting in #
# the config to the filename (excluding .yml) # # the config to the filename (excluding .yml) #
# NOT TOTALLY UPDATED FOR 1.3.0 # # NOT UPDATED since 1.2.1 #
################################################### ###################################################
########## Command strings ########## Command strings

70
AreaShop/plugin.yml
View File

@ -1,6 +1,6 @@
name: AreaShop name: AreaShop
main: nl.evolutioncoding.AreaShop.AreaShop main: nl.evolutioncoding.AreaShop.AreaShop
version: 1.4.0 version: 2.0.0
depend: [Vault, WorldGuard, WorldEdit] depend: [Vault, WorldGuard, WorldEdit]
softdepend: [Multiverse-Core] softdepend: [Multiverse-Core]
commands: commands:
@ -26,15 +26,23 @@ permissions:
areashop.updaterents: true areashop.updaterents: true
areashop.updatebuys: true areashop.updatebuys: true
areashop.reload: true areashop.reload: true
areashop.rentrestore: true areashop.setrestore: true
areashop.buyrestore: true areashop.setprice: true
areashop.rentprice: true
areashop.buyprice: true
areashop.rentduration: true areashop.rentduration: true
areashop.teleportall: true areashop.teleportall: true
areashop.setteleportall: true areashop.setteleportall: true
areashop.teleportsign: true
areashop.tabcomplete: true areashop.tabcomplete: true
areashop.setteleportoutsideregion: true areashop.setteleportoutsideregion: true
areashop.find: true
areashop.groupadd: true
areashop.groupdel: true
areashop.grouplist: true
areashop.groupinfo: true
areashop.limits.unlimited: true
areashop.schematicevents: true
areashop.addsign: true
areashop.delsign: true
areashop.help: areashop.help:
description: Allows you to see the help pages description: Allows you to see the help pages
default: true default: true
@ -80,17 +88,11 @@ permissions:
areashop.reload: areashop.reload:
description: Allows you to reload the config description: Allows you to reload the config
default: op default: op
areashop.rentrestore: areashop.setrestore:
description: Allows you to change the restore settings of a rent description: Allows you to change the restore settings
default: op default: op
areashop.buyrestore: areashop.setprice:
description: Allows you to change the restore settings of a buy description: Allows you to change the price
default: op
areashop.rentprice:
description: Allows you to change the price of a rent
default: op
areashop.buyprice:
description: Allows you to change the price of a buy
default: op default: op
areashop.rentduration: areashop.rentduration:
description: Allows you to change the duration of a rent description: Allows you to change the duration of a rent
@ -100,7 +102,10 @@ permissions:
default: true default: true
areashop.teleportall: areashop.teleportall:
description: Teleport to all regions description: Teleport to all regions
default: op default: true
areashop.teleportsign:
description: Teleport to signs of regions
default: true
areashop.setteleport: areashop.setteleport:
description: Set the teleport spot for your region description: Set the teleport spot for your region
default: true default: true
@ -112,4 +117,37 @@ permissions:
default: op default: op
areashop.tabcomplete: areashop.tabcomplete:
description: Allows you to tabcomplete all commands (also where you dont have permission) description: Allows you to tabcomplete all commands (also where you dont have permission)
default: op
areashop.find:
description: Allows you to teleport to a free region (/as find)
default: true
areashop.groupadd:
description: Allows you to add regions to groups
default: op
areashop.groupdel:
description: Allows you to delete regions from groups
default: op
areashop.grouplist:
description: Allows you to list all the groups currently created
default: op
areashop.groupinfo:
description: Allows you to display information about a group (all members)
default: op
areashop.rentextendbypass:
description: Bypass the extend limit on rents
default: op
areashop.limits.default:
description: Assign limits as set in the 'default' group in the 'limitGroups' section of the config
default: not op
areashop.limits.unlimited:
description: Assign limits as set in the 'unlimited' group in the 'limitGroups' section of the config
default: op
areashop.schematicevents:
description: Allows you to trigger schematic events for regions
default: op
areashop.addsign:
description: Allows you to add signs to existing regions
default: op
areashop.delsign:
description: Allows you to delete signs from existing regions
default: op default: op

281
AreaShop/src/nl/evolutioncoding/AreaShop/AreaShop.java
View File

@ -12,6 +12,7 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.Configuration; import org.bukkit.configuration.Configuration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -55,41 +56,14 @@ public final class AreaShop extends JavaPlugin {
/* Keys for replacing parts of flags */ /* Keys for replacing parts of flags */
public static final String tagPlayerName = "%player%"; public static final String tagPlayerName = "%player%";
public static final String tagPlayerUUID = "%uuid%";
public static final String tagWorldName = "%world%";
public static final String tagRegionName = "%region%"; public static final String tagRegionName = "%region%";
public static final String tagRegionType = "%type%";
public static final String tagPrice = "%price%"; public static final String tagPrice = "%price%";
public static final String tagDuration = "%duration%"; public static final String tagDuration = "%duration%";
public static final String tagRentedUntil = "%until%"; public static final String tagRentedUntil = "%until%";
public static final String tagRentedUntilShort = "%untilshort%";
/* Enum for schematic event types */
// TODO delete
public enum RegionEventType {
CREATED("Created"),
DELETED("Deleted"),
BOUGHT("Bought"),
SOLD("Sold");
private final String value;
private RegionEventType(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
/* Enum for region types */
public enum RegionType {
SELL("sell"),
RENT("rent");
private final String value;
private RegionType(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
public static AreaShop getInstance() { public static AreaShop getInstance() {
return AreaShop.instance; return AreaShop.instance;
@ -101,13 +75,11 @@ public final class AreaShop extends JavaPlugin {
public void onEnable(){ public void onEnable(){
AreaShop.instance = this; AreaShop.instance = this;
boolean error = false; boolean error = false;
/* Save a copy of the default config.yml if one is not present */
this.saveDefaultConfig();
/* Check the config, loads default if errors */ /* Check the config, loads default if errors */
configOk = this.checkConfig(); debug = this.getConfig().getBoolean("debug");
configOk = true;
/* Check if WorldGuard is present */ /* Check if WorldGuard is present */
Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard"); Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard");
if (plugin == null || !(plugin instanceof WorldGuardPlugin)) { if (plugin == null || !(plugin instanceof WorldGuardPlugin)) {
@ -145,26 +117,32 @@ public final class AreaShop extends JavaPlugin {
fileManager = new FileManager(this); fileManager = new FileManager(this);
error = error & !fileManager.loadFiles(); error = error & !fileManager.loadFiles();
fileManager.checkRents(); fileManager.checkRents();
/* Save a copy of the default config.yml if one is not present */
this.saveDefaultConfig();
if(error) { if(error) {
this.getLogger().info("The plugin has not started, fix the errors listed above"); this.getLogger().info("The plugin has not started, fix the errors listed above");
} else { } else {
/* Register the event listeners */ // Register the event listeners
this.getServer().getPluginManager().registerEvents(new SignChangeListener(this), this); this.getServer().getPluginManager().registerEvents(new SignChangeListener(this), this);
this.getServer().getPluginManager().registerEvents(new SignBreakListener(this), this); this.getServer().getPluginManager().registerEvents(new SignBreakListener(this), this);
this.getServer().getPluginManager().registerEvents(new RightClickListener(this), this); this.getServer().getPluginManager().registerEvents(new SignClickListener(this), this);
/* Start thread for checking renting */ // Start thread for checking renting
int checkDelay = Integer.parseInt(this.config().getString("checkDelay"))*20; int checkDelay = Integer.parseInt(this.config().getString("checkDelay"))*20;
new RentCheck(this).runTaskTimer(this, checkDelay, checkDelay); new RentCheck(this).runTaskTimer(this, checkDelay, checkDelay);
/* Bind commands for this plugin */ // Bind commands for this plugin
commandManager = new CommandManager(this); commandManager = new CommandManager(this);
// Enable Metrics if config allows it
if(this.config().getBoolean("sendStats")) { if(this.config().getBoolean("sendStats")) {
this.startMetrics(); this.startMetrics();
} }
// Register dynamic permission (things declared in config)
registerDynamicPermissions();
} }
} }
@ -230,13 +208,28 @@ public final class AreaShop extends JavaPlugin {
return fileManager; return fileManager;
} }
/**
* Register dynamic permissions controlled by config settings
*/
public void registerDynamicPermissions() {
// Register limit groups of amount of regions a player can have
for(String group : config().getConfigurationSection("limitGroups").getKeys(false)) {
if(!"unlimited".equals(group) && !"default".equals(group)) {
Permission perm = new Permission("areashop.limits." + group);
Bukkit.getPluginManager().addPermission(perm);
}
}
Bukkit.getPluginManager().recalculatePermissionDefaults(Bukkit.getPluginManager().getPermission("playerwarps.limits"));
}
/** /**
* Method to send a message to a CommandSender, using chatprefix if it is a player * Method to send a message to a CommandSender, using chatprefix if it is a player
* @param target The CommandSender you wan't to send the message to (e.g. a player) * @param target The CommandSender you wan't to send the message to (e.g. a player)
* @param key The key to get the translation * @param key The key to get the translation
* @param prefix Specify if the message should have a prefix
* @param params The parameters to inject into the message string * @param params The parameters to inject into the message string
*/ */
public void message(Object target, String key, Object... params) { public void configurableMessage(Object target, String key, boolean prefix, Object... params) {
String langString = this.fixColors(languageManager.getLang(key, params)); String langString = this.fixColors(languageManager.getLang(key, params));
if(langString == null) { if(langString == null) {
this.getLogger().info("Something is wrong with the language file, could not find key: " + key); this.getLogger().info("Something is wrong with the language file, could not find key: " + key);
@ -244,17 +237,34 @@ public final class AreaShop extends JavaPlugin {
// Do nothing, message is disabled // Do nothing, message is disabled
} else { } else {
if(target instanceof Player) { if(target instanceof Player) {
((Player)target).sendMessage(this.fixColors(chatprefix) + langString); if(prefix) {
((Player)target).sendMessage(this.fixColors(chatprefix) + langString);
} else {
((Player)target).sendMessage(langString);
}
} else if(target instanceof CommandSender) { } else if(target instanceof CommandSender) {
if(!config().getBoolean("useColorsInConsole")) {
langString = ChatColor.stripColor(langString);
}
((CommandSender)target).sendMessage(langString); ((CommandSender)target).sendMessage(langString);
} }
else if(target instanceof Logger) { else if(target instanceof Logger) {
if(!config().getBoolean("useColorsInConsole")) {
langString = ChatColor.stripColor(langString);
}
((Logger)target).info(langString); ((Logger)target).info(langString);
} else { } else {
langString = ChatColor.stripColor(langString);
this.getLogger().info("Could not send message, target is wrong: " + langString); this.getLogger().info("Could not send message, target is wrong: " + langString);
} }
} }
} }
public void messageNoPrefix(Object target, String key, Object... params) {
configurableMessage(target, key, false, params);
}
public void message(Object target, String key, Object... params) {
configurableMessage(target, key, true, params);
}
/** /**
* Convert color and formatting codes to bukkit values * Convert color and formatting codes to bukkit values
@ -313,192 +323,17 @@ public final class AreaShop extends JavaPlugin {
} }
} }
/**
* Start the Metrics stats collection
*/
private void startMetrics() { private void startMetrics() {
try { try {
Metrics metrics = new Metrics(this); Metrics metrics = new Metrics(this);
// Number of rents rented/not rented
/*Graph rentGraph = metrics.createGraph("Rent regions");
rentGraph.addPlotter(new Metrics.Plotter("For rent") {
@Override
public int getValue() {
int result = 0;
for(String rent : fileManager.getRents().keySet()) {
if(fileManager.getRent(rent).get(keyPlayer) == null) {
result++;
}
}
return result;
}
});
rentGraph.addPlotter(new Metrics.Plotter("Rented") {
@Override
public int getValue() {
int result = 0;
for(String rent : fileManager.getRents().keySet()) {
if(fileManager.getRent(rent).get(keyPlayer) != null) {
result++;
}
}
return result;
}
});
// Number of buys bought/not bought
Graph buyGraph = metrics.createGraph("Buy regions");
buyGraph.addPlotter(new Metrics.Plotter("For sale") {
@Override
public int getValue() {
int result = 0;
for(String buy : fileManager.getBuys().keySet()) {
if(fileManager.getBuy(buy).get(keyPlayer) == null) {
result++;
}
}
return result;
}
});
buyGraph.addPlotter(new Metrics.Plotter("Sold") {
@Override
public int getValue() {
int result = 0;
for(String buy : fileManager.getBuys().keySet()) {
if(fileManager.getBuy(buy).get(keyPlayer) != null) {
result++;
}
}
return result;
}
});
*/
metrics.start(); metrics.start();
} catch (IOException e) { } catch (IOException e) {
AreaShop.debug("Could not start Metrics"); AreaShop.debug("Could not start Metrics");
} }
} }
/**
* Checks the config for errors, loads default config if they occur
*/
public boolean checkConfig() {
int error = 0;
debug = this.getConfig().getString("debug").equalsIgnoreCase("true");
/* GENERAL */
String chatPrefix = this.getConfig().getString("chatPrefix");
if (chatPrefix.length() == 0) {
this.getLogger().info("Config-Error: chatPrefix has length zero");
error++;
}
String maximumTotal = this.getConfig().getString("maximumTotal");
try {
int maximumTotalInt = Integer.parseInt(maximumTotal);
if(maximumTotalInt < -1) {
this.getLogger().info("Config-Error: maximumTotal must be -1 or higher");
error++;
}
} catch (NumberFormatException e) {
this.getLogger().info("Config-Error: maximumTotal is not a valid number");
error++;
}
/* RENTING */
String rentSign = this.getConfig().getString("rentSign");
if (rentSign.length() > 15) {
this.getLogger().info("Config-Error: rentSign is too long, maximum length is 15 characters");
error++;
}
String signRentable = this.getConfig().getString("signRentable");
if (signRentable.length() > 15) {
this.getLogger().info("Config-Error: signRentable is too long, maximum length is 15 characters");
error++;
}
String signRented = this.getConfig().getString("signRented");
if (signRented.length() > 15) {
this.getLogger().info("Config-Error: signRented is too long, maximum length is 15 characters");
error++;
}
String maximumRents = this.getConfig().getString("maximumRents");
try {
int maximumRentsInt = Integer.parseInt(maximumRents);
if(maximumRentsInt < -1) {
this.getLogger().info("Config-Error: maximumRents must be -1 or higher");
error++;
}
} catch (NumberFormatException e) {
this.getLogger().info("Config-Error: maximumRents is not a valid number");
error++;
}
String rentMoneyBack = this.getConfig().getString("rentMoneyBack");
try {
int rentMoneyBackInt = Integer.parseInt(rentMoneyBack);
if(rentMoneyBackInt < 0 || rentMoneyBackInt > 100) {
this.getLogger().info("Config-Error: rentMoneyBack must be between 0 and 100");
error++;
}
} catch (NumberFormatException e) {
this.getLogger().info("Config-Error: rentMoneyBack is not a valid number");
error++;
}
String checkDelay = this.getConfig().getString("checkDelay");
try {
int checkDelayInt = Integer.parseInt(checkDelay);
if(checkDelayInt < 1) {
this.getLogger().info("Config-Error: checkDelay can't be below 1");
error++;
}
} catch (NumberFormatException e) {
this.getLogger().info("Config-Error: checkDelay is not a valid number");
error++;
}
/* BUYING */
String buySign = this.getConfig().getString("buySign");
if (buySign.length() > 15) {
this.getLogger().info("Config-Error: buySign is too long, maximum length is 15 characters");
error++;
}
String signBuyable = this.getConfig().getString("signBuyable");
if (signBuyable.length() > 15) {
this.getLogger().info("Config-Error: signBuyable is too long, maximum length is 15 characters");
error++;
}
String signBuyed = this.getConfig().getString("signBuyed");
if (signBuyed.length() > 15) {
this.getLogger().info("Config-Error: signBuyed is too long, maximum length is 15 characters");
error++;
}
String maximumBuys = this.getConfig().getString("maximumBuys");
try {
int maximumBuysInt = Integer.parseInt(maximumBuys);
if(maximumBuysInt < -1) {
this.getLogger().info("Config-Error: maximumBuys must be -1 or higher");
error++;
}
} catch (NumberFormatException e) {
this.getLogger().info("Config-Error: maximumBuys is not a valid number");
error++;
}
String buyMoneyBack = this.getConfig().getString("buyMoneyBack");
try {
int buyMoneyBackInt = Integer.parseInt(buyMoneyBack);
if(buyMoneyBackInt < 0 || buyMoneyBackInt > 100) {
this.getLogger().info("Config-Error: buyMoneyBack must be between 0 and 100");
error++;
}
} catch (NumberFormatException e) {
this.getLogger().info("Config-Error: buyMoneyBack is not a valid number");
error++;
}
/* Load default config if errors have occurred */
if (error > 0) {
this.getLogger().info("The plugin has " + error + " error(s) in the config, default config will be used");
}
/* return true if no errors, false if there are errors */
return (error == 0);
}
/** /**
* Checks if the string is a correct time period * Checks if the string is a correct time period
@ -544,9 +379,11 @@ public final class AreaShop extends JavaPlugin {
public void reload() { public void reload() {
this.saveDefaultConfig(); this.saveDefaultConfig();
this.reloadConfig(); this.reloadConfig();
configOk = this.checkConfig(); configOk = true;
chatprefix = this.config().getString("chatPrefix"); chatprefix = this.config().getString("chatPrefix");
debug = this.getConfig().getBoolean("debug");
languageManager = new LanguageManager(this); languageManager = new LanguageManager(this);
fileManager.loadFiles();
fileManager.checkRents(); fileManager.checkRents();
} }

40
AreaShop/src/nl/evolutioncoding/AreaShop/CommandManager.java
View File

@ -5,28 +5,38 @@ import java.util.List;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import nl.evolutioncoding.AreaShop.commands.AddCommand;
import nl.evolutioncoding.AreaShop.commands.AddsignCommand;
import nl.evolutioncoding.AreaShop.commands.BuyCommand; import nl.evolutioncoding.AreaShop.commands.BuyCommand;
import nl.evolutioncoding.AreaShop.commands.BuypriceCommand;
import nl.evolutioncoding.AreaShop.commands.BuyrestoreCommand;
import nl.evolutioncoding.AreaShop.commands.CommandAreaShop; import nl.evolutioncoding.AreaShop.commands.CommandAreaShop;
import nl.evolutioncoding.AreaShop.commands.DelCommand;
import nl.evolutioncoding.AreaShop.commands.DelsignCommand;
import nl.evolutioncoding.AreaShop.commands.FindCommand;
import nl.evolutioncoding.AreaShop.commands.GroupaddCommand;
import nl.evolutioncoding.AreaShop.commands.GroupdelCommand;
import nl.evolutioncoding.AreaShop.commands.GroupinfoCommand;
import nl.evolutioncoding.AreaShop.commands.GrouplistCommand;
import nl.evolutioncoding.AreaShop.commands.HelpCommand; import nl.evolutioncoding.AreaShop.commands.HelpCommand;
import nl.evolutioncoding.AreaShop.commands.InfoCommand; import nl.evolutioncoding.AreaShop.commands.InfoCommand;
import nl.evolutioncoding.AreaShop.commands.ReloadCommand; import nl.evolutioncoding.AreaShop.commands.ReloadCommand;
import nl.evolutioncoding.AreaShop.commands.RentCommand; import nl.evolutioncoding.AreaShop.commands.RentCommand;
import nl.evolutioncoding.AreaShop.commands.RentdurationCommand; import nl.evolutioncoding.AreaShop.commands.RentdurationCommand;
import nl.evolutioncoding.AreaShop.commands.RentpriceCommand; import nl.evolutioncoding.AreaShop.commands.SchematiceventCommand;
import nl.evolutioncoding.AreaShop.commands.RentrestoreCommand;
import nl.evolutioncoding.AreaShop.commands.SellCommand; import nl.evolutioncoding.AreaShop.commands.SellCommand;
import nl.evolutioncoding.AreaShop.commands.SetpriceCommand;
import nl.evolutioncoding.AreaShop.commands.SetrestoreCommand;
import nl.evolutioncoding.AreaShop.commands.SetteleportCommand; import nl.evolutioncoding.AreaShop.commands.SetteleportCommand;
import nl.evolutioncoding.AreaShop.commands.TeleportCommand; import nl.evolutioncoding.AreaShop.commands.TeleportCommand;
import nl.evolutioncoding.AreaShop.commands.UnrentCommand; import nl.evolutioncoding.AreaShop.commands.UnrentCommand;
import nl.evolutioncoding.AreaShop.commands.UpdatebuysCommand; import nl.evolutioncoding.AreaShop.commands.UpdatebuysCommand;
import nl.evolutioncoding.AreaShop.commands.UpdaterentsCommand; import nl.evolutioncoding.AreaShop.commands.UpdaterentsCommand;
import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter; import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
public class CommandManager implements CommandExecutor, TabCompleter { public class CommandManager implements CommandExecutor, TabCompleter {
AreaShop plugin; AreaShop plugin;
@ -47,14 +57,22 @@ public class CommandManager implements CommandExecutor, TabCompleter {
commands.add(new InfoCommand(plugin)); commands.add(new InfoCommand(plugin));
commands.add(new TeleportCommand(plugin)); commands.add(new TeleportCommand(plugin));
commands.add(new SetteleportCommand(plugin)); commands.add(new SetteleportCommand(plugin));
commands.add(new FindCommand(plugin));
commands.add(new UpdaterentsCommand(plugin)); commands.add(new UpdaterentsCommand(plugin));
commands.add(new UpdatebuysCommand(plugin)); commands.add(new UpdatebuysCommand(plugin));
commands.add(new RentrestoreCommand(plugin)); commands.add(new SetrestoreCommand(plugin));
commands.add(new BuyrestoreCommand(plugin)); commands.add(new SetpriceCommand(plugin));
commands.add(new RentpriceCommand(plugin));
commands.add(new BuypriceCommand(plugin));
commands.add(new RentdurationCommand(plugin)); commands.add(new RentdurationCommand(plugin));
commands.add(new ReloadCommand(plugin)); commands.add(new ReloadCommand(plugin));
commands.add(new GroupaddCommand(plugin));
commands.add(new GroupdelCommand(plugin));
commands.add(new GrouplistCommand(plugin));
commands.add(new GroupinfoCommand(plugin));
commands.add(new SchematiceventCommand(plugin));
commands.add(new AddCommand(plugin));
commands.add(new DelCommand(plugin));
commands.add(new AddsignCommand(plugin));
commands.add(new DelsignCommand(plugin));
/* Register commands in bukkit */ /* Register commands in bukkit */
plugin.getCommand("AreaShop").setExecutor(this); plugin.getCommand("AreaShop").setExecutor(this);
@ -87,7 +105,11 @@ public class CommandManager implements CommandExecutor, TabCompleter {
/* Send the messages to the target */ /* Send the messages to the target */
for(String message : messages) { for(String message : messages) {
target.sendMessage(plugin.fixColors(message)); if(!plugin.config().getBoolean("useColorsInConsole") && !(target instanceof Player)) {
target.sendMessage(ChatColor.stripColor(plugin.fixColors(message)));
} else {
target.sendMessage(plugin.fixColors(message));
}
} }
} }

367
AreaShop/src/nl/evolutioncoding/AreaShop/FileManager.java
View File

@ -17,18 +17,27 @@ import java.util.List;
import nl.evolutioncoding.AreaShop.Exceptions.RegionCreateException; import nl.evolutioncoding.AreaShop.Exceptions.RegionCreateException;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion; import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion.RegionEvent;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion.RegionType;
import nl.evolutioncoding.AreaShop.regions.RegionGroup; import nl.evolutioncoding.AreaShop.regions.RegionGroup;
import nl.evolutioncoding.AreaShop.regions.RentRegion; import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.sk89q.worldguard.protection.flags.DefaultFlag; import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
import com.sk89q.worldedit.bukkit.selections.Selection;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
public class FileManager { public class FileManager {
private static FileManager instance = null; private static FileManager instance = null;
@ -144,6 +153,10 @@ public class FileManager {
return new ArrayList<GeneralRegion>(regions.values()); return new ArrayList<GeneralRegion>(regions.values());
} }
/**
* Get a list of names of a certain group of things
* @return A String list with all the names
*/
public List<String> getBuyNames() { public List<String> getBuyNames() {
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();
for(BuyRegion region : getBuys()) { for(BuyRegion region : getBuys()) {
@ -151,7 +164,6 @@ public class FileManager {
} }
return result; return result;
} }
public List<String> getRentNames() { public List<String> getRentNames() {
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();
for(RentRegion region : getRents()) { for(RentRegion region : getRents()) {
@ -159,6 +171,20 @@ public class FileManager {
} }
return result; return result;
} }
public List<String> getRegionNames() {
ArrayList<String> result = new ArrayList<String>();
for(GeneralRegion region : getRegions()) {
result.add(region.getName());
}
return result;
}
public List<String> getGroupNames() {
ArrayList<String> result = new ArrayList<String>();
for(RegionGroup group : getGroups()) {
result.add(group.getName());
}
return result;
}
/** /**
* Add a rent to the list * Add a rent to the list
@ -166,6 +192,9 @@ public class FileManager {
* @param rent Map containing all the info for a rent * @param rent Map containing all the info for a rent
*/ */
public void addRent(RentRegion rent) { public void addRent(RentRegion rent) {
if(rent == null) {
AreaShop.debug("Tried adding a null rent!");
}
regions.put(rent.getName().toLowerCase(), rent); regions.put(rent.getName().toLowerCase(), rent);
rent.save(); rent.save();
} }
@ -176,32 +205,52 @@ public class FileManager {
* @param buy Map containing all the info for a buy * @param buy Map containing all the info for a buy
*/ */
public void addBuy(BuyRegion buy) { public void addBuy(BuyRegion buy) {
if(buy == null) {
AreaShop.debug("Tried adding a null buy!");
}
regions.put(buy.getName().toLowerCase(), buy); regions.put(buy.getName().toLowerCase(), buy);
buy.save(); buy.save();
} }
public void addGroup(RegionGroup group) {
groups.put(group.getName().toLowerCase(), group);
String lowGroup = group.getName().toLowerCase();
ConfigurationSection result = groupsConfig.getConfigurationSection(lowGroup);
if(result == null) {
result = groupsConfig.createSection(lowGroup);
groupsConfig.set(lowGroup + ".name", group.getName());
groupsConfig.set(lowGroup + ".priority", 0);
}
saveGroups();
}
/** /**
* Remove a rent from the list * Remove a rent from the list
* @param regionName * @param regionName
*/ */
public boolean removeRent(String regionName, boolean giveMoneyBack) { public boolean removeRent(RentRegion rent, boolean giveMoneyBack) {
regionName = regionName.toLowerCase();
boolean result = false; boolean result = false;
RentRegion rent = getRent(regionName);
if(rent != null) { if(rent != null) {
if(rent.isRented()) { if(rent.isRented()) {
rent.unRent(giveMoneyBack); rent.unRent(giveMoneyBack);
} }
// Handle schematics and run commands
rent.handleSchematicEvent(RegionEvent.DELETED);
rent.runEventCommands(RegionEvent.DELETED, true);
/* Delete the sign and the variable */ /* Delete the sign and the variable */
if(rent.getWorld() != null) { if(rent.getWorld() != null) {
rent.getWorld().getBlockAt(rent.getSignLocation()).setType(Material.AIR); for(Location sign : rent.getSignLocations()) {
sign.getBlock().setType(Material.AIR);
}
} }
if(rent.getRegion() != null) { RegionGroup[] groups = getGroups().toArray(new RegionGroup[getGroups().size()]);
rent.getRegion().setFlag(DefaultFlag.GREET_MESSAGE, null); for(RegionGroup group : groups) {
rent.getRegion().setFlag(DefaultFlag.FAREWELL_MESSAGE, null); group.removeMember(rent);
} }
regions.remove(regionName); rent.resetRegionFlags();
File file = new File(plugin.getDataFolder() + File.separator + AreaShop.regionsFolder + File.separator + regionName + ".yml"); regions.remove(rent.getLowerCaseName());
File file = new File(plugin.getDataFolder() + File.separator + AreaShop.regionsFolder + File.separator + rent.getLowerCaseName() + ".yml");
boolean deleted = true; boolean deleted = true;
try { try {
deleted = file.delete(); deleted = file.delete();
@ -211,37 +260,60 @@ public class FileManager {
if(!deleted) { if(!deleted) {
plugin.getLogger().warning("File could not be deleted: " + file.toString()); plugin.getLogger().warning("File could not be deleted: " + file.toString());
} }
for(RegionGroup group : getGroups()) {
group.removeMember(rent);
}
result = true; result = true;
// Run commands
rent.runEventCommands(RegionEvent.DELETED, false);
} }
return result; return result;
} }
/**
* Get a region by providing a location of the sign
* @param location The locatin of the sign
* @return The generalRegion that has a sign at this location
*/
public GeneralRegion getRegionBySignLocation(Location location) {
for(GeneralRegion region : getRegions()) {
if(region.isSignOfRegion(location)) {
return region;
}
}
return null;
}
/** /**
* Remove a buy from the list * Remove a buy from the list
* @param regionName * @param regionName
*/ */
public boolean removeBuy(String regionName, boolean giveMoneyBack) { public boolean removeBuy(BuyRegion buy, boolean giveMoneyBack) {
regionName = regionName.toLowerCase();
boolean result = false; boolean result = false;
BuyRegion buy = getBuy(regionName);
if(buy != null) { if(buy != null) {
if(buy.isSold()) { if(buy.isSold()) {
buy.sell(giveMoneyBack); buy.sell(giveMoneyBack);
} }
// Handle schematics and run commands
buy.handleSchematicEvent(RegionEvent.DELETED);
buy.runEventCommands(RegionEvent.DELETED, true);
// Delete the sign and the variable // Delete the sign and the variable
if(buy.getWorld() != null) { if(buy.getWorld() != null) {
buy.getWorld().getBlockAt(buy.getSignLocation()).setType(Material.AIR); for(Location sign : buy.getSignLocations()) {
sign.getBlock().setType(Material.AIR);
}
} }
regions.remove(regionName); regions.remove(buy.getLowerCaseName());
if(buy.getRegion() != null) { buy.resetRegionFlags();
buy.getRegion().setFlag(DefaultFlag.GREET_MESSAGE, null);
buy.getRegion().setFlag(DefaultFlag.FAREWELL_MESSAGE, null); // Removing from groups
for(RegionGroup group : getGroups()) {
group.removeMember(buy);
} }
// Deleting the file // Deleting the file
File file = new File(plugin.getDataFolder() + File.separator + AreaShop.regionsFolder + File.separator + regionName + ".yml"); File file = new File(plugin.getDataFolder() + File.separator + AreaShop.regionsFolder + File.separator + buy.getLowerCaseName() + ".yml");
boolean deleted = true; boolean deleted = true;
try { try {
deleted = file.delete(); deleted = file.delete();
@ -252,15 +324,24 @@ public class FileManager {
plugin.getLogger().warning("File could not be deleted: " + file.toString()); plugin.getLogger().warning("File could not be deleted: " + file.toString());
} }
// Removing from groups
for(RegionGroup group : getGroups()) {
group.removeMember(buy);
}
result = true; result = true;
// Run commands
buy.runEventCommands(RegionEvent.DELETED, false);
} }
return result; return result;
} }
/**
* Remove a group
* @param group Group to remove
*/
public void removeGroup(RegionGroup group) {
groups.remove(group.getLowerCaseName());
groupsConfig.set(group.getLowerCaseName(), null);
saveGroups();
}
/** /**
* Update all rent signs * Update all rent signs
* @return true if all signs are updated, otherwise false * @return true if all signs are updated, otherwise false
@ -393,6 +474,10 @@ public class FileManager {
} }
} }
/**
* Load all files from disk
* @return true
*/
public boolean loadFiles() { public boolean loadFiles() {
boolean result = false; boolean result = false;
@ -406,7 +491,7 @@ public class FileManager {
for(File region : file.listFiles()) { for(File region : file.listFiles()) {
if(region.isFile()) { if(region.isFile()) {
YamlConfiguration config = YamlConfiguration.loadConfiguration(region); YamlConfiguration config = YamlConfiguration.loadConfiguration(region);
if(config.isSet("rent")) { if(RegionType.RENT.getValue().equals(config.getString("general.type"))) {
try { try {
RentRegion rent = new RentRegion(plugin, config); RentRegion rent = new RentRegion(plugin, config);
addRent(rent); addRent(rent);
@ -417,12 +502,14 @@ public class FileManager {
} catch(Exception e) {} } catch(Exception e) {}
} }
} else if(config.isSet("buy")) { } else if(RegionType.BUY.getValue().equals(config.getString("general.type"))) {
try { try {
BuyRegion buy = new BuyRegion(plugin, config); BuyRegion buy = new BuyRegion(plugin, config);
addBuy(buy); addBuy(buy);
} catch (RegionCreateException exception) { } catch (RegionCreateException exception) {
// This prints out a message in the console that indicates why the region cannot be created
plugin.getLogger().warning(exception.getMessage()); plugin.getLogger().warning(exception.getMessage());
// Catch all exeptions because it just has to try delete the region, if it fails it does not matter
try { try {
region.delete(); region.delete();
} catch(Exception e) {} } catch(Exception e) {}
@ -441,9 +528,6 @@ public class FileManager {
} }
for(String groupName : groupsConfig.getKeys(false)) { for(String groupName : groupsConfig.getKeys(false)) {
RegionGroup group = new RegionGroup(plugin, groupName); RegionGroup group = new RegionGroup(plugin, groupName);
for(String region : groupsConfig.getConfigurationSection(groupName).getStringList("regions")) {
group.addMember(regions.get(region.toLowerCase()));
}
groups.put(groupName, group); groups.put(groupName, group);
} }
@ -491,6 +575,8 @@ public class FileManager {
return; return;
} }
plugin.getLogger().info("Conversion to a new version of the file format starts, could take some time");
// Convert old rent files // Convert old rent files
if(rentFile.exists()) { if(rentFile.exists()) {
if(!oldFolderFile.exists()) { if(!oldFolderFile.exists()) {
@ -507,7 +593,7 @@ public class FileManager {
rents = (HashMap<String,HashMap<String,String>>)input.readObject(); rents = (HashMap<String,HashMap<String,String>>)input.readObject();
input.close(); input.close();
} catch (IOException | ClassNotFoundException | ClassCastException e) { } catch (IOException | ClassNotFoundException | ClassCastException e) {
plugin.getLogger().warning("Error: Something went wrong reading file: " + rentPath); plugin.getLogger().warning(" Error: Something went wrong reading file: " + rentPath);
} }
// Delete the file if it is totally wrong // Delete the file if it is totally wrong
if(rents == null) { if(rents == null) {
@ -519,7 +605,7 @@ public class FileManager {
try { try {
Files.move(new File(rentPath), new File(oldFolderPath + "rents")); Files.move(new File(rentPath), new File(oldFolderPath + "rents"));
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().info("Could not create a backup of '" + rentPath + "', check the file permissions (conversion to next version continues)"); plugin.getLogger().info(" Could not create a backup of '" + rentPath + "', check the file permissions (conversion to next version continues)");
} }
// Check if conversion is needed // Check if conversion is needed
if(versions.get("rents") < 1) { if(versions.get("rents") < 1) {
@ -544,10 +630,9 @@ public class FileManager {
/* Change to version 0 */ /* Change to version 0 */
versions.put("rents", 0); versions.put("rents", 0);
} }
plugin.getLogger().info("Updated version of '" + buyPath + "' from -1 to 0 (switch to using lowercase region names, adding default schematic enabling and profile)"); plugin.getLogger().info(" Updated version of '" + buyPath + "' from -1 to 0 (switch to using lowercase region names, adding default schematic enabling and profile)");
} }
if(versions.get("rents") < 1) { if(versions.get("rents") < 1) {
plugin.getLogger().info("Starting UUID conversion of '" + buyPath + "', could take a while");
for(String rentName : rents.keySet()) { for(String rentName : rents.keySet()) {
HashMap<String,String> rent = rents.get(rentName); HashMap<String,String> rent = rents.get(rentName);
if(rent.get("player") != null) { if(rent.get("player") != null) {
@ -559,7 +644,7 @@ public class FileManager {
/* Change version to 1 */ /* Change version to 1 */
versions.put("rents", 1); versions.put("rents", 1);
} }
plugin.getLogger().info("Updated version of '" + rentPath + "' from 0 to 1 (switch to UUID's for player identification)"); plugin.getLogger().info(" Updated version of '" + rentPath + "' from 0 to 1 (switch to UUID's for player identification)");
} }
} }
// Save rents to new format // Save rents to new format
@ -569,27 +654,28 @@ public class FileManager {
} }
for(HashMap<String, String> rent : rents.values()) { for(HashMap<String, String> rent : rents.values()) {
YamlConfiguration config = new YamlConfiguration(); YamlConfiguration config = new YamlConfiguration();
config.set("name", rent.get("name").toLowerCase()); config.set("general.name", rent.get("name").toLowerCase());
config.set("rent.world", rent.get("world")); config.set("general.type", "rent");
config.set("rent.signLocation.world", rent.get("world")); config.set("general.world", rent.get("world"));
config.set("rent.signLocation.x", Double.parseDouble(rent.get("x"))); config.set("general.signs.0.location.world", rent.get("world"));
config.set("rent.signLocation.y", Double.parseDouble(rent.get("y"))); config.set("general.signs.0.location.x", Double.parseDouble(rent.get("x")));
config.set("rent.signLocation.z", Double.parseDouble(rent.get("z"))); config.set("general.signs.0.location.y", Double.parseDouble(rent.get("y")));
config.set("general.signs.0.location.z", Double.parseDouble(rent.get("z")));
config.set("rent.price", Double.parseDouble(rent.get("price"))); config.set("rent.price", Double.parseDouble(rent.get("price")));
config.set("rent.duration", rent.get("duration")); config.set("rent.duration", rent.get("duration"));
if(rent.get("restore") != null && !rent.get("restore").equals("general")) { if(rent.get("restore") != null && !rent.get("restore").equals("general")) {
config.set("rent.enableRestore", rent.get("restore")); config.set("general.enableRestore", rent.get("restore"));
} }
if(rent.get("profile") != null && !rent.get("profile").equals("default")) { if(rent.get("profile") != null && !rent.get("profile").equals("default")) {
config.set("rent.restoreProfile", rent.get("profile")); config.set("general.schematicProfile", rent.get("profile"));
} }
if(rent.get("tpx") != null) { if(rent.get("tpx") != null) {
config.set("rent.teleportLocation.world", rent.get("world")); config.set("general.teleportLocation.world", rent.get("world"));
config.set("rent.teleportLocation.x", Double.parseDouble(rent.get("tpx"))); config.set("general.teleportLocation.x", Double.parseDouble(rent.get("tpx")));
config.set("rent.teleportLocation.y", Double.parseDouble(rent.get("tpy"))); config.set("general.teleportLocation.y", Double.parseDouble(rent.get("tpy")));
config.set("rent.teleportLocation.z", Double.parseDouble(rent.get("tpz"))); config.set("general.teleportLocation.z", Double.parseDouble(rent.get("tpz")));
config.set("rent.teleportLocation.yaw", Double.parseDouble(rent.get("tpyaw"))); config.set("general.teleportLocation.yaw", rent.get("tpyaw"));
config.set("rent.teleportLocation.pitch", Double.parseDouble(rent.get("tppitch"))); config.set("general.teleportLocation.pitch", rent.get("tppitch"));
} }
if(rent.get("playeruuid") != null) { if(rent.get("playeruuid") != null) {
config.set("rent.renter", rent.get("playeruuid")); config.set("rent.renter", rent.get("playeruuid"));
@ -598,9 +684,10 @@ public class FileManager {
try { try {
config.save(new File(regionsPath + File.separator + rent.get("name").toLowerCase() + ".yml")); config.save(new File(regionsPath + File.separator + rent.get("name").toLowerCase() + ".yml"));
} catch (IOException e) { } catch (IOException e) {
plugin.getLogger().warning("Error: Could not save region file while converting: " + regionsPath + File.separator + rent.get("name").toLowerCase() + ".yml"); plugin.getLogger().warning(" Error: Could not save region file while converting: " + regionsPath + File.separator + rent.get("name").toLowerCase() + ".yml");
} }
} }
plugin.getLogger().info(" Updated rent regions to new .yml format (check the /regions folder)");
} }
// Change version number // Change version number
@ -624,7 +711,7 @@ public class FileManager {
buys = (HashMap<String,HashMap<String,String>>)input.readObject(); buys = (HashMap<String,HashMap<String,String>>)input.readObject();
input.close(); input.close();
} catch (IOException | ClassNotFoundException | ClassCastException e) { } catch (IOException | ClassNotFoundException | ClassCastException e) {
plugin.getLogger().warning("Error: Something went wrong reading file: " + buyPath); plugin.getLogger().warning(" Error: Something went wrong reading file: " + buyPath);
} }
// Delete the file if it is totally wrong // Delete the file if it is totally wrong
if(buys == null) { if(buys == null) {
@ -636,7 +723,7 @@ public class FileManager {
try { try {
Files.move(new File(buyPath), new File(oldFolderPath + "buys")); Files.move(new File(buyPath), new File(oldFolderPath + "buys"));
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().info("Could not create a backup of '" + buyPath + "', check the file permissions (conversion to next version continues)"); plugin.getLogger().info(" Could not create a backup of '" + buyPath + "', check the file permissions (conversion to next version continues)");
} }
// Check if conversion is needed // Check if conversion is needed
if(versions.get("buys") < 1) { if(versions.get("buys") < 1) {
@ -661,10 +748,9 @@ public class FileManager {
/* Change to version 0 */ /* Change to version 0 */
versions.put("buys", 0); versions.put("buys", 0);
} }
plugin.getLogger().info("Updated version of '" + buyPath + "' from -1 to 0 (switch to using lowercase region names, adding default schematic enabling and profile)"); plugin.getLogger().info(" Updated version of '" + buyPath + "' from -1 to 0 (switch to using lowercase region names, adding default schematic enabling and profile)");
} }
if(versions.get("buys") < 1) { if(versions.get("buys") < 1) {
plugin.getLogger().info("Starting UUID conversion of '" + buyPath + "', could take a while");
for(String buyName : buys.keySet()) { for(String buyName : buys.keySet()) {
HashMap<String,String> buy = buys.get(buyName); HashMap<String,String> buy = buys.get(buyName);
if(buy.get("player") != null) { if(buy.get("player") != null) {
@ -676,7 +762,7 @@ public class FileManager {
/* Change version to 1 */ /* Change version to 1 */
versions.put("buys", 1); versions.put("buys", 1);
} }
plugin.getLogger().info("Updated version of '" + buyPath + "' from 0 to 1 (switch to UUID's for player identification)"); plugin.getLogger().info(" Updated version of '" + buyPath + "' from 0 to 1 (switch to UUID's for player identification)");
} }
} }
@ -687,27 +773,27 @@ public class FileManager {
} }
for(HashMap<String, String> buy : buys.values()) { for(HashMap<String, String> buy : buys.values()) {
YamlConfiguration config = new YamlConfiguration(); YamlConfiguration config = new YamlConfiguration();
config.set("name", buy.get("name").toLowerCase()); config.set("general.name", buy.get("name").toLowerCase());
config.set("buy.world", buy.get("world")); config.set("general.type", "buy");
config.set("buy.signLocation.world", buy.get("world")); config.set("general.world", buy.get("world"));
config.set("buy.signLocation.x", Double.parseDouble(buy.get("x"))); config.set("general.signs.0.location.world", buy.get("world"));
config.set("buy.signLocation.y", Double.parseDouble(buy.get("y"))); config.set("general.signs.0.location.x", Double.parseDouble(buy.get("x")));
config.set("buy.signLocation.z", Double.parseDouble(buy.get("z"))); config.set("general.signs.0.location.y", Double.parseDouble(buy.get("y")));
config.set("general.signs.0.location.z", Double.parseDouble(buy.get("z")));
config.set("buy.price", Double.parseDouble(buy.get("price"))); config.set("buy.price", Double.parseDouble(buy.get("price")));
config.set("buy.duration", buy.get("duration"));
if(buy.get("restore") != null && !buy.get("restore").equals("general")) { if(buy.get("restore") != null && !buy.get("restore").equals("general")) {
config.set("buy.enableRestore", buy.get("restore")); config.set("general.enableRestore", buy.get("restore"));
} }
if(buy.get("profile") != null && !buy.get("profile").equals("default")) { if(buy.get("profile") != null && !buy.get("profile").equals("default")) {
config.set("buy.restoreProfile", buy.get("profile")); config.set("general.schematicProfile", buy.get("profile"));
} }
if(buy.get("tpx") != null) { if(buy.get("tpx") != null) {
config.set("buy.teleportLocation.world", buy.get("world")); config.set("general.teleportLocation.world", buy.get("world"));
config.set("buy.teleportLocation.x", Double.parseDouble(buy.get("tpx"))); config.set("general.teleportLocation.x", Double.parseDouble(buy.get("tpx")));
config.set("buy.teleportLocation.y", Double.parseDouble(buy.get("tpy"))); config.set("general.teleportLocation.y", Double.parseDouble(buy.get("tpy")));
config.set("buy.teleportLocation.z", Double.parseDouble(buy.get("tpz"))); config.set("general.teleportLocation.z", Double.parseDouble(buy.get("tpz")));
config.set("buy.teleportLocation.yaw", Double.parseDouble(buy.get("tpyaw"))); config.set("general.teleportLocation.yaw", buy.get("tpyaw"));
config.set("buy.teleportLocation.pitch", Double.parseDouble(buy.get("tppitch"))); config.set("general.teleportLocation.pitch", buy.get("tppitch"));
} }
if(buy.get("playeruuid") != null) { if(buy.get("playeruuid") != null) {
config.set("buy.buyer", buy.get("playeruuid")); config.set("buy.buyer", buy.get("playeruuid"));
@ -715,9 +801,10 @@ public class FileManager {
try { try {
config.save(new File(regionsPath + File.separator + buy.get("name").toLowerCase() + ".yml")); config.save(new File(regionsPath + File.separator + buy.get("name").toLowerCase() + ".yml"));
} catch (IOException e) { } catch (IOException e) {
plugin.getLogger().warning("Error: Could not save region file while converting: " + regionsPath + File.separator + buy.get("name").toLowerCase() + ".yml"); plugin.getLogger().warning(" Error: Could not save region file while converting: " + regionsPath + File.separator + buy.get("name").toLowerCase() + ".yml");
} }
} }
plugin.getLogger().info(" Updated buy regions to new .yml format (check the /regions folder)");
} }
// Change version number // Change version number
@ -730,7 +817,10 @@ public class FileManager {
try { try {
Files.move(new File(rentPath + ".old"), new File(oldFolderPath + "rents.old")); Files.move(new File(rentPath + ".old"), new File(oldFolderPath + "rents.old"));
Files.move(new File(buyPath + ".old"), new File(oldFolderPath + "buys.old")); Files.move(new File(buyPath + ".old"), new File(oldFolderPath + "buys.old"));
Files.move(new File(plugin.getDataFolder() + File.separator + "config.yml"), new File(oldFolderPath + "config.yml"));
} catch (Exception e) {} } catch (Exception e) {}
plugin.getLogger().info("Conversion to new version of the file format complete, this should not show up anymore next restart/reload");
} }
/** /**
@ -741,6 +831,137 @@ public class FileManager {
public ConfigurationSection getGroupSettings(String groupName) { public ConfigurationSection getGroupSettings(String groupName) {
return groupsConfig.getConfigurationSection(groupName.toLowerCase()); return groupsConfig.getConfigurationSection(groupName.toLowerCase());
} }
/**
* Set a setting for a group
* @param group The group to set it for
* @param path The path to set
* @param setting The value to set
*/
public void setGroupSetting(RegionGroup group, String path, Object setting) {
groupsConfig.set(group.getName().toLowerCase() + "." + path, setting);
}
// UTILITIES
/**
* Get all AreaShop regions intersecting with a WorldEdit selection
* @param selection The selection to check
* @return A list with all the AreaShop regions intersecting with the selection
*/
public List<GeneralRegion> getASRegionsInSelection(Selection selection) {
ArrayList<GeneralRegion> result = new ArrayList<GeneralRegion>();
for(ProtectedRegion region : getWERegionsInSelection(selection)) {
GeneralRegion asRegion = getRegion(region.getId());
if(asRegion != null) {
result.add(asRegion);
}
}
return result;
}
public List<GeneralRegion> getASRegionsByLocation(Location location) {
Selection selection = new CuboidSelection(location.getWorld(), location, location);
return getASRegionsInSelection(selection);
}
public List<ProtectedRegion> getWERegionsInSelection(Selection selection) {
// Get all regions inside or intersecting with the WorldEdit selection of the player
World world = selection.getWorld();
RegionManager regionManager = plugin.getWorldGuard().getRegionManager(world);
ArrayList<ProtectedRegion> result = new ArrayList<ProtectedRegion>();
Location selectionMin = selection.getMinimumPoint();
Location selectionMax = selection.getMaximumPoint();
for(ProtectedRegion region : regionManager.getRegions().values()) {
BlockVector regionMin = region.getMinimumPoint();
BlockVector regionMax = region.getMaximumPoint();
if(
( // x part, resolves to true if the selection and region overlap anywhere on the x-axis
(regionMin.getBlockX() <= selectionMax.getBlockX() && regionMin.getBlockX() >= selectionMin.getBlockX())
|| (regionMax.getBlockX() <= selectionMax.getBlockX() && regionMax.getBlockX() >= selectionMin.getBlockX())
|| (selectionMin.getBlockX() >= regionMin.getBlockX() && selectionMin.getBlockX() <= regionMax.getBlockX())
|| (selectionMax.getBlockX() >= regionMin.getBlockX() && selectionMax.getBlockX() <= regionMax.getBlockX())
) && ( // Y part, resolves to true if the selection and region overlap anywhere on the y-axis
(regionMin.getBlockY() <= selectionMax.getBlockY() && regionMin.getBlockY() >= selectionMin.getBlockY())
|| (regionMax.getBlockY() <= selectionMax.getBlockY() && regionMax.getBlockY() >= selectionMin.getBlockY())
|| (selectionMin.getBlockY() >= regionMin.getBlockY() && selectionMin.getBlockY() <= regionMax.getBlockY())
|| (selectionMax.getBlockY() >= regionMin.getBlockY() && selectionMax.getBlockY() <= regionMax.getBlockY())
) && ( // Z part, resolves to true if the selection and region overlap anywhere on the z-axis
(regionMin.getBlockZ() <= selectionMax.getBlockZ() && regionMin.getBlockZ() >= selectionMin.getBlockZ())
|| (regionMax.getBlockZ() <= selectionMax.getBlockZ() && regionMax.getBlockZ() >= selectionMin.getBlockZ())
|| (selectionMin.getBlockZ() >= regionMin.getBlockZ() && selectionMin.getBlockZ() <= regionMax.getBlockZ())
|| (selectionMax.getBlockZ() >= regionMin.getBlockZ() && selectionMax.getBlockZ() <= regionMax.getBlockZ())
)
) {
result.add(region);
}
}
return result;
}
/**
* Get a list of regions around a location
* - Returns highest priority, child instead of parent regions
* @param location The location to check for regions
* @return empty list if no regions found, 1 member if 1 region is a priority, more if regions with the same priority
*/
public List<ProtectedRegion> getApplicableRegions(Location location) {
List<ProtectedRegion> result = new ArrayList<ProtectedRegion>();
// If the secondLine does not contain a name try to find the region by location
ApplicableRegionSet regions = plugin.getWorldGuard().getRegionManager(location.getWorld()).getApplicableRegions(location);
if(regions != null) {
boolean first = true;
for(ProtectedRegion pr : regions) {
if(first) {
result.add(pr);
first = false;
} else {
if(pr.getPriority() > result.get(0).getPriority()) {
result.clear();
result.add(pr);
} else if(pr.getParent() != null && pr.getParent().equals(result.get(0))) {
result.clear();
result.add(pr);
} else {
result.add(pr);
}
}
}
}
return result;
}
public List<GeneralRegion> getApplicalbeASRegions(Location location) {
List<GeneralRegion> result = new ArrayList<GeneralRegion>();
// If the secondLine does not contain a name try to find the region by location
ApplicableRegionSet regions = plugin.getWorldGuard().getRegionManager(location.getWorld()).getApplicableRegions(location);
if(regions != null) {
List<GeneralRegion> candidates = new ArrayList<GeneralRegion>();
for(ProtectedRegion pr : regions) {
GeneralRegion region = getRegion(pr.getId());
if(region != null) {
candidates.add(region);
}
}
boolean first = true;
for(GeneralRegion region : candidates) {
if(first) {
result.add(region);
first = false;
} else {
if(region.getRegion().getPriority() > result.get(0).getRegion().getPriority()) {
result.clear();
result.add(region);
} else if(region.getRegion().getParent() != null && region.getRegion().getParent().equals(result.get(0))) {
result.clear();
result.add(region);
} else {
result.add(region);
}
}
}
}
return result;
}
} }

85
AreaShop/src/nl/evolutioncoding/AreaShop/RightClickListener.java
View File

@ -1,85 +0,0 @@
package nl.evolutioncoding.AreaShop;
import java.util.List;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
public class RightClickListener implements Listener {
AreaShop plugin;
/**
* Constructor
* @param plugin The AreaShop plugin
*/
public RightClickListener(AreaShop plugin) {
this.plugin = plugin;
}
/**
* Called when a player interacts
* @param event The event
*/
@EventHandler(priority = EventPriority.HIGH)
public void onRightClick(PlayerInteractEvent event) {
Block block = event.getClickedBlock();
/* Check for clicking a sign and rightclicking */
if(event.getAction() == Action.RIGHT_CLICK_BLOCK && (block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)) {
/* Check if the rent sign is really the same as a saved rent */
GeneralRegion result = null;
List<GeneralRegion> regions = plugin.getFileManager().getRegions();
for(int i=0; i<regions.size(); i++) {
if(regions.get(i).getSignLocation().equals(block.getLocation())) {
result = regions.get(i);
}
}
if(result != null && result.isRentRegion()) {
((RentRegion)result).rent(event.getPlayer());
/* Cancel placing a block */
event.setCancelled(true);
} else if(result != null && result.isBuyRegion()) {
((BuyRegion)result).buy(event.getPlayer());
/* Cancel placing a block */
event.setCancelled(true);
}
}
}
}

45
AreaShop/src/nl/evolutioncoding/AreaShop/SignBreakListener.java
View File

@ -1,6 +1,7 @@
package nl.evolutioncoding.AreaShop; package nl.evolutioncoding.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion; import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.Material; import org.bukkit.Material;
@ -37,30 +38,25 @@ public final class SignBreakListener implements Listener {
Block block = event.getBlock(); Block block = event.getBlock();
/* Check if it is a sign */ /* Check if it is a sign */
if(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) { if(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) {
Sign sign = (Sign)(block.getState());
/* Check if the rent sign is really the same as a saved rent */ /* Check if the rent sign is really the same as a saved rent */
RentRegion rent = plugin.getFileManager().getRent(sign.getLine(1)); GeneralRegion region = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
BuyRegion buy = plugin.getFileManager().getBuy(sign.getLine(1)); if(region == null) {
if(rent != null && block.getLocation().equals(rent.getSignLocation())) { return;
}
if(region.isRentRegion()) {
/* Remove the rent if the player has permission */ /* Remove the rent if the player has permission */
if(event.getPlayer().hasPermission("areashop.destroyrent")) { if(event.getPlayer().hasPermission("areashop.destroyrent")) {
rent.handleSchematicEvent(RentRegion.RentEvent.DELETED); plugin.getFileManager().removeRent((RentRegion)region, true);
boolean result = plugin.getFileManager().removeRent(sign.getLine(1), true); plugin.message(event.getPlayer(), "destroy-successRent", region.getName());
if(result) {
plugin.message(event.getPlayer(), "destroy-successRent", sign.getLine(1));
}
} else { /* Cancel the breaking of the sign */ } else { /* Cancel the breaking of the sign */
event.setCancelled(true); event.setCancelled(true);
plugin.message(event.getPlayer(), "destroy-noPermissionRent"); plugin.message(event.getPlayer(), "destroy-noPermissionRent");
} }
} else if(buy != null && block.getLocation().equals(buy.getSignLocation())) { } else if(region.isBuyRegion()) {
/* Remove the buy if the player has permission */ /* Remove the buy if the player has permission */
if(event.getPlayer().hasPermission("areashop.destroybuy")) { if(event.getPlayer().hasPermission("areashop.destroybuy")) {
buy.handleSchematicEvent(BuyRegion.BuyEvent.DELETED); plugin.getFileManager().removeBuy((BuyRegion)region, true);
boolean result = plugin.getFileManager().removeBuy(sign.getLine(1), true); plugin.message(event.getPlayer(), "destroy-successBuy", region.getName());
if(result) {
plugin.message(event.getPlayer(), "destroy-successBuy", sign.getLine(1));
}
} else { /* Cancel the breaking of the sign */ } else { /* Cancel the breaking of the sign */
event.setCancelled(true); event.setCancelled(true);
plugin.message(event.getPlayer(), "destroy-noPermissionBuy"); plugin.message(event.getPlayer(), "destroy-noPermissionBuy");
@ -81,21 +77,12 @@ public final class SignBreakListener implements Listener {
Block attachedTo = block.getRelative(((org.bukkit.material.Sign)sign.getData()).getAttachedFace()); Block attachedTo = block.getRelative(((org.bukkit.material.Sign)sign.getData()).getAttachedFace());
if(attachedTo.getType() == Material.AIR){ if(attachedTo.getType() == Material.AIR){
/* Check if the rent sign is really the same as a saved rent */ /* Check if the rent sign is really the same as a saved rent */
RentRegion rent = plugin.getFileManager().getRent(sign.getLine(1)); GeneralRegion region = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
BuyRegion buy = plugin.getFileManager().getBuy(sign.getLine(1)); if(region == null) {
if(rent != null && block.getLocation().equals(rent.getSignLocation())) { return;
/* Remove the rent */
boolean result = plugin.getFileManager().removeRent(sign.getLine(1), true);
if(result) {
plugin.getLogger().info("Renting of region '" + sign.getLine(1) + "' has been removed by indirectly breaking the sign");
}
} else if(buy != null && block.getLocation().equals(buy.getSignLocation())) {
/* Remove the buy */
boolean result = plugin.getFileManager().removeBuy(sign.getLine(1), true);
if(result) {
plugin.getLogger().info("Buying of region '" + sign.getLine(1) + "' has been removed by indirectly breaking the sign");
}
} }
region.removeSign(block.getLocation());
plugin.getLogger().info("A sign of region " + region.getName() + " has been removed by indirectly breaking it (block below/behind is destroyed)");
} }
} }
} }

192
AreaShop/src/nl/evolutioncoding/AreaShop/SignChangeListener.java
View File

@ -1,16 +1,21 @@
package nl.evolutioncoding.AreaShop; package nl.evolutioncoding.AreaShop;
import java.util.List;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.BuyRegion.BuyEvent; import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion.RegionEvent;
import nl.evolutioncoding.AreaShop.regions.RentRegion; import nl.evolutioncoding.AreaShop.regions.RentRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion.RentEvent;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.material.Sign;
import org.bukkit.scheduler.BukkitRunnable;
import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
@ -38,22 +43,22 @@ public final class SignChangeListener implements Listener {
public void onSignChange(SignChangeEvent event) { public void onSignChange(SignChangeEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
/* Check if the sign is meant for this plugin */ // Check if the sign is meant for this plugin
if(event.getLine(0).contains(plugin.config().getString("rentSign"))) { if(event.getLine(0).contains(plugin.config().getString("signTags.rent"))) {
if(!player.hasPermission("areashop.createrent")) { if(!player.hasPermission("areashop.createrent")) {
plugin.message(player, "setup-noPermissionRent"); plugin.message(player, "setup-noPermissionRent");
return; return;
} }
/* Get the other lines */ // Get the other lines
String secondLine = event.getLine(1); String secondLine = event.getLine(1);
String thirdLine = event.getLine(2); String thirdLine = event.getLine(2);
String fourthLine = event.getLine(3); String fourthLine = event.getLine(3);
/* Get the regionManager for accessing regions */ // Get the regionManager for accessing regions
RegionManager regionManager = plugin.getWorldGuard().getRegionManager(event.getPlayer().getWorld()); RegionManager regionManager = plugin.getWorldGuard().getRegionManager(event.getPlayer().getWorld());
/* If the secondLine does not contain a name try to find the region by location */ // If the secondLine does not contain a name try to find the region by location
if(secondLine == null || secondLine.length() == 0) { if(secondLine == null || secondLine.length() == 0) {
ApplicableRegionSet regions = regionManager.getApplicableRegions(event.getBlock().getLocation()); ApplicableRegionSet regions = regionManager.getApplicableRegions(event.getBlock().getLocation());
if(regions != null) { if(regions != null) {
@ -80,7 +85,9 @@ public final class SignChangeListener implements Listener {
} }
} }
/* check if all the lines are correct */ boolean priceSet = fourthLine != null && fourthLine.length() != 0;
boolean durationSet = thirdLine != null && thirdLine.length() != 0;
// check if all the lines are correct
if(secondLine == null || secondLine.length() == 0) { if(secondLine == null || secondLine.length() == 0) {
plugin.message(player, "setup-noRegion"); plugin.message(player, "setup-noRegion");
return; return;
@ -90,52 +97,66 @@ public final class SignChangeListener implements Listener {
} else if(plugin.getFileManager().getRent(secondLine) != null) { } else if(plugin.getFileManager().getRent(secondLine) != null) {
plugin.message(player, "setup-alreadyRentSign"); plugin.message(player, "setup-alreadyRentSign");
return; return;
} else if(thirdLine == null || thirdLine.length() == 0) { } else if(thirdLine != null && thirdLine.length() != 0 && !plugin.checkTimeFormat(thirdLine)) {
plugin.message(player, "setup-noDuration");
return;
} else if(!plugin.checkTimeFormat(thirdLine)) {
plugin.message(player, "setup-wrongDuration"); plugin.message(player, "setup-wrongDuration");
return; return;
} else if(fourthLine == null || fourthLine.length() == 0) {
plugin.message(player, "setup-noPrice");
return;
} else { } else {
/* Check the fourth line */ double price = 0.0;
try { if(priceSet) {
Double.parseDouble(fourthLine); // Check the fourth line
} catch (NumberFormatException e) { try {
plugin.message(player, "setup-wrongPrice"); price = Double.parseDouble(fourthLine);
return; } catch (NumberFormatException e) {
plugin.message(player, "setup-wrongPrice");
return;
}
} }
/* Add rent to the FileManager */ // Add rent to the FileManager
RentRegion rent = new RentRegion(plugin, secondLine, event.getPlayer().getWorld(), event.getBlock().getLocation(), Double.parseDouble(fourthLine), thirdLine); final RentRegion rent = new RentRegion(plugin, secondLine, event.getPlayer().getWorld());
if(priceSet) {
rent.setPrice(price);
}
if(durationSet) {
rent.setDuration(thirdLine);
}
Sign sign = (Sign)event.getBlock().getState().getData();
rent.addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), null);
// Run commands
rent.runEventCommands(RegionEvent.CREATED, true);
plugin.getFileManager().addRent(rent); plugin.getFileManager().addRent(rent);
rent.handleSchematicEvent(RentEvent.CREATED); rent.handleSchematicEvent(RegionEvent.CREATED);
String[] signLines = rent.getSignLines(); // Update the sign later because this event will do it first
for(int i=0; i<signLines.length; i++) { new BukkitRunnable() {
event.setLine(i, signLines[i]); @Override
} public void run() {
rent.updateSigns();
}
}.runTaskLater(plugin, 1);
/* Set the flags for the region */ // Set the flags for the region
rent.updateRegionFlags(); rent.updateRegionFlags();
plugin.message(player, "setup-rentSuccess", rent.getName()); plugin.message(player, "setup-rentSuccess", rent.getName());
// Run commands
rent.runEventCommands(RegionEvent.CREATED, false);
} }
} else if (event.getLine(0).contains(plugin.config().getString("buySign"))) { } else if (event.getLine(0).contains(plugin.config().getString("signTags.buy"))) {
/* Check for permission */ // Check for permission
if(!player.hasPermission("areashop.createbuy")) { if(!player.hasPermission("areashop.createbuy")) {
plugin.message(player, "setup-noPermissionBuy"); plugin.message(player, "setup-noPermissionBuy");
return; return;
} }
/* Get the other lines */ // Get the other lines
String secondLine = event.getLine(1); String secondLine = event.getLine(1);
String thirdLine = event.getLine(2); String thirdLine = event.getLine(2);
/* Get the regionManager for accessing regions */ // Get the regionManager for accessing regions
RegionManager regionManager = plugin.getWorldGuard().getRegionManager(event.getPlayer().getWorld()); RegionManager regionManager = plugin.getWorldGuard().getRegionManager(event.getPlayer().getWorld());
/* If the secondLine does not contain a name try to find the region by location */ // If the secondLine does not contain a name try to find the region by location
if(secondLine == null || secondLine.length() == 0) { if(secondLine == null || secondLine.length() == 0) {
ApplicableRegionSet regions = regionManager.getApplicableRegions(event.getBlock().getLocation()); ApplicableRegionSet regions = regionManager.getApplicableRegions(event.getBlock().getLocation());
if(regions != null) { if(regions != null) {
@ -162,7 +183,8 @@ public final class SignChangeListener implements Listener {
} }
} }
/* Check if all the lines are correct */ boolean priceSet = thirdLine != null && thirdLine.length() != 0;
// Check if all the lines are correct
if(secondLine == null || secondLine.length() == 0) { if(secondLine == null || secondLine.length() == 0) {
plugin.message(player, "setup-noRegion"); plugin.message(player, "setup-noRegion");
return; return;
@ -172,33 +194,95 @@ public final class SignChangeListener implements Listener {
} else if(plugin.getFileManager().getBuy(secondLine) != null) { } else if(plugin.getFileManager().getBuy(secondLine) != null) {
plugin.message(player, "setup-alreadyBuySign"); plugin.message(player, "setup-alreadyBuySign");
return; return;
} else if(thirdLine == null || thirdLine.length() == 0) {
plugin.message(player, "setup-noPrice");
return;
} else { } else {
/* Check the fourth line */ double price = 0.0;
try { if(priceSet) {
Double.parseDouble(thirdLine); // Check the fourth line
} catch (NumberFormatException e) { try {
plugin.message(player, "setup-wrongPrice"); price = Double.parseDouble(thirdLine);
return; } catch (NumberFormatException e) {
plugin.message(player, "setup-wrongPrice");
return;
}
} }
/* Add buy to the FileManager */ // Add buy to the FileManager
BuyRegion buy = new BuyRegion(plugin, secondLine, event.getPlayer().getWorld(), event.getBlock().getLocation(), Double.parseDouble(thirdLine)); final BuyRegion buy = new BuyRegion(plugin, secondLine, event.getPlayer().getWorld());
if(priceSet) {
buy.setPrice(price);
}
Sign sign = (Sign)event.getBlock().getState().getData();
buy.addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), null);
// Run commands
buy.runEventCommands(RegionEvent.CREATED, true);
plugin.getFileManager().addBuy(buy); plugin.getFileManager().addBuy(buy);
buy.handleSchematicEvent(BuyEvent.CREATED); buy.handleSchematicEvent(RegionEvent.CREATED);
String[] signLines = buy.getSignLines(); // Update the sign later because this event will do it first
for(int i=0; i<signLines.length; i++) { new BukkitRunnable() {
event.setLine(i, signLines[i]); @Override
} public void run() {
buy.updateSigns();
/* Set the flags for the region */ }
buy.updateRegionFlags(); }.runTaskLater(plugin, 1);
// Set the flags for the region
buy.updateRegionFlags();
plugin.message(player, "setup-buySuccess", regionManager.getRegion(secondLine).getId()); plugin.message(player, "setup-buySuccess", regionManager.getRegion(secondLine).getId());
// Run commands
buy.runEventCommands(RegionEvent.CREATED, false);
} }
} else if(event.getLine(0).contains(plugin.config().getString("signTags.add"))) {
// Check for permission
if(!player.hasPermission("areashop.addsign")) {
plugin.message(player, "addsign-noPermission");
return;
}
// Get the other lines
String secondLine = event.getLine(1);
String thirdLine = event.getLine(2);
GeneralRegion region = null;
if(secondLine != null && secondLine.length() != 0) {
// Get region by secondLine of the sign
region = plugin.getFileManager().getRegion(secondLine);
if(region == null) {
plugin.message(player, "addsign-noRegion", secondLine);
return;
}
} else {
// Get region by sign position
List<GeneralRegion> regions = plugin.getFileManager().getASRegionsInSelection(new CuboidSelection(event.getBlock().getWorld(), event.getBlock().getLocation(), event.getBlock().getLocation()));
if(regions.isEmpty()) {
plugin.message(player, "addsign-noRegions");
return;
} else if(regions.size() > 1) {
plugin.message(player, "addsign-couldNotDetectSign", regions.get(0).getName(), regions.get(1).getName());
return;
}
region = regions.get(0);
}
Sign sign = (Sign)event.getBlock().getState().getData();
if(thirdLine == null || thirdLine.length() == 0) {
region.addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), null);
plugin.message(player, "addsign-success", region.getName());
} else {
region.addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), thirdLine);
plugin.message(player, "addsign-successProfile", region.getName(), thirdLine);
}
region.save();
// Update the sign later because this event will do it first
final GeneralRegion regionUpdate = region;
new BukkitRunnable() {
@Override
public void run() {
regionUpdate.updateSigns();
}
}.runTaskLater(plugin, 1);
} }
} }
} }

89
AreaShop/src/nl/evolutioncoding/AreaShop/SignClickListener.java Normal file
View File

@ -0,0 +1,89 @@
package nl.evolutioncoding.AreaShop;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion.ClickType;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
public class SignClickListener implements Listener {
AreaShop plugin;
/**
* Constructor
* @param plugin The AreaShop plugin
*/
public SignClickListener(AreaShop plugin) {
this.plugin = plugin;
}
/**
* Called when a player interacts
* @param event The event
*/
@EventHandler(priority = EventPriority.HIGH)
public void onSignClick(PlayerInteractEvent event) {
Block block = event.getClickedBlock();
/* Check for clicking a sign and rightclicking */
if( (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)
&& (block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)) {
/* Check if the rent sign is really the same as a saved rent */
GeneralRegion result = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
if(result == null) {
return;
}
String signName = result.getSignName(block.getLocation());
Player player = event.getPlayer();
// Get the clicktype
ClickType clickType = null;
if(player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
clickType = ClickType.SHIFTLEFTCLICK;
} else if(!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
clickType = ClickType.LEFTCLICK;
} else if(player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
clickType = ClickType.SHIFTRIGHTCLICK;
} else if(!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
clickType = ClickType.RIGHTCLICK;
}
// Run the commands
boolean runned = result.runSignCommands(signName, player, clickType);
// Only cancel event if at least one command has been executed
event.setCancelled(runned);
}
}
}

34
AreaShop/src/nl/evolutioncoding/AreaShop/Utils.java
View File

@ -1,5 +1,7 @@
package nl.evolutioncoding.AreaShop; package nl.evolutioncoding.AreaShop;
import java.util.Collection;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
@ -59,4 +61,36 @@ public class Utils {
} }
return result; return result;
} }
public static String createCommaSeparatedList(Collection<? extends Object> input) {
String result = "";
boolean first = true;
for(Object object : input) {
if(first) {
first = false;
result += object.toString();
} else {
result += ", " + object.toString();
}
}
return result;
}
} }

164
AreaShop/src/nl/evolutioncoding/AreaShop/commands/AddCommand.java Normal file
View File

@ -0,0 +1,164 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion.RegionEvent;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.sk89q.worldedit.bukkit.selections.Selection;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
public class AddCommand extends CommandAreaShop {
public AddCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop add";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.createrent") || target.hasPermission("areashop.createbuy")) {
return plugin.getLanguageManager().getLang("help-add");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(args.length < 2 || args[1] == null || (!"rent".equals(args[1].toLowerCase()) && !"buy".equals(args[1].toLowerCase()))) {
plugin.message(sender, "add-help");
return;
}
boolean isRent = "rent".equals(args[1].toLowerCase());
if((isRent && !sender.hasPermission("areashop.createrent")) || (!isRent && !sender.hasPermission("areashop.createbuy"))) {
plugin.message(sender, "add-noPermission");
return;
}
List<ProtectedRegion> regions = new ArrayList<ProtectedRegion>();
World world = null;
if(args.length == 2) {
if(!(sender instanceof Player)) {
plugin.message(sender, "cmd-weOnlyByPlayer");
return;
}
Player player = (Player)sender;
Selection selection = plugin.getWorldEdit().getSelection(player);
if(selection == null) {
plugin.message(player, "cmd-noSelection");
return;
}
world = selection.getWorld();
regions = plugin.getFileManager().getWERegionsInSelection(selection);
if(regions.size() == 0) {
plugin.message(player, "cmd-noWERegionsFound");
return;
}
} else {
if(sender instanceof Player) {
if(args.length == 4) {
world = Bukkit.getWorld(args[3]);
if(world == null) {
plugin.message(sender, "add-incorrectWorld", args[3]);
return;
}
} else {
world = ((Player)sender).getWorld();
}
} else {
if(args.length < 4) {
plugin.message(sender, "add-specifyWorld");
return;
} else {
world = Bukkit.getWorld(args[3]);
if(world == null) {
plugin.message(sender, "add-incorrectWorld", args[3]);
return;
}
}
}
ProtectedRegion region = plugin.getWorldGuard().getRegionManager(world).getRegion(args[2]);
if(region == null) {
plugin.message(sender, "add-noRegion", args[2]);
return;
}
regions.add(region);
}
ArrayList<String> namesSuccess = new ArrayList<String>();
ArrayList<String> namesFailed = new ArrayList<String>();
for(ProtectedRegion region : regions) {
GeneralRegion asRegion = plugin.getFileManager().getRegion(region.getId());
if(asRegion != null) {
namesFailed.add(region.getId());
} else {
namesSuccess.add(region.getId());
if(isRent) {
RentRegion rent = new RentRegion(plugin, region.getId(), world);
// Run commands
rent.runEventCommands(RegionEvent.CREATED, true);
plugin.getFileManager().addRent(rent);
rent.handleSchematicEvent(RegionEvent.CREATED);
// Set the flags for the region
rent.updateRegionFlags();
// Run commands
rent.runEventCommands(RegionEvent.CREATED, false);
} else {
BuyRegion buy = new BuyRegion(plugin, region.getId(), world);
// Run commands
buy.runEventCommands(RegionEvent.CREATED, true);
plugin.getFileManager().addBuy(buy);
buy.handleSchematicEvent(RegionEvent.CREATED);
// Set the flags for the region
buy.updateRegionFlags();
// Run commands
buy.runEventCommands(RegionEvent.CREATED, false);
}
}
}
if(namesSuccess.size() != 0) {
plugin.message(sender, "add-success", args[1], Utils.createCommaSeparatedList(namesSuccess));
}
if(namesFailed.size() != 0) {
plugin.message(sender, "add-failed", Utils.createCommaSeparatedList(namesFailed));
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result.add("rent");
result.add("buy");
} else if(toComplete == 3) {
// can't get the world so also can't get applicable regions
}
return result;
}
}

132
AreaShop/src/nl/evolutioncoding/AreaShop/commands/AddsignCommand.java Normal file
View File

@ -0,0 +1,132 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.material.Sign;
import org.bukkit.util.BlockIterator;
import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
public class AddsignCommand extends CommandAreaShop {
public AddsignCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop addsign";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.addsign")) {
return plugin.getLanguageManager().getLang("help-addsign");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if (!(sender instanceof Player)) {
plugin.message(sender, "cmd-onlyByPlayer");
return;
}
Player player = (Player)sender;
if(!player.hasPermission("areashop.addsign")) {
plugin.message(sender, "addsign-noPermission");
return;
}
// Get the sign
Block block = null;
BlockIterator blockIterator = new BlockIterator(player, 100);
while(blockIterator.hasNext() && block == null) {
Block next = blockIterator.next();
if(next.getType() != Material.AIR) {
block = next;
}
}
if(block == null || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
plugin.message(sender, "addsign-noSign");
return;
}
GeneralRegion region = null;
if(args.length > 1) {
// Get region by argument
region = plugin.getFileManager().getRegion(args[1]);
if(region == null) {
plugin.message(sender, "addsign-noRegion", args[1]);
return;
}
} else {
// Get region by sign position
List<GeneralRegion> regions = plugin.getFileManager().getASRegionsInSelection(new CuboidSelection(block.getWorld(), block.getLocation(), block.getLocation()));
if(regions.isEmpty()) {
plugin.message(sender, "addsign-noRegions");
return;
} else if(regions.size() > 1) {
plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
return;
}
region = regions.get(0);
}
Sign sign = (Sign)block.getState().getData();
String profile = null;
if(args.length > 2) {
profile = args[2];
Set<String> profiles = plugin.config().getConfigurationSection("signProfiles").getKeys(false);
if(!profiles.contains(profile)) {
plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles));
return;
}
}
GeneralRegion signRegion = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
if(signRegion != null) {
plugin.message(sender, "addsign-alreadyRegistered", signRegion.getName());
return;
}
region.addSign(block.getLocation(), block.getType(), sign.getFacing(), profile);
if(profile == null) {
plugin.message(sender, "addsign-success", region.getName());
} else {
plugin.message(sender, "addsign-successProfile", region.getName(), profile);
}
region.updateSigns();
region.save();
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result.addAll(plugin.getFileManager().getRegionNames());
} else if(toComplete == 3) {
result.addAll(plugin.config().getStringList("signProfiles"));
}
return result;
}
}

15
AreaShop/src/nl/evolutioncoding/AreaShop/commands/BuyCommand.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -32,7 +33,7 @@ public class BuyCommand extends CommandAreaShop {
@Override @Override
public void execute(CommandSender sender, Command command, String[] args) { public void execute(CommandSender sender, Command command, String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
plugin.message(sender, "onlyByPlayer"); plugin.message(sender, "cmd-onlyByPlayer");
return; return;
} }
Player player = (Player)sender; Player player = (Player)sender;
@ -44,7 +45,17 @@ public class BuyCommand extends CommandAreaShop {
region.buy(player); region.buy(player);
} }
} else { } else {
plugin.message(player, "buy-help"); // get the region by location
List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(player.getLocation());
if(regions.size() != 1) {
plugin.message(sender, "buy-help");
} else {
if(!regions.get(0).isRentRegion()) {
plugin.message(sender, "buy-notBuyable");
} else {
((BuyRegion)regions.get(0)).buy(player);
}
}
} }
} }

93
AreaShop/src/nl/evolutioncoding/AreaShop/commands/BuypriceCommand.java
View File

@ -1,93 +0,0 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class BuypriceCommand extends CommandAreaShop {
public BuypriceCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop buyprice";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.buyprice")) {
return plugin.getLanguageManager().getLang("help-buyprice");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.buyprice")) {
plugin.message(sender, "buyprice-noPermission");
return;
}
if(args.length < 3 || args[1] == null || args[2] == null) {
plugin.message(sender, "buyprice-help");
return;
}
BuyRegion buy = plugin.getFileManager().getBuy(args[1]);
if(buy == null) {
plugin.message(sender, "buyprice-notRegistered", args[1]);
return;
}
double price = 0.0;
try {
price = Double.parseDouble(args[2]);
} catch(NumberFormatException e) {
plugin.message(sender, "buyprice-wrongPrice", args[2]);
return;
}
buy.setPrice(price);
buy.save();
plugin.message(sender, "buyprice-success", buy.getName(), args[2]);
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getBuyNames();
}
return result;
}
}

95
AreaShop/src/nl/evolutioncoding/AreaShop/commands/BuyrestoreCommand.java
View File

@ -1,95 +0,0 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class BuyrestoreCommand extends CommandAreaShop {
public BuyrestoreCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop buyrestore";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.buyrestore")) {
return plugin.getLanguageManager().getLang("help-buyrestore");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.buyrestore")) {
plugin.message(sender, "buyrestore-noPermission");
return;
}
if(args.length <= 2 || args[1] == null || args[2] == null) {
plugin.message(sender, "buyrestore-help");
return;
}
BuyRegion buy = plugin.getFileManager().getBuy(args[1]);
if(buy == null) {
plugin.message(sender, "buyrestore-notRegistered", args[1]);
} else {
String value = null;
if(args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("general")) {
value = args[2].toLowerCase();
buy.setRestoreSetting(value);
} else {
plugin.message(sender, "buyrestore-invalidSetting", args[2]);
}
if(value != null) {
if(args.length > 3) {
buy.setRestoreProfile(args[3]);
plugin.message(sender, "buyrestore-successProfile", buy.getName(), value, args[3]);
} else {
plugin.message(sender, "buyrestore-success", buy.getName(), value);
}
buy.save();
}
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getBuyNames();
} else if(toComplete == 3) {
result.add("true");
result.add("false");
result.add("general");
} else if(toComplete == 4) {
result.addAll(plugin.config().getConfigurationSection("buySchematicProfiles").getKeys(false));
}
return result;
}
}

5
AreaShop/src/nl/evolutioncoding/AreaShop/commands/CommandAreaShop.java
View File

@ -1,6 +1,5 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
@ -39,9 +38,7 @@ public abstract class CommandAreaShop {
* @param start The already given start of the command * @param start The already given start of the command
* @return A collection with all the possibilities for argument to complete * @return A collection with all the possibilities for argument to complete
*/ */
public List<String> getTabCompleteList(int toComplete, String[] start) { public abstract List<String> getTabCompleteList(int toComplete, String[] start);
return new ArrayList<String>();
}
/** /**
* Get the argument that comes after the base command that this command reacts to * Get the argument that comes after the base command that this command reacts to

133
AreaShop/src/nl/evolutioncoding/AreaShop/commands/DelCommand.java Normal file
View File

@ -0,0 +1,133 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.sk89q.worldedit.bukkit.selections.Selection;
public class DelCommand extends CommandAreaShop {
public DelCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop del";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.destroyrent") || target.hasPermission("areashop.destroybuy")) {
return plugin.getLanguageManager().getLang("help-del");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.destroybuy") && !sender.hasPermission("areashop.destroyrent")) {
plugin.message(sender, "del-noPermission");
return;
}
if(args.length < 2) {
// Only players can have a selection
if(!(sender instanceof Player)) {
plugin.message(sender, "cmd-weOnlyByPlayer");
return;
}
Player player = (Player)sender;
Selection selection = plugin.getWorldEdit().getSelection(player);
if(selection == null) {
plugin.message(player, "cmd-noSelection");
return;
}
List<GeneralRegion> regions = plugin.getFileManager().getASRegionsInSelection(selection);
if(regions == null || regions.size() == 0) {
plugin.message(player, "cmd-noRegionsFound");
return;
}
// Start removing the region that he has permission for
ArrayList<String> namesSuccess = new ArrayList<String>();
ArrayList<String> namesFailed = new ArrayList<String>();
for(GeneralRegion region : regions) {
if(region.isRentRegion()) {
if(!sender.hasPermission("areashop.destroyrent")) {
namesFailed.add(region.getName());
} else {
plugin.getFileManager().removeRent((RentRegion)region, true);
namesSuccess.add(region.getName());
}
} else if(region.isBuyRegion()) {
if(!sender.hasPermission("areashop.destroybuy")) {
namesFailed.add(region.getName());
} else {
plugin.getFileManager().removeBuy((BuyRegion)region, true);
namesSuccess.add(region.getName());
}
}
}
// send messages
if(namesSuccess.size() != 0) {
plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
}
if(namesFailed.size() != 0) {
plugin.message(sender, "del-failed", Utils.createCommaSeparatedList(namesFailed));
}
} else {
GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
if(region == null) {
plugin.message(sender, "del-noRegion", args[1]);
return;
}
if(region.isRentRegion()) {
/* Remove the rent if the player has permission */
if(sender.hasPermission("areashop.destroyrent")) {
plugin.getFileManager().removeRent((RentRegion)region, true);
plugin.message(sender, "destroy-successRent", region.getName());
} else {
plugin.message(sender, "destroy-noPermissionRent");
}
} else if(region.isBuyRegion()) {
/* Remove the buy if the player has permission */
if(sender.hasPermission("areashop.destroybuy")) {
plugin.getFileManager().removeBuy((BuyRegion)region, true);
plugin.message(sender, "destroy-successBuy", region.getName());
} else {
plugin.message(sender, "destroy-noPermissionBuy");
}
}
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getRegionNames();
}
return result;
}
}

85
AreaShop/src/nl/evolutioncoding/AreaShop/commands/DelsignCommand.java Normal file
View File

@ -0,0 +1,85 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.BlockIterator;
public class DelsignCommand extends CommandAreaShop {
public DelsignCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop delsign";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.delsign")) {
return plugin.getLanguageManager().getLang("help-delsign");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if (!(sender instanceof Player)) {
plugin.message(sender, "cmd-onlyByPlayer");
return;
}
Player player = (Player)sender;
if(!player.hasPermission("areashop.delsign")) {
plugin.message(sender, "delsign-noPermission");
return;
}
// Get the sign
Block block = null;
BlockIterator blockIterator = new BlockIterator(player, 100);
while(blockIterator.hasNext() && block == null) {
Block next = blockIterator.next();
if(next.getType() != Material.AIR) {
block = next;
}
}
if(block == null || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
plugin.message(sender, "delsign-noSign");
return;
}
GeneralRegion region = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
if(region == null) {
plugin.message(sender, "delsign-noRegion");
return;
}
plugin.message(sender, "delsign-success", region.getName());
region.removeSign(block.getLocation());
region.updateSigns();
region.save();
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
return new ArrayList<String>();
}
}

151
AreaShop/src/nl/evolutioncoding/AreaShop/commands/FindCommand.java Normal file
View File

@ -0,0 +1,151 @@
package nl.evolutioncoding.AreaShop.commands;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class FindCommand extends CommandAreaShop {
public FindCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop find";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.find")) {
return plugin.getLanguageManager().getLang("help-find");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.find")) {
plugin.message(sender, "find-noPermission");
return;
}
if (!(sender instanceof Player)) {
plugin.message(sender, "cmd-onlyByPlayer");
return;
}
if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
plugin.message(sender, "find-help");
return;
}
Player player = (Player)sender;
double balance = plugin.getEconomy().getBalance(player);
double maxPrice = 0;
boolean maxPriceSet = false;
if(args.length == 3) {
try {
maxPrice = Double.parseDouble(args[2]);
maxPriceSet = true;
} catch(NumberFormatException e) {
plugin.message(sender, "find-wrongMaxPrice", args[2]);
return;
}
}
if(args[1].equalsIgnoreCase("buy")) {
List<BuyRegion> regions = plugin.getFileManager().getBuys();
for(BuyRegion region : regions) {
if(!region.isSold() && ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))) {
BigDecimal bigDecimal = new BigDecimal(balance);
bigDecimal = bigDecimal.setScale(2, RoundingMode.HALF_UP);
balance = bigDecimal.doubleValue();
if(maxPriceSet) {
plugin.message(player, "find-successMax", "buy", region.getName(), maxPrice);
} else {
plugin.message(player, "find-success", "buy", region.getName(), balance);
}
region.teleportPlayer(player, true);
return;
}
}
BigDecimal bigDecimal = new BigDecimal(balance);
bigDecimal = bigDecimal.setScale(2, RoundingMode.HALF_UP);
balance = bigDecimal.doubleValue();
if(maxPriceSet) {
plugin.message(player, "find-noneFound", "buy", maxPrice);
} else {
plugin.message(player, "find-noneFoundMax", "buy", balance);
}
} else {
List<RentRegion> regions = plugin.getFileManager().getRents();
for(RentRegion region : regions) {
if(!region.isRented() && ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))) {
BigDecimal bigDecimal = new BigDecimal(balance);
bigDecimal = bigDecimal.setScale(2, RoundingMode.HALF_UP);
balance = bigDecimal.doubleValue();
if(maxPriceSet) {
plugin.message(player, "find-successMax", "rent", region.getName(), maxPrice);
} else {
plugin.message(player, "find-success", "rent", region.getName(), balance);
}
region.teleportPlayer(player, true);
return;
}
}
BigDecimal bigDecimal = new BigDecimal(balance);
bigDecimal = bigDecimal.setScale(2, RoundingMode.HALF_UP);
balance = bigDecimal.doubleValue();
if(maxPriceSet) {
plugin.message(player, "find-noneFound", "rent", maxPrice);
} else {
plugin.message(player, "find-noneFoundMax", "rent", balance);
}
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
if(toComplete == 2) {
result.add("buy");
result.add("rent");
}
return result;
}
}

117
AreaShop/src/nl/evolutioncoding/AreaShop/commands/GroupaddCommand.java Normal file
View File

@ -0,0 +1,117 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RegionGroup;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.sk89q.worldedit.bukkit.selections.Selection;
public class GroupaddCommand extends CommandAreaShop {
public GroupaddCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop groupadd";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.groupadd")) {
return plugin.getLanguageManager().getLang("help-groupadd");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.groupadd")) {
plugin.message(sender, "groupadd-noPermission");
return;
}
if(args.length < 2 || args[1] == null) {
plugin.message(sender, "groupadd-help");
return;
}
RegionGroup group = plugin.getFileManager().getGroup(args[1]);
if(group == null) {
group = new RegionGroup(plugin, args[1]);
plugin.getFileManager().addGroup(group);
}
if(args.length == 2) {
if(!(sender instanceof Player)) {
plugin.message(sender, "cmd-weOnlyByPlayer");
return;
}
Player player = (Player)sender;
Selection selection = plugin.getWorldEdit().getSelection(player);
if(selection == null) {
plugin.message(player, "cmd-noSelection");
return;
}
List<GeneralRegion> regions = plugin.getFileManager().getASRegionsInSelection(selection);
if(regions.size() == 0) {
plugin.message(player, "cmd-noRegionsFound");
return;
}
ArrayList<String> namesSuccess = new ArrayList<String>();
ArrayList<String> namesFailed = new ArrayList<String>();
for(GeneralRegion region : regions) {
if(group.addMember(region)) {
namesSuccess.add(region.getName());
} else {
namesFailed.add(region.getName());
}
}
if(namesSuccess.size() != 0) {
plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.createCommaSeparatedList(namesSuccess));
}
if(namesFailed.size() != 0) {
plugin.message(player, "groupadd-weFailed", group.getName(), Utils.createCommaSeparatedList(namesFailed));
}
} else {
GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
if(region == null) {
plugin.message(sender, "groupadd-noRegion", args[2]);
return;
}
if(group.addMember(region)) {
plugin.message(sender, "groupadd-success", region.getName(), group.getName(), group.getMembers().size());
} else {
plugin.message(sender, "groupadd-failed", region.getName(), group.getName());
}
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getGroupNames();
} else if(toComplete == 3) {
result = plugin.getFileManager().getRegionNames();
}
return result;
}
}

117
AreaShop/src/nl/evolutioncoding/AreaShop/commands/GroupdelCommand.java Normal file
View File

@ -0,0 +1,117 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RegionGroup;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.sk89q.worldedit.bukkit.selections.Selection;
public class GroupdelCommand extends CommandAreaShop {
public GroupdelCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop groupdel";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.groupdel")) {
return plugin.getLanguageManager().getLang("help-groupdel");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.groupdel")) {
plugin.message(sender, "groupdel-noPermission");
return;
}
if(args.length < 2 || args[1] == null) {
plugin.message(sender, "groupdel-help");
return;
}
RegionGroup group = plugin.getFileManager().getGroup(args[1]);
if(group == null) {
group = new RegionGroup(plugin, args[1]);
plugin.getFileManager().addGroup(group);
}
if(args.length == 2) {
if(!(sender instanceof Player)) {
plugin.message(sender, "cmd-weOnlyByPlayer");
return;
}
Player player = (Player)sender;
Selection selection = plugin.getWorldEdit().getSelection(player);
if(selection == null) {
plugin.message(player, "cmd-noSelection");
return;
}
List<GeneralRegion> regions = plugin.getFileManager().getASRegionsInSelection(selection);
if(regions.size() == 0) {
plugin.message(player, "cmd-noRegionsFound");
return;
}
ArrayList<String> namesSuccess = new ArrayList<String>();
ArrayList<String> namesFailed = new ArrayList<String>();
for(GeneralRegion region : regions) {
if(group.removeMember(region)) {
namesSuccess.add(region.getName());
} else {
namesFailed.add(region.getName());
}
}
if(namesSuccess.size() != 0) {
plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.createCommaSeparatedList(namesSuccess));
}
if(namesFailed.size() != 0) {
plugin.message(player, "groupdel-weFailed", group.getName(), Utils.createCommaSeparatedList(namesFailed));
}
} else {
GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
if(region == null) {
plugin.message(sender, "groupdel-noRegion", args[2]);
return;
}
if(group.removeMember(region)) {
plugin.message(sender, "groupdel-success", region.getName(), group.getName(), group.getMembers().size());
} else {
plugin.message(sender, "groupdel-failed", region.getName(), group.getName());
}
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getGroupNames();
} else if(toComplete == 3) {
result = plugin.getFileManager().getRegionNames();
}
return result;
}
}

75
AreaShop/src/nl/evolutioncoding/AreaShop/commands/GroupinfoCommand.java Normal file
View File

@ -0,0 +1,75 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.RegionGroup;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class GroupinfoCommand extends CommandAreaShop {
public GroupinfoCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop groupinfo";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.groupinfo")) {
return plugin.getLanguageManager().getLang("help-groupinfo");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.groupinfo")) {
plugin.message(sender, "groupinfo-noPermission");
return;
}
if(args.length < 2 || args[1] == null) {
plugin.message(sender, "groupinfo-help");
return;
}
RegionGroup group = plugin.getFileManager().getGroup(args[1]);
if(group == null) {
plugin.message(sender, "groupinfo-noGroup", args[1]);
return;
}
List<String> members = group.getMembers();
if(members.size() == 0) {
plugin.message(sender, "groupinfo-noMembers", group.getName());
} else {
plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getGroupNames();
}
return result;
}
}

60
AreaShop/src/nl/evolutioncoding/AreaShop/commands/GrouplistCommand.java Normal file
View File

@ -0,0 +1,60 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class GrouplistCommand extends CommandAreaShop {
public GrouplistCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop grouplist";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.grouplist")) {
return plugin.getLanguageManager().getLang("help-grouplist");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.grouplist")) {
plugin.message(sender, "grouplist-noPermission");
return;
}
List<String> groups = plugin.getFileManager().getGroupNames();
if(groups.size() == 0) {
plugin.message(sender, "grouplist-noGroups");
} else {
plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
return new ArrayList<String>();
}
}

9
AreaShop/src/nl/evolutioncoding/AreaShop/commands/HelpCommand.java
View File

@ -1,5 +1,8 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -28,5 +31,11 @@ public class HelpCommand extends CommandAreaShop {
public void execute(CommandSender sender, Command command, String[] args) { public void execute(CommandSender sender, Command command, String[] args) {
plugin.getCommandManager().showHelp(sender); plugin.getCommandManager().showHelp(sender);
} }
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
return result;
}
} }

76
AreaShop/src/nl/evolutioncoding/AreaShop/commands/InfoCommand.java
View File

@ -8,10 +8,13 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion; import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -198,43 +201,78 @@ public class InfoCommand extends CommandAreaShop {
plugin.message(sender, "info-playerHelp"); plugin.message(sender, "info-playerHelp");
} }
} else if(args[1].equalsIgnoreCase("region")) { } else if(args[1].equalsIgnoreCase("region")) {
if(args.length > 2 && args[2] != null) { if(args.length > 1) {
RentRegion rent = null;
RentRegion rent = plugin.getFileManager().getRent(args[2]); BuyRegion buy = null;
BuyRegion buy = plugin.getFileManager().getBuy(args[2]); if(args.length > 2) {
rent = plugin.getFileManager().getRent(args[2]);
if(rent == null) { buy = plugin.getFileManager().getBuy(args[2]);
plugin.message(sender, "info-regionRenting", args[2]);
plugin.message(sender, "info-regionNoRenting", args[2]);
} else { } else {
if(sender instanceof Player) {
// get the region by location
List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(((Player)sender).getLocation());
if(regions.size() != 1) {
plugin.message(sender, "info-regionHelp");
return;
} else {
if(regions.get(0).isRentRegion()) {
rent = (RentRegion)regions.get(0);
} else if(regions.get(0).isBuyRegion()) {
buy = (BuyRegion)regions.get(0);
}
}
} else {
plugin.message(sender, "info-regionHelp");
return;
}
}
if(rent == null && buy == null) {
plugin.message(sender, "info-regionNotExisting", args[2]);
return;
}
if(rent != null) {
plugin.message(sender, "info-regionRenting", rent.getName()); plugin.message(sender, "info-regionRenting", rent.getName());
plugin.message(sender, "info-regionSign", rent.getWorldName(), rent.getSignLocation().getBlockX(), rent.getSignLocation().getBlockY(), rent.getSignLocation().getBlockZ()); List<String> signLocations = new ArrayList<String>();
for(Location location : rent.getSignLocations()) {
signLocations.add(plugin.getLanguageManager().getLang("info-regionSignLocation", location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()));
}
if(signLocations.isEmpty()) {
plugin.message(sender, "info-regionNoSign");
} else {
plugin.message(sender, "info-regionSign", Utils.createCommaSeparatedList(signLocations));
}
plugin.message(sender, "info-regionPriceDuration", rent.getFormattedPrice(), rent.getDurationString()); plugin.message(sender, "info-regionPriceDuration", rent.getFormattedPrice(), rent.getDurationString());
if(!rent.isRented()) { if(!rent.isRented()) {
plugin.message(sender, "info-regionNotRented"); plugin.message(sender, "info-regionNotRented");
} else { } else {
SimpleDateFormat dateFull = new SimpleDateFormat("dd MMMMMMMMMMMMMMMMM yyyy HH:mm"); SimpleDateFormat dateFull = new SimpleDateFormat(plugin.config().getString("timeFormatChat"));
plugin.message(sender, "info-regionRentedBy", rent.getPlayerName(), dateFull.format(rent.getDuration())); plugin.message(sender, "info-regionRentedBy", rent.getPlayerName(), dateFull.format(rent.getRentedUntil()));
} }
if(sender.hasPermission("areashop.rentrestore")) { if(sender.hasPermission("areashop.rentrestore")) {
plugin.message(sender, "info-regionRestore", rent.getRestoreSetting()); plugin.message(sender, "info-regionRestore", rent.isRestoreEnabled());
plugin.message(sender, "info-regionRestoreProfile", rent.getRestoreProfile()); plugin.message(sender, "info-regionRestoreProfile", rent.getRestoreProfile());
} }
if(sender.hasPermission("areashop.teleport")) { if(sender.hasPermission("areashop.teleport")) {
if(rent.getTeleportLocation() == null) { if(rent.getTeleportLocation() == null) {
plugin.message(sender, "info-regionNoTP"); plugin.message(sender, "info-regionNoTP");
} else { } else {
plugin.message(sender, "info-regionTPLocation", rent.getTeleportLocation().getWorld().toString(), rent.getTeleportLocation().getBlockX(), rent.getTeleportLocation().getBlockY(), rent.getTeleportLocation().getBlockZ(), rent.getTeleportLocation().getPitch(), rent.getTeleportLocation().getYaw()); plugin.message(sender, "info-regionTPLocation", rent.getTeleportLocation().getWorld().getName(), rent.getTeleportLocation().getBlockX(), rent.getTeleportLocation().getBlockY(), rent.getTeleportLocation().getBlockZ(), rent.getTeleportLocation().getPitch(), rent.getTeleportLocation().getYaw());
} }
} }
} }
if(buy == null) { if(buy != null) {
plugin.message(sender, "info-regionBuying", args[2]);
plugin.message(sender, "info-regionNoBuying", args[2]);
} else {
plugin.message(sender, "info-regionBuying", buy.getName()); plugin.message(sender, "info-regionBuying", buy.getName());
plugin.message(sender, "info-regionSign", buy.getWorldName(), buy.getSignLocation().getBlockX(), buy.getSignLocation().getBlockY(), buy.getSignLocation().getBlockZ()); List<String> signLocations = new ArrayList<String>();
for(Location location : buy.getSignLocations()) {
signLocations.add(plugin.getLanguageManager().getLang("info-regionSignLocation", location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()));
}
if(signLocations.isEmpty()) {
plugin.message(sender, "info-regionNoSign");
} else {
plugin.message(sender, "info-regionSign", Utils.createCommaSeparatedList(signLocations));
}
plugin.message(sender, "info-regionPrice", buy.getFormattedPrice()); plugin.message(sender, "info-regionPrice", buy.getFormattedPrice());
if(!buy.isSold()) { if(!buy.isSold()) {
plugin.message(sender, "info-regionNotBought"); plugin.message(sender, "info-regionNotBought");
@ -242,7 +280,7 @@ public class InfoCommand extends CommandAreaShop {
plugin.message(sender, "info-regionBoughtBy", buy.getPlayerName()); plugin.message(sender, "info-regionBoughtBy", buy.getPlayerName());
} }
if(sender.hasPermission("areashop.buyrestore")) { if(sender.hasPermission("areashop.buyrestore")) {
plugin.message(sender, "info-regionRestore", buy.getRestoreSetting()); plugin.message(sender, "info-regionRestore", buy.isRestoreEnabled());
plugin.message(sender, "info-regionRestoreProfile", buy.getRestoreProfile()); plugin.message(sender, "info-regionRestoreProfile", buy.getRestoreProfile());
} }
if(sender.hasPermission("areashop.teleport")) { if(sender.hasPermission("areashop.teleport")) {

9
AreaShop/src/nl/evolutioncoding/AreaShop/commands/ReloadCommand.java
View File

@ -1,5 +1,8 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -33,5 +36,11 @@ public class ReloadCommand extends CommandAreaShop {
plugin.message(sender, "reload-noPermission"); plugin.message(sender, "reload-noPermission");
} }
} }
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
return result;
}
} }

15
AreaShop/src/nl/evolutioncoding/AreaShop/commands/RentCommand.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion; import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -32,7 +33,7 @@ public class RentCommand extends CommandAreaShop {
@Override @Override
public void execute(CommandSender sender, Command command, String[] args) { public void execute(CommandSender sender, Command command, String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
plugin.message(sender, "onlyByPlayer"); plugin.message(sender, "cmd-onlyByPlayer");
return; return;
} }
Player player = (Player)sender; Player player = (Player)sender;
@ -44,7 +45,17 @@ public class RentCommand extends CommandAreaShop {
rent.rent(player); rent.rent(player);
} }
} else { } else {
plugin.message(sender, "rent-help"); // get the region by location
List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(player.getLocation());
if(regions.size() != 1) {
plugin.message(sender, "rent-help");
} else {
if(!regions.get(0).isRentRegion()) {
plugin.message(sender, "rent-notRentable");
} else {
((RentRegion)regions.get(0)).rent(player);
}
}
} }
} }

2
AreaShop/src/nl/evolutioncoding/AreaShop/commands/RentdurationCommand.java
View File

@ -54,6 +54,8 @@ public class RentdurationCommand extends CommandAreaShop {
return; return;
} }
rent.setDuration(args[2]+" "+args[3]); rent.setDuration(args[2]+" "+args[3]);
rent.updateRegionFlags();
rent.updateSigns();
rent.save(); rent.save();
plugin.message(sender, "rentduration-success", rent.getName(), rent.getDurationString()); plugin.message(sender, "rentduration-success", rent.getName(), rent.getDurationString());
} }

67
AreaShop/src/nl/evolutioncoding/AreaShop/commands/RentpriceCommand.java
View File

@ -1,67 +0,0 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class RentpriceCommand extends CommandAreaShop {
public RentpriceCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop rentprice";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.rentprice")) {
return plugin.getLanguageManager().getLang("help-rentprice");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.rentprice")) {
plugin.message(sender, "rentprice-noPermission");
return;
}
if(args.length < 3 || args[1] == null || args[2] == null) {
plugin.message(sender, "rentprice-help");
return;
}
RentRegion rent = plugin.getFileManager().getRent(args[1]);
if(rent == null) {
plugin.message(sender, "rentprice-notRegistered", args[1]);
return;
}
double price = 0.0;
try {
price = Double.parseDouble(args[2]);
} catch(NumberFormatException e) {
plugin.message(sender, "rentprice-wrongPrice", args[2]);
return;
}
rent.setPrice(price);
rent.save();
plugin.message(sender, "rentprice-success", rent.getName(), args[2], rent.getDurationString());
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getRentNames();
}
return result;
}
}

77
AreaShop/src/nl/evolutioncoding/AreaShop/commands/RentrestoreCommand.java
View File

@ -1,77 +0,0 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class RentrestoreCommand extends CommandAreaShop {
public RentrestoreCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop rentrestore";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.rentrestore")) {
return plugin.getLanguageManager().getLang("help-rentrestore");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.rentrestore")) {
plugin.message(sender, "rentrestore-noPermission");
return;
}
if(args.length <= 2 || args[1] == null || args[2] == null) {
plugin.message(sender, "rentrestore-help");
return;
}
RentRegion rent = plugin.getFileManager().getRent(args[1]);
if(rent == null) {
plugin.message(sender, "rentrestore-notRegistered", args[1]);
return;
}
String value = null;
if(args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("general")) {
value = args[2].toLowerCase();
} else {
plugin.message(sender, "rentrestore-invalidSetting", args[2]);
return;
}
rent.setRestoreSetting(value);
if(args.length > 3) {
rent.setRestoreProfile(args[3]);
plugin.message(sender, "rentrestore-successProfile", rent.getName(), value, args[3]);
} else {
plugin.message(sender, "rentrestore-success", rent.getName(), value);
}
rent.save();
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getRentNames();
} else if(toComplete == 3) {
result.add("true");
result.add("false");
result.add("general");
} else if(toComplete == 4) {
result.addAll(plugin.config().getConfigurationSection("rentSchematicProfiles").getKeys(false));
}
return result;
}
}

83
AreaShop/src/nl/evolutioncoding/AreaShop/commands/SchematiceventCommand.java Normal file
View File

@ -0,0 +1,83 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Utils;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion.RegionEvent;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class SchematiceventCommand extends CommandAreaShop {
public SchematiceventCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop schemevent";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.schematicevents")) {
return plugin.getLanguageManager().getLang("help-schemevent");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(args.length < 3 || args[1] == null || args[2] == null) {
plugin.message(sender, "schemevent-help");
return;
}
GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
if(region == null) {
plugin.message(sender, "schemevent-noRegion", args[1]);
return;
}
RegionEvent event = null;
boolean exception = false;
try {
event = RegionEvent.valueOf(args[2].toUpperCase());
} catch(IllegalArgumentException e) {
exception = true;
}
// Check for a totally wrong event or a non matching event
if(exception) {
ArrayList<String> values = new ArrayList<String>();
for(RegionEvent value : RegionEvent.values()) {
values.add(value.getValue().toLowerCase());
}
plugin.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values));
return;
}
region.handleSchematicEvent(event);
plugin.message(sender, "schemevent-success", args[2], region.getName());
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
if(toComplete == 2) {
result.addAll(plugin.getFileManager().getRegionNames());
} else if(toComplete == 3) {
GeneralRegion region = plugin.getFileManager().getRegion(start[2]);
if(region != null) {
if(region.isRentRegion()) {
result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));
} else if(region.isBuyRegion()) {
result.addAll(Arrays.asList("created", "deleted", "bought", "sold"));
}
}
}
return result;
}
}

40
AreaShop/src/nl/evolutioncoding/AreaShop/commands/SellCommand.java
View File

@ -1,7 +1,11 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -30,11 +34,26 @@ public class SellCommand extends CommandAreaShop {
@Override @Override
public void execute(CommandSender sender, Command command, String[] args) { public void execute(CommandSender sender, Command command, String[] args) {
if(args.length <= 1 || args[1] == null) { BuyRegion buy = null;
plugin.message(sender, "sell-help"); if(args.length <= 1) {
return; if(sender instanceof Player) {
// get the region by location
List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(((Player)sender).getLocation());
if(regions.size() != 1) {
plugin.message(sender, "sell-help");
return;
} else {
if(regions.get(0).isBuyRegion()) {
buy = (BuyRegion)regions.get(0);
}
}
} else {
plugin.message(sender, "sell-help");
return;
}
} else {
buy = plugin.getFileManager().getBuy(args[1]);
} }
BuyRegion buy = plugin.getFileManager().getBuy(args[1]);
if(buy == null) { if(buy == null) {
plugin.message(sender, "sell-notRegistered"); plugin.message(sender, "sell-notRegistered");
return; return;
@ -59,6 +78,19 @@ public class SellCommand extends CommandAreaShop {
} }
} }
} }
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
if(toComplete == 2) {
for(BuyRegion region : plugin.getFileManager().getBuys()) {
if(region.isSold()) {
result.add(region.getName());
}
}
}
return result;
}
} }

94
AreaShop/src/nl/evolutioncoding/AreaShop/commands/SetpriceCommand.java Normal file
View File

@ -0,0 +1,94 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class SetpriceCommand extends CommandAreaShop {
public SetpriceCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop setprice";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.setprice")) {
return plugin.getLanguageManager().getLang("help-setprice");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.setprice")) {
plugin.message(sender, "setprice-noPermission");
return;
}
if(args.length < 2 || args[1] == null) {
plugin.message(sender, "setprice-help");
return;
}
GeneralRegion region = null;
if(args.length < 3) {
if(sender instanceof Player) {
// get the region by location
List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(((Player)sender).getLocation());
if(regions.size() != 1) {
plugin.message(sender, "setprice-help");
return;
} else {
region = regions.get(0);
}
} else {
plugin.message(sender, "setprice-help");
return;
}
} else {
region = plugin.getFileManager().getRegion(args[2]);
}
if(region == null) {
plugin.message(sender, "setprice-notRegistered", args[2]);
return;
}
double price = 0.0;
try {
price = Double.parseDouble(args[1]);
} catch(NumberFormatException e) {
plugin.message(sender, "setprice-wrongPrice", args[1]);
return;
}
if(region.isRentRegion()) {
((RentRegion)region).setPrice(price);
plugin.message(sender, "setprice-successRent", region.getName(), ((RentRegion)region).getFormattedPrice(), ((RentRegion)region).getDurationString());
} else if(region.isBuyRegion()) {
((BuyRegion)region).setPrice(price);
plugin.message(sender, "setprice-successBuy", region.getName(), ((BuyRegion)region).getFormattedPrice());
}
region.updateSigns();
region.updateRegionFlags();
region.save();
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getRegionNames();
}
return result;
}
}

77
AreaShop/src/nl/evolutioncoding/AreaShop/commands/SetrestoreCommand.java Normal file
View File

@ -0,0 +1,77 @@
package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
public class SetrestoreCommand extends CommandAreaShop {
public SetrestoreCommand(AreaShop plugin) {
super(plugin);
}
@Override
public String getCommandStart() {
return "areashop setrestore";
}
@Override
public String getHelp(CommandSender target) {
if(target.hasPermission("areashop.setrestore")) {
return plugin.getLanguageManager().getLang("help-setrestore");
}
return null;
}
@Override
public void execute(CommandSender sender, Command command, String[] args) {
if(!sender.hasPermission("areashop.setrestore")) {
plugin.message(sender, "setrestore-noPermission");
return;
}
if(args.length <= 2 || args[1] == null || args[2] == null) {
plugin.message(sender, "setrestore-help");
return;
}
GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
if(region == null) {
plugin.message(sender, "setrestore-notRegistered", args[1]);
return;
}
String value = null;
if(args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("general")) {
value = args[2].toLowerCase();
} else {
plugin.message(sender, "setrestore-invalidSetting", args[2]);
return;
}
region.setRestoreSetting(value);
if(args.length > 3) {
region.setRestoreProfile(args[3]);
plugin.message(sender, "setrestore-successProfile", region.getName(), value, args[3]);
} else {
plugin.message(sender, "setrestore-success", region.getName(), value);
}
region.save();
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
List<String> result = new ArrayList<String>();
if(toComplete == 2) {
result = plugin.getFileManager().getRegionNames();
} else if(toComplete == 3) {
result.add("true");
result.add("false");
result.add("general");
} else if(toComplete == 4) {
result.addAll(plugin.config().getConfigurationSection("schematicProfiles").getKeys(false));
}
return result;
}
}

40
AreaShop/src/nl/evolutioncoding/AreaShop/commands/SetteleportCommand.java
View File

@ -1,5 +1,8 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.BuyRegion; import nl.evolutioncoding.AreaShop.regions.BuyRegion;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion; import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
@ -37,14 +40,24 @@ public class SetteleportCommand extends CommandAreaShop {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
plugin.message(sender, "onlyByPlayer"); plugin.message(sender, "onlyByPlayer");
return; return;
}
if(args.length <= 1 || args[1] == null) {
plugin.message(sender, "setteleport-help");
return;
} }
Player player = (Player) sender; Player player = (Player) sender;
GeneralRegion region = null;
if(args.length <= 1) {
// get the region by location
List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(((Player)sender).getLocation());
if(regions.size() != 1) {
plugin.message(sender, "setteleport-help");
return;
} else {
region = regions.get(0);
}
} else {
region = plugin.getFileManager().getRegion(args[1]);
}
boolean owner = false; boolean owner = false;
GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
if(region == null) { if(region == null) {
plugin.message(player, "setteleport-noRentOrBuy", args[1]); plugin.message(player, "setteleport-noRentOrBuy", args[1]);
return; return;
@ -65,15 +78,26 @@ public class SetteleportCommand extends CommandAreaShop {
ProtectedRegion wgRegion = region.getRegion(); ProtectedRegion wgRegion = region.getRegion();
if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) { if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
region.setTeleport(null); region.setTeleport(null);
plugin.message(player, "setteleport-reset", args[1]); plugin.message(player, "setteleport-reset", region.getName());
return; return;
} }
if(!wgRegion.contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()) && !player.hasPermission(" areashop.setteleportoutsideregion")) { if(!wgRegion.contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()) && !player.hasPermission(" areashop.setteleportoutsideregion")) {
plugin.message(player, "setteleport-notInside", args[1]); plugin.message(player, "setteleport-notInside", region.getName());
return; return;
} }
region.setTeleport(player.getLocation()); region.setTeleport(player.getLocation());
plugin.message(player, "setteleport-success", args[1]); plugin.message(player, "setteleport-success", region.getName());
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
if(toComplete == 2) {
result.addAll(plugin.getFileManager().getRegionNames());
} else if(toComplete == 3) {
result.add("reset");
}
return result;
} }
} }

23
AreaShop/src/nl/evolutioncoding/AreaShop/commands/TeleportCommand.java
View File

@ -1,5 +1,8 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion; import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
@ -31,7 +34,7 @@ public class TeleportCommand extends CommandAreaShop {
@Override @Override
public void execute(CommandSender sender, Command command, String[] args) { public void execute(CommandSender sender, Command command, String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
plugin.message(sender, "onlyByPlayer"); plugin.message(sender, "cmd-onlyByPlayer");
return; return;
} }
if(args.length <= 1 || args[1] == null) { if(args.length <= 1 || args[1] == null) {
@ -44,7 +47,23 @@ public class TeleportCommand extends CommandAreaShop {
plugin.message(player, "teleport-noRentOrBuy", args[1]); plugin.message(player, "teleport-noRentOrBuy", args[1]);
return; return;
} }
region.teleportPlayer(player); if(args.length >= 3 && (args[2].equalsIgnoreCase("sign") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
region.teleportPlayer(player, true);
} else {
region.teleportPlayer(player, false);
}
}
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
if(toComplete == 2) {
result.addAll(plugin.getFileManager().getRegionNames());
} else if(toComplete == 3) {
result.add("sign");
}
return result;
} }
} }

42
AreaShop/src/nl/evolutioncoding/AreaShop/commands/UnrentCommand.java
View File

@ -1,6 +1,10 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.regions.GeneralRegion;
import nl.evolutioncoding.AreaShop.regions.RentRegion; import nl.evolutioncoding.AreaShop.regions.RentRegion;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -30,11 +34,26 @@ public class UnrentCommand extends CommandAreaShop {
@Override @Override
public void execute(CommandSender sender, Command command, String[] args) { public void execute(CommandSender sender, Command command, String[] args) {
if(args.length <= 1 || args[1] == null) { RentRegion rent = null;
plugin.message(sender, "unrent-help"); if(args.length <= 1) {
return; if(sender instanceof Player) {
} // get the region by location
RentRegion rent = plugin.getFileManager().getRent(args[1]); List<GeneralRegion> regions = plugin.getFileManager().getApplicalbeASRegions(((Player)sender).getLocation());
if(regions.size() != 1) {
plugin.message(sender, "unrent-help");
return;
} else {
if(regions.get(0).isRentRegion()) {
rent = (RentRegion)regions.get(0);
}
}
} else {
plugin.message(sender, "unrent-help");
return;
}
} else {
rent = plugin.getFileManager().getRent(args[1]);
}
if(rent == null) { if(rent == null) {
plugin.message(sender, "unrent-notRegistered"); plugin.message(sender, "unrent-notRegistered");
return; return;
@ -59,6 +78,19 @@ public class UnrentCommand extends CommandAreaShop {
} }
} }
} }
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
if(toComplete == 2) {
for(RentRegion region : plugin.getFileManager().getRents()) {
if(region.isRented()) {
result.add(region.getName());
}
}
}
return result;
}
} }

10
AreaShop/src/nl/evolutioncoding/AreaShop/commands/UpdatebuysCommand.java
View File

@ -1,5 +1,8 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -31,11 +34,18 @@ public class UpdatebuysCommand extends CommandAreaShop {
return; return;
} }
boolean result = plugin.getFileManager().updateBuySigns(); boolean result = plugin.getFileManager().updateBuySigns();
plugin.getFileManager().updateBuyRegions();
if(result) { if(result) {
plugin.message(sender, "buys-updated"); plugin.message(sender, "buys-updated");
} else { } else {
plugin.message(sender, "buys-notUpdated"); plugin.message(sender, "buys-notUpdated");
} }
} }
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
return result;
}
} }

8
AreaShop/src/nl/evolutioncoding/AreaShop/commands/UpdaterentsCommand.java
View File

@ -1,5 +1,8 @@
package nl.evolutioncoding.AreaShop.commands; package nl.evolutioncoding.AreaShop.commands;
import java.util.ArrayList;
import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -39,4 +42,9 @@ public class UpdaterentsCommand extends CommandAreaShop {
} }
} }
@Override
public List<String> getTabCompleteList(int toComplete, String[] start) {
ArrayList<String> result = new ArrayList<String>();
return result;
}
} }

223
AreaShop/src/nl/evolutioncoding/AreaShop/regions/BuyRegion.java
View File

@ -1,7 +1,6 @@
package nl.evolutioncoding.AreaShop.regions; package nl.evolutioncoding.AreaShop.regions;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.UUID; import java.util.UUID;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
@ -9,35 +8,33 @@ import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Exceptions.RegionCreateException; import nl.evolutioncoding.AreaShop.Exceptions.RegionCreateException;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class BuyRegion extends GeneralRegion { public class BuyRegion extends GeneralRegion {
/* Enum for schematic event types */
public enum BuyEvent {
CREATED("created"),
DELETED("deleted"),
BOUGHT("bought"),
SOLD("sold");
private final String value;
private BuyEvent(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
public BuyRegion(AreaShop plugin, YamlConfiguration config) throws RegionCreateException { public BuyRegion(AreaShop plugin, YamlConfiguration config) throws RegionCreateException {
super(plugin, config); super(plugin, config);
} }
public BuyRegion(AreaShop plugin, String name, World world, Location signLocation, double price) { public BuyRegion(AreaShop plugin, String name, World world) {
super(plugin, name, world, signLocation); super(plugin, name, world);
setSetting("price", price); }
@Override
public RegionType getType() {
return RegionType.BUY;
}
@Override
public RegionState getState() {
if(isSold()) {
return RegionState.SOLD;
} else {
return RegionState.FORSALE;
}
} }
/** /**
@ -45,7 +42,7 @@ public class BuyRegion extends GeneralRegion {
* @return The UUID of the owner of this region * @return The UUID of the owner of this region
*/ */
public UUID getBuyer() { public UUID getBuyer() {
String buyer = getStringSetting("buyer"); String buyer = getStringSetting("buy.buyer");
if(buyer != null) { if(buyer != null) {
try { try {
return UUID.fromString(buyer); return UUID.fromString(buyer);
@ -54,13 +51,31 @@ public class BuyRegion extends GeneralRegion {
return null; return null;
} }
/**
* Check if a player is the buyer of this region
* @param player Player to check
* @return true if this player owns this region, otherwise false
*/
public boolean isBuyer(Player player) {
UUID buyer = getBuyer();
if(buyer == null || player == null) {
return false;
} else {
return buyer.equals(player.getUniqueId());
}
}
/**
* Set the buyer of this region
* @param buyer The UUID of the player that should be set as buyer
*/
public void setBuyer(UUID buyer) { public void setBuyer(UUID buyer) {
if(buyer == null) { if(buyer == null) {
setSetting("buyer", null); setSetting("buy.buyer", null);
setSetting("buyerName", null); setSetting("buy.buyerName", null);
} else { } else {
setSetting("buyer", buyer.toString()); setSetting("buy.buyer", buyer.toString());
setSetting("buyerName", plugin.toName(buyer)); setSetting("buy.buyerName", plugin.toName(buyer));
} }
} }
@ -85,7 +100,7 @@ public class BuyRegion extends GeneralRegion {
* @return The price of the region * @return The price of the region
*/ */
public double getPrice() { public double getPrice() {
return getDoubleSetting("price"); return getDoubleSetting("buy.price");
} }
/** /**
@ -101,9 +116,19 @@ public class BuyRegion extends GeneralRegion {
* @param price * @param price
*/ */
public void setPrice(double price) { public void setPrice(double price) {
setSetting("price", price); setSetting("buy.price", price);
updateSigns(); }
updateRegionFlags();
@Override
public HashMap<String, Object> getSpecificReplacements() {
// Fill the replacements map with things specific to a BuyRegion
HashMap<String, Object> result = new HashMap<String, Object>();
result.put(AreaShop.tagPrice, getFormattedPrice());
result.put(AreaShop.tagPlayerName, getPlayerName());
result.put(AreaShop.tagPlayerUUID, getBuyer());
// TODO: Add more?
return result;
} }
/** /**
@ -115,30 +140,15 @@ public class BuyRegion extends GeneralRegion {
/* Check if the player has permission */ /* Check if the player has permission */
if(player.hasPermission("areashop.buy")) { if(player.hasPermission("areashop.buy")) {
if(!isSold()) { if(!isSold()) {
/* Check if the player can still buy */ // Check if the player can still buy
int rentNumber = 0; int maximumBuys = getMaxBuyRegions(player);
Iterator<RentRegion> itRent = getFileManager().getRents().iterator(); AreaShop.debug("maximumBuys=" + maximumBuys);
while(itRent.hasNext()) { if(getCurrentBuyRegions(player) >= maximumBuys) {
RentRegion next = itRent.next();
if(player.getUniqueId().equals(next.getRenter())) {
rentNumber++;
}
}
int buyNumber = 0;
Iterator<BuyRegion> itBuy = getFileManager().getBuys().iterator();
while(itBuy.hasNext()) {
BuyRegion next = itBuy.next();
if(player.getUniqueId().equals(next.getBuyer())) {
buyNumber++;
}
}
int maximumBuys = Integer.parseInt(plugin.config().getString("maximumBuys"));
if(maximumBuys != -1 && buyNumber >= maximumBuys) {
plugin.message(player, "buy-maximum", maximumBuys); plugin.message(player, "buy-maximum", maximumBuys);
return false; return false;
} }
int maximumTotal = Integer.parseInt(plugin.config().getString("maximumTotal")); int maximumTotal = getMaxTotalRegions(player);
if(maximumTotal != -1 && (rentNumber+buyNumber) >= maximumTotal) { if(getCurrentTotalRegions(player) >= maximumTotal) {
plugin.message(player, "total-maximum", maximumTotal); plugin.message(player, "total-maximum", maximumTotal);
return false; return false;
} }
@ -152,20 +162,24 @@ public class BuyRegion extends GeneralRegion {
plugin.message(player, "buy-payError"); plugin.message(player, "buy-payError");
return false; return false;
} }
// Run commands
this.runEventCommands(RegionEvent.BOUGHT, true);
/* Set the owner */ /* Set the owner */
setBuyer(player.getUniqueId()); setBuyer(player.getUniqueId());
/* Update everything */ /* Update everything */
handleSchematicEvent(BuyEvent.BOUGHT); handleSchematicEvent(RegionEvent.BOUGHT);
updateSigns(); updateSigns();
updateRegionFlags(); updateRegionFlags(RegionState.SOLD);
/* Send message to the player */ /* Send message to the player */
plugin.message(player, "buy-succes", getName()); plugin.message(player, "buy-succes", getName());
AreaShop.debug(player.getName() + " has bought region " + getName() + " for " + getFormattedPrice()); AreaShop.debug(player.getName() + " has bought region " + getName() + " for " + getFormattedPrice());
this.save(); this.save();
// Run commands
this.runEventCommands(RegionEvent.BOUGHT, false);
return true; return true;
} else { } else {
/* Player has not enough money */ /* Player has not enough money */
@ -189,97 +203,44 @@ public class BuyRegion extends GeneralRegion {
* @param regionName * @param regionName
*/ */
public void sell(boolean giveMoneyBack) { public void sell(boolean giveMoneyBack) {
// Run commands
this.runEventCommands(RegionEvent.SOLD, true);
/* Give part of the buying price back */ /* Give part of the buying price back */
double percentage = plugin.config().getDouble("buyMoneyBack") / 100.0; double percentage = getDoubleSetting("buy.moneyBack") / 100.0;
double moneyBack = getPrice() * percentage; double moneyBack = getPrice() * percentage;
if(moneyBack > 0 && giveMoneyBack) { if(moneyBack > 0 && giveMoneyBack) {
/* Give back the money */ /* Give back the money */
EconomyResponse r = plugin.getEconomy().depositPlayer(Bukkit.getOfflinePlayer(getBuyer()), moneyBack); OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
if(!r.transactionSuccess()) { if(player != null) {
plugin.getLogger().info("Something went wrong with paying back money while unrenting"); EconomyResponse r = null;
} boolean error = false;
try {
r = plugin.getEconomy().depositPlayer(Bukkit.getOfflinePlayer(getBuyer()), moneyBack);
} catch(Exception e) {
error = true;
}
if(error || r == null || !r.transactionSuccess()) {
plugin.getLogger().info("Something went wrong with paying back money to " + getPlayerName() + " while selling region " + getName());
}
}
} }
/* Debug message */ /* Debug message */
AreaShop.debug(getPlayerName() + " has sold " + getName() + ", got " + plugin.formatCurrency(moneyBack) + " money back"); AreaShop.debug(getPlayerName() + " has sold " + getName() + ", got " + plugin.formatCurrency(moneyBack) + " money back");
/* Update everything */
handleSchematicEvent(RegionEvent.SOLD);
updateRegionFlags(RegionState.FORSALE);
/* Remove the player */ /* Remove the player */
setBuyer(null); setBuyer(null);
/* Update everything */
handleSchematicEvent(BuyEvent.SOLD);
updateSigns(); updateSigns();
updateRegionFlags();
this.save(); this.save();
} // Run commands
this.runEventCommands(RegionEvent.SOLD, false);
public String[] getSignLines() {
String[] lines = new String[3];
if(isSold()) {
lines[0] = plugin.fixColors(plugin.config().getString("signBuyed"));
lines[1] = getName();
lines[2] = plugin.toName(getBuyer());
} else {
lines[0] = plugin.fixColors(plugin.config().getString("signBuyable"));
lines[1] = getName();
lines[2] = getFormattedPrice();
}
return lines;
}
@Override
public void updateRegionFlags() {
HashMap<String, String> replacements = new HashMap<String, String>();
replacements.put(AreaShop.tagRegionName, getName());
replacements.put(AreaShop.tagPrice, getFormattedPrice());
replacements.put(AreaShop.tagPlayerName, getPlayerName());
if(isSold()) {
this.setRegionFlags(plugin.config().getConfigurationSection("flagsSold"), replacements);
} else {
this.setRegionFlags(plugin.config().getConfigurationSection("flagsForSale"), replacements);
}
}
/**
* Checks an event and handles saving to and restoring from schematic for it
* @param type The type of event
*/
public void handleSchematicEvent(BuyEvent type) {
// Check for the general killswitch
if(!plugin.config().getBoolean("enableSchematics")) {
return;
}
// Check the individual options
if("false".equalsIgnoreCase(getRestoreSetting())) {
return;
} else if("true".equalsIgnoreCase(getRestoreSetting())) {
} else {
if(!plugin.config().getBoolean("useBuyRestore")) {
return;
}
}
// Get the safe and restore names
String save = plugin.config().getString("buySchematicProfiles." + getRestoreProfile() + "." + type.getValue() + ".save");
if(save == null) {
plugin.config().getString("buySchematicProfiles.default." + type.getValue() + ".save");
}
String restore = plugin.config().getString("buySchematicProfiles." + getRestoreProfile() + "." + type.getValue() + ".restore");
if(restore == null) {
plugin.config().getString("buySchematicProfiles.default." + type.getValue() + ".restore");
}
// Save the region if needed
if(save != null && save.length() != 0) {
save = save.replace(AreaShop.tagRegionName, getName());
this.saveRegionBlocks(save);
}
// Restore the region if needed
if(restore != null && restore.length() != 0) {
restore = restore.replace(AreaShop.tagRegionName, getName());
this.restoreRegionBlocks(restore);
}
} }
} }

867
AreaShop/src/nl/evolutioncoding/AreaShop/regions/GeneralRegion.java
View File

File diff suppressed because it is too large Load Diff

109
AreaShop/src/nl/evolutioncoding/AreaShop/regions/RegionGroup.java
View File

@ -1,5 +1,6 @@
package nl.evolutioncoding.AreaShop.regions; package nl.evolutioncoding.AreaShop.regions;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import nl.evolutioncoding.AreaShop.AreaShop; import nl.evolutioncoding.AreaShop.AreaShop;
@ -11,43 +12,139 @@ public class RegionGroup {
private AreaShop plugin; private AreaShop plugin;
private String name; private String name;
/**
* Constructor, used when creating new groups or restoring them from groups.yml at server boot
* @param plugin The AreaShop plugin
* @param name Name of the group, has to be unique
*/
public RegionGroup(AreaShop plugin, String name) { public RegionGroup(AreaShop plugin, String name) {
this.plugin = plugin; this.plugin = plugin;
this.name = name; this.name = name;
setSetting("name", name);
// Delete duplicates
List<String> members = getMembers();
List<String> newMembers = new ArrayList<String>();
while(!members.isEmpty()) {
String member = members.remove(0);
// If the region has been deleted also clean it from the group
if(plugin.getFileManager().getRegion(member) != null) {
newMembers.add(member);
}
while(members.contains(member)) {
members.remove(member);
}
}
if(newMembers.size() != members.size()) {
setSetting("regions", newMembers);
save();
}
if(getMembers().size() == 0) {
plugin.getFileManager().removeGroup(this);
}
} }
public void addMember(GeneralRegion region) { /**
* Adds a member to a group
* @param region The region to add to the group (GeneralRegion or a subclass of it)
* @return true if the region was not already added, otherwise false
*/
public boolean addMember(GeneralRegion region) {
List<String> members = getMembers(); List<String> members = getMembers();
members.add(region.getName()); if(members.contains(region.getLowerCaseName())) {
plugin.getFileManager().getGroupSettings(name).set("regions", members); return false;
} else {
members.add(region.getName());
setSetting("regions", members);
save();
region.updateSigns();
region.updateRegionFlags();
return true;
}
} }
public void removeMember(GeneralRegion region) { /**
* Remove a member from the group
* @param region The region to remove
* @return true if the region was in the group before, otherwise false
*/
public boolean removeMember(GeneralRegion region) {
List<String> members = getMembers(); List<String> members = getMembers();
boolean result = isMember(region);
members.remove(region.getName()); members.remove(region.getName());
plugin.getFileManager().getGroupSettings(name).set("regions", members); if(members.isEmpty()) {
plugin.getFileManager().removeGroup(this);
} else {
setSetting("regions", members);
}
save();
region.updateSigns();
region.updateRegionFlags();
return result;
} }
/**
* Get all members of the group
* @return A list with the names of all members of the group
*/
public List<String> getMembers() { public List<String> getMembers() {
if(getSettings() == null || getSettings().getStringList("regions") == null) {
return new ArrayList<String>();
}
return getSettings().getStringList("regions"); return getSettings().getStringList("regions");
} }
/**
* Get the name of the group
* @return The name of the group
*/
public String getName() { public String getName() {
return name; return name;
}
/**
* Get the lowercase name of the group (used for getting the config etc)
* @return The name of the group in lowercase
*/
public String getLowerCaseName() {
return getName().toLowerCase();
} }
/**
* Check if a region is member of the group
* @param region Region to check
* @return true if the region is in the group, otherwise false
*/
public boolean isMember(GeneralRegion region) { public boolean isMember(GeneralRegion region) {
return getMembers().contains(region); return getMembers().contains(region.getName());
} }
/**
* Get the priority of the group (higher overwrites)
* @return The priority of the group
*/
public int getPriority() { public int getPriority() {
return getSettings().getInt("priority"); return getSettings().getInt("priority");
} }
/**
* Get the configurationsection with the settings of this group
* @return The ConfigurationSection with the settings of the group
*/
public ConfigurationSection getSettings() { public ConfigurationSection getSettings() {
return plugin.getFileManager().getGroupSettings(name); return plugin.getFileManager().getGroupSettings(name);
} }
/**
* Set a setting of this group
* @param path The path to set
* @param setting The value to set
*/
public void setSetting(String path, Object setting) {
plugin.getFileManager().setGroupSetting(this, path, setting);
}
/**
* Save the group to disk (currently saves all groups because they are all in 1 file)
*/
public void save() { public void save() {
plugin.getFileManager().saveGroups(); plugin.getFileManager().saveGroups();
} }

327
AreaShop/src/nl/evolutioncoding/AreaShop/regions/RentRegion.java
View File

@ -5,7 +5,6 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.UUID; import java.util.UUID;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
@ -13,30 +12,12 @@ import nl.evolutioncoding.AreaShop.AreaShop;
import nl.evolutioncoding.AreaShop.Exceptions.RegionCreateException; import nl.evolutioncoding.AreaShop.Exceptions.RegionCreateException;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class RentRegion extends GeneralRegion { public class RentRegion extends GeneralRegion {
/* Enum for schematic event types */
public enum RentEvent {
CREATED("created"),
DELETED("deleted"),
RENTED("rented"),
UNRENTED("unrented");
private final String value;
private RentEvent(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
/** /**
* Constructor * Constructor
* @param plugin The areashop plugin * @param plugin The areashop plugin
@ -47,10 +28,28 @@ public class RentRegion extends GeneralRegion {
super(plugin, config); super(plugin, config);
} }
public RentRegion(AreaShop plugin, String name, World world, Location signLocation, double price, String duration) { /**
super(plugin, name, world, signLocation); * Create a new RentRegion
setSetting("price", price); * @param plugin The AreaShop plugin
setSetting("duration", duration); * @param name The name of the region (correct casing)
* @param world The world of the WorldGuard region
*/
public RentRegion(AreaShop plugin, String name, World world) {
super(plugin, name, world);
}
@Override
public RegionType getType() {
return RegionType.RENT;
}
@Override
public RegionState getState() {
if(isRented()) {
return RegionState.RENTED;
} else {
return RegionState.FORRENT;
}
} }
/** /**
@ -58,7 +57,7 @@ public class RentRegion extends GeneralRegion {
* @return The UUID of the renter * @return The UUID of the renter
*/ */
public UUID getRenter() { public UUID getRenter() {
String renter = getStringSetting("renter"); String renter = getStringSetting("rent.renter");
if(renter != null) { if(renter != null) {
try { try {
return UUID.fromString(renter); return UUID.fromString(renter);
@ -67,16 +66,80 @@ public class RentRegion extends GeneralRegion {
return null; return null;
} }
/**
* Check if a player is the renter of this region
* @param player Player to check
* @return true if this player rents this region, otherwise false
*/
public boolean isRenter(Player player) {
UUID renter = getRenter();
if(player == null || renter == null) {
return false;
} else {
return renter.equals(player.getUniqueId());
}
}
/**
* Set the renter of this region
* @param renter The UUID of the player that should be set as the renter
*/
public void setRenter(UUID renter) { public void setRenter(UUID renter) {
if(renter == null) { if(renter == null) {
setSetting("renter", null); setSetting("rent.renter", null);
setSetting("renterName", null); setSetting("rent.renterName", null);
} else { } else {
setSetting("renter", renter.toString()); setSetting("rent.renter", renter.toString());
setSetting("renterName", plugin.toName(renter)); setSetting("rent.renterName", plugin.toName(renter));
} }
} }
/**
* Get the max number of extends of this region
* @return -1 if infinite otherwise the maximum number
*/
public int getMaxExtends() {
return getIntegerSetting("rent.maxExtends");
}
/**
* Get how many times the rent has already been extended
* @return The number of times extended
*/
public int getTimesExtended() {
return config.getInt("rent.timesExtended");
}
/**
* Set the number of times the region has been extended
* @param times The number of times the region has been extended
*/
public void setTimesExtended(int times) {
if(times < 0) {
config.set("rent.timesExtended", null);
} else {
config.set("rent.timesExtended", times);
}
}
@Override
public HashMap<String, Object> getSpecificReplacements() {
// Fill the replacements map with things specific to a RentRegion
HashMap<String, Object> result = new HashMap<String, Object>();
result.put(AreaShop.tagPrice, getFormattedPrice());
result.put(AreaShop.tagDuration, getDurationString());
result.put(AreaShop.tagPlayerName, getPlayerName());
result.put(AreaShop.tagPlayerUUID, getRenter());
SimpleDateFormat date = new SimpleDateFormat(plugin.config().getString("timeFormatChat"));
String dateString = date.format(new Date(getRentedUntil()));
result.put(AreaShop.tagRentedUntil, dateString);
date = new SimpleDateFormat(plugin.config().getString("timeFormatSign"));
dateString = date.format(new Date(getRentedUntil()));
result.put(AreaShop.tagRentedUntilShort, dateString);
return result;
}
/** /**
* Check if the region is rented * Check if the region is rented
* @return true if the region is rented, otherwise false * @return true if the region is rented, otherwise false
@ -98,14 +161,18 @@ public class RentRegion extends GeneralRegion {
* @return * @return
*/ */
public long getRentedUntil() { public long getRentedUntil() {
return getLongSetting("rentedUntil"); return getLongSetting("rent.rentedUntil");
} }
/**
* Set the time until the region is rented (milliseconds from 1970, system time)
* @param rentedUntil The time until the region is rented
*/
public void setRentedUntil(Long rentedUntil) { public void setRentedUntil(Long rentedUntil) {
if(rentedUntil == null) { if(rentedUntil == null) {
setSetting("rentedUntil", null); setSetting("rent.rentedUntil", null);
} else { } else {
setSetting("rentedUntil", rentedUntil); setSetting("rent.rentedUntil", rentedUntil);
} }
} }
@ -114,7 +181,7 @@ public class RentRegion extends GeneralRegion {
* @return The price of the region * @return The price of the region
*/ */
public double getPrice() { public double getPrice() {
return getDoubleSetting("price"); return getDoubleSetting("rent.price");
} }
/** /**
@ -164,7 +231,7 @@ public class RentRegion extends GeneralRegion {
* @return The duration string * @return The duration string
*/ */
public String getDurationString() { public String getDurationString() {
return getStringSetting("duration"); return getStringSetting("rent.duration");
} }
/** /**
@ -172,49 +239,15 @@ public class RentRegion extends GeneralRegion {
* @param price * @param price
*/ */
public void setPrice(double price) { public void setPrice(double price) {
setSetting("price", price); setSetting("rent.price", price);
updateSigns();
updateRegionFlags();
} }
/**
* Set the duration of the rent
* @param duration The duration of the rent (as specified on the documentation pages)
*/
public void setDuration(String duration) { public void setDuration(String duration) {
setSetting("duration", duration); setSetting("rent.duration", duration);
updateSigns();
updateRegionFlags();
}
public String[] getSignLines() {
String[] lines = new String[4];
if(isRented()) {
SimpleDateFormat date = new SimpleDateFormat(plugin.config().getString("timeFormatSign"));
String dateString = date.format(new Date(getRentedUntil()));
lines[0] = plugin.fixColors(plugin.config().getString("signRented"));
lines[1] = getName();
lines[2] = getPlayerName();
lines[3] = dateString;
} else {
lines[0] = plugin.fixColors(plugin.config().getString("signRentable"));
lines[1] = getName();
lines[2] = getDurationString();
lines[3] = getFormattedPrice();
}
return lines;
}
@Override
public void updateRegionFlags() {
HashMap<String, String> replacements = new HashMap<String, String>();
replacements.put(AreaShop.tagRegionName, getName());
replacements.put(AreaShop.tagPrice, getFormattedPrice());
replacements.put(AreaShop.tagDuration, getDurationString());
replacements.put(AreaShop.tagPlayerName, getPlayerName());
if(isRented()) {
replacements.put(AreaShop.tagRentedUntil, new SimpleDateFormat(plugin.config().getString("timeFormatChat")).format(getRentedUntil()));
this.setRegionFlags(plugin.config().getConfigurationSection("flagsRented"), replacements);
} else {
this.setRegionFlags(plugin.config().getConfigurationSection("flagsForRent"), replacements);
}
} }
/** /**
@ -223,46 +256,36 @@ public class RentRegion extends GeneralRegion {
* @param regionName The name of the region you want to rent * @param regionName The name of the region you want to rent
* @return true if it succeeded and false if not * @return true if it succeeded and false if not
*/ */
public boolean rent(Player player) { public boolean rent(Player player) {
Block block = getSignLocation().getBlock();
/* Check if the player has permission */ /* Check if the player has permission */
if(player.hasPermission("areashop.rent")) { if(player.hasPermission("areashop.rent")) {
boolean extend = false; boolean extend = false;
if(getRenter() != null && player.getUniqueId().equals(getRenter())) { if(getRenter() != null && player.getUniqueId().equals(getRenter())) {
extend = true; extend = true;
} }
/* Check if the region is available for renting */ // Check if the region is available for renting or if the player wants to extend the rent
if(!isRented() || extend) { if(!isRented() || extend) {
if(!extend) { if(!extend) {
/* Check if the player can still rent */ // Check if the player can still rent more regions
int rentNumber = 0; int maximumRents = getMaxRentRegions(player);
Iterator<RentRegion> itRent = getFileManager().getRents().iterator(); if(getCurrentRentRegions(player) >= maximumRents) {
while(itRent.hasNext()) {
RentRegion next = itRent.next();
if(player.getUniqueId().equals(next.getRenter())) {
rentNumber++;
}
}
int buyNumber = 0;
Iterator<BuyRegion> itBuy = getFileManager().getBuys().iterator();
while(itBuy.hasNext()) {
BuyRegion next = itBuy.next();
if(player.getUniqueId().equals(next.getBuyer())) {
buyNumber++;
}
}
int maximumRents = Integer.parseInt(plugin.config().getString("maximumRents"));
if(maximumRents != -1 && rentNumber >= maximumRents) {
plugin.message(player, "rent-maximum", maximumRents); plugin.message(player, "rent-maximum", maximumRents);
return false; return false;
} }
int maximumTotal = Integer.parseInt(plugin.config().getString("maximumTotal")); int maximumTotal = getMaxTotalRegions(player);
if(maximumTotal != -1 && (rentNumber+buyNumber) >= maximumTotal) { if(getCurrentTotalRegions(player) >= maximumTotal) {
plugin.message(player, "total-maximum", maximumTotal); plugin.message(player, "total-maximum", maximumTotal);
return false; return false;
} }
} }
// Check if the player can still extend this rent
if(extend && !player.hasPermission("areashop.rentextendbypass")) {
if(getMaxExtends() >= 0 && getTimesExtended() >= getMaxExtends()) {
plugin.message(player, "rent-maxExtends", getMaxExtends());
return false;
}
}
if(plugin.getEconomy().has(player, getWorldName(), getPrice())) { if(plugin.getEconomy().has(player, getWorldName(), getPrice())) {
/* Substract the money from the players balance */ /* Substract the money from the players balance */
@ -271,6 +294,13 @@ public class RentRegion extends GeneralRegion {
plugin.message(player, "rent-payError"); plugin.message(player, "rent-payError");
return false; return false;
} }
if(!extend) {
// Run commands
runEventCommands(RegionEvent.RENTED, true);
} else {
// Run commands
runEventCommands(RegionEvent.EXTENDED, true);
}
/* Get the time until the region will be rented */ /* Get the time until the region will be rented */
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
@ -285,13 +315,17 @@ public class RentRegion extends GeneralRegion {
setRentedUntil(calendar.getTimeInMillis()); setRentedUntil(calendar.getTimeInMillis());
setRenter(player.getUniqueId()); setRenter(player.getUniqueId());
// Fire schematic event and updated times extended
if(!extend) { if(!extend) {
this.handleSchematicEvent(RentEvent.RENTED); this.handleSchematicEvent(RegionEvent.RENTED);
setTimesExtended(0);
} else {
setTimesExtended(getTimesExtended() + 1);
} }
/* Change the sign and the region flags */ /* Change the sign and the region flags */
updateSigns(); updateSigns();
updateRegionFlags(); updateRegionFlags(RegionState.RENTED);
/* Send message to the player */ /* Send message to the player */
if(extend) { if(extend) {
@ -303,13 +337,20 @@ public class RentRegion extends GeneralRegion {
AreaShop.debug(player.getName() + " has rented region " + getName() + " for " + getFormattedPrice() + " until " + dateFull.format(calendar.getTime())); AreaShop.debug(player.getName() + " has rented region " + getName() + " for " + getFormattedPrice() + " until " + dateFull.format(calendar.getTime()));
this.save(); this.save();
if(!extend) {
// Run commands
this.runEventCommands(RegionEvent.RENTED, false);
} else {
// Run commands
this.runEventCommands(RegionEvent.EXTENDED, false);
}
return true; return true;
} else { } else {
/* Player has not enough money */ /* Player has not enough money */
if(extend) { if(extend) {
plugin.message(player, "rent-lowMoneyExtend", plugin.formatCurrency(plugin.getEconomy().getBalance(player, block.getWorld().getName())), getFormattedPrice()); plugin.message(player, "rent-lowMoneyExtend", plugin.formatCurrency(plugin.getEconomy().getBalance(player, getWorldName())), getFormattedPrice());
} else { } else {
plugin.message(player, "rent-lowMoneyRent", plugin.formatCurrency(plugin.getEconomy().getBalance(player, block.getWorld().getName())), getFormattedPrice()); plugin.message(player, "rent-lowMoneyRent", plugin.formatCurrency(plugin.getEconomy().getBalance(player, getWorldName())), getFormattedPrice());
} }
} }
} else { } else {
@ -325,80 +366,52 @@ public class RentRegion extends GeneralRegion {
* Unrent a region, reset to unrented * Unrent a region, reset to unrented
* @param regionName Region that should be unrented * @param regionName Region that should be unrented
*/ */
public void unRent(boolean giveMoneyBack) { public void unRent(boolean giveMoneyBack) {
// Run commands
this.runEventCommands(RegionEvent.UNRENTED, true);
/* Get the time until the region will be rented */ /* Get the time until the region will be rented */
Long currentTime = Calendar.getInstance().getTimeInMillis(); Long currentTime = Calendar.getInstance().getTimeInMillis();
Double timeLeft = (double) ((getRentedUntil() - currentTime)); Double timeLeft = (double) ((getRentedUntil() - currentTime));
double percentage = (plugin.config().getDouble("rentMoneyBack")) / 100.0; double percentage = (getDoubleSetting("rent.moneyBack")) / 100.0;
Double timePeriod = (double) (getDuration()); Double timePeriod = (double) (getDuration());
double periods = timeLeft / timePeriod; double periods = timeLeft / timePeriod;
double moneyBack = periods * getPrice() * percentage; double moneyBack = periods * getPrice() * percentage;
if(moneyBack > 0 && giveMoneyBack) { if(moneyBack > 0 && giveMoneyBack) {
/* Give back the money */ /* Give back the money */
EconomyResponse r = plugin.getEconomy().depositPlayer(Bukkit.getOfflinePlayer(getRenter()), moneyBack); OfflinePlayer player = Bukkit.getOfflinePlayer(getRenter());
if(!r.transactionSuccess()) { if(player != null) {
plugin.getLogger().info("Something went wrong with paying back money while unrenting"); EconomyResponse r = null;
} boolean error = false;
try {
r = plugin.getEconomy().depositPlayer(Bukkit.getOfflinePlayer(getRenter()), moneyBack);
} catch(Exception e) {
error = true;
}
if(error || r == null || !r.transactionSuccess()) {
plugin.getLogger().info("Something went wrong with paying back to " + getPlayerName() + " money while unrenting region " + getName());
}
}
} }
/* Debug message */ /* Debug message */
AreaShop.debug(getPlayerName() + " has unrented " + getName() + ", got " + plugin.formatCurrency(moneyBack) + " money back"); AreaShop.debug(getPlayerName() + " has unrented " + getName() + ", got " + plugin.formatCurrency(moneyBack) + " money back");
/* Update the signs and region flags */
handleSchematicEvent(RegionEvent.UNRENTED);
updateRegionFlags(RegionState.FORRENT);
/* Remove the player and renteduntil values */ /* Remove the player and renteduntil values */
setRenter(null); setRenter(null);
setRentedUntil(null); setRentedUntil(null);
setTimesExtended(-1);
/* Update the signs and region flags */
handleSchematicEvent(RentEvent.UNRENTED);
updateSigns(); updateSigns();
updateRegionFlags();
this.save(); this.save();
// Run commands
this.runEventCommands(RegionEvent.UNRENTED, false);
} }
/**
* Checks an event and handles saving to and restoring from schematic for it
* @param type The type of event
*/
public void handleSchematicEvent(RentEvent type) {
// Check for the general killswitch
if(!plugin.config().getBoolean("enableSchematics")) {
return;
}
// Check the individual options
if("false".equalsIgnoreCase(getRestoreSetting())) {
return;
} else if("true".equalsIgnoreCase(getRestoreSetting())) {
} else {
if(!plugin.config().getBoolean("useRentRestore")) {
return;
}
}
// Get the safe and restore names
String save = plugin.config().getString("rentSchematicProfiles." + getRestoreProfile() + "." + type.getValue() + ".save");
if(save == null) {
plugin.config().getString("rentSchematicProfiles.default." + type.getValue() + ".save");
}
String restore = plugin.config().getString("rentSchematicProfiles." + getRestoreProfile() + "." + type.getValue() + ".restore");
if(restore == null) {
plugin.config().getString("rentSchematicProfiles.default." + type.getValue() + ".restore");
}
// Save the region if needed
if(save != null && save.length() != 0) {
save = save.replace(AreaShop.tagRegionName, getName());
this.saveRegionBlocks(save);
}
// Restore the region if needed
if(restore != null && restore.length() != 0) {
restore = restore.replace(AreaShop.tagRegionName, getName());
this.restoreRegionBlocks(restore);
}
}
} }