Commit Graph

167 Commits

Author SHA1 Message Date
Acrobot
22c5e20703 Changed how uName works
(I still don't like the uName class at all, it will probably change in
the near future)
2012-11-23 21:03:02 +01:00
Acrobot
3104ba1b48 Changed /chestshop reload to work with new config 2012-11-23 21:02:15 +01:00
Acrobot
aa35a0aa84 More configuration stuff! 2012-11-23 21:00:35 +01:00
Acrobot
513aeef7b7 Added a new config system 2012-11-23 20:59:12 +01:00
Acrobot
028a18179c Protection from NPE 2012-11-04 21:09:52 +01:00
Acrobot
1e57726b60 I like clean code. 2012-11-04 21:09:38 +01:00
Acrobot
ac71113f3e Added protection from buy and sell prices == 0
Also fixed the formattedItem NPE.
2012-11-03 20:41:28 +01:00
Acrobot
45fa6d5c75 THEN WHO WAS BLOCK?! 2012-11-03 20:40:48 +01:00
Acrobot
cd13f1ce8f Yeah, include server economy account 2012-11-03 20:40:30 +01:00
Acrobot
b0a04c42cc Fixed enchantments -.- 2012-10-28 23:55:27 +01:00
Acrobot
361724f2be Fixed item and price formatting 2012-10-21 22:45:30 +02:00
Acrobot
1bf4651efa Many, many changes
- Added ShopDestroyedEvent
- Fixed signs stacked on each other not working
- Fixed Admin Shops selling materials with metadata
- Fixed shops accepting '0' quantity
- Started working on database stuff
- Split BlockBreak listener to many files
- Added methods to InventoryUtil
- Fixed discounts
2012-10-16 17:03:45 +02:00
Acrobot
1e85e427ca REALLY fixed Admin Shops now
Also, fixed out of stock message to include items.
Oh, and Shift+clicking correctly gets the item amount.
2012-09-20 22:38:11 +02:00
Acrobot
bbeec231ec Added '-' to the supported name character list 2012-09-16 11:53:38 +02:00
Acrobot
a9aa932a6f Fixed Admin Shops' sign removal 2012-09-15 20:48:37 +02:00
Acrobot
773df3bbc3 Really fixed Admin Shops now 2012-09-15 20:32:22 +02:00
Acrobot
228f493b70 Fixed bug that caused non-economically-active admin shops to be out of money. Also, fixed probable bug with enchantments 2012-09-14 23:00:17 +02:00
Acrobot
6707b1bd5e Fixed the inability for admins to create more than one sign on a chest 2012-09-12 13:06:52 +02:00
Acrobot
d421581e89 Improvements 2012-09-12 12:35:48 +02:00
Acrobot
7ef93e7bc1 Fiiiixeees 2012-09-02 22:41:24 +02:00
Acrobot
0a5707c4d8 Small fixes 2012-08-25 12:50:16 +02:00
Acrobot
ef91e8ccb5 Fixes 2012-08-24 21:03:51 +02:00
Andrzej Pomirski
918b728767 Merge pull request #21 from meiamsome/patch-2
Fixed some potential bugs in the economy section
2012-08-24 11:11:52 -07:00
meiamsome
3e04048e67 Renamed serverAccount() to getServerAccountName()
-
2012-08-24 17:36:35 +02:00
Acrobot
c9e9c6a33e Activated Residence Chest protection 2012-08-24 10:45:54 +02:00
Acrobot
002430a147 Added Residence Chest protection 2012-08-24 10:43:46 +02:00
Acrobot
7a8158508a Added a discount module 2012-08-24 10:24:47 +02:00
meiamsome
9196504c68 Fixed some potential bugs.
Removed a hasAccount check from add, subtract and hasEnough. These checks should not exist.
The reasons are:
hasEnough: The default for an account may not have enough to pay for anything. Changed to check if Server Account instead.
add & subtract: Changed the check to only isEmpty. This is because money should not just be created or destroyed.
2012-08-18 21:53:01 +02:00
meiamsome
e7e66b142f Update com/Acrobot/ChestShop/Signs/ChestShopSign.java
Updated to alternate fix.
2012-08-15 01:22:55 +02:00
meiamsome
ebfcfd56f0 Update com/Acrobot/ChestShop/Signs/ChestShopSign.java
Fixes problems with isValid() when used on a sign which has it's price line formatted with lower case letters. Also, uses RegEx to check the price line is valid.
2012-08-14 02:52:56 +02:00
Acrobot
7629c1bc4b Fixed incorrect string ordering 2012-08-10 22:40:49 +02:00
Acrobot
2cd4e7b914 Fixed items incorrectly appearning in messages 2012-08-10 22:25:08 +02:00
Acrobot
30fa329645 Moved packages and fixed logging
Moved packages in a more logical order.
Fixed TransactionLogger using only event.getStock()[0] while logging the
transaction.
Also, TransactionLogger uses string formatter now, instead of a
StringBuilder.
2012-08-10 21:44:32 +02:00
Acrobot
58cd316aa9 There is not ShopCheck class 2012-08-10 19:01:52 +02:00
Acrobot
f096e8eefd PlayerInteract now uses Pre/TransactionEvent 2012-08-10 19:01:34 +02:00
Acrobot
3a1b80d4ef Economy.balance() -> Economy.getBalance() 2012-08-10 19:01:04 +02:00
Acrobot
3d9edc4f3f SignChange listener now check if sign is valid 2012-08-10 19:00:45 +02:00
Acrobot
d7c5aad271 Shop object is deleted 2012-08-10 19:00:28 +02:00
Acrobot
032aff47bb New RestrictedSign class 2012-08-10 19:00:20 +02:00
Acrobot
31e440a771 RestrictedSign now should restrict transactions 2012-08-10 18:59:29 +02:00
Acrobot
1fdc32e230 uBlock now contains the chest neighbor methods 2012-08-10 18:59:10 +02:00
Acrobot
b8d8cdb398 Removed unnecessary Container interface
Added a class which implements Inventory instead
2012-08-10 18:58:45 +02:00
Acrobot
d1dd4b7f5d Added INVALID_SHOP_DETECTED for plugin use 2012-08-10 18:57:10 +02:00
Acrobot
a3eaff47cd Transactions now use Event-Listener system 2012-08-10 18:56:16 +02:00
Acrobot
a467e405c2 Add SecureChests support and Fix Towny integration 2012-07-26 13:44:57 +02:00
Acrobot
d1732552b0 - Made the plugin more event-driven
- Added PreTransactionEvent which can be cancelled
- Fixed not placing B/S before prices
- Updated Heroes
2012-07-07 19:24:06 +02:00
Acrobot
5fd4034c45 Minor fixes 2012-06-25 17:16:57 +02:00
Acrobot
9ef6305a0a Fixed a bug in bukkit (which changed ItemStacks in arguments) 2012-06-25 17:16:41 +02:00
Acrobot
f67990ea48 Changed how dependencies are loaded 2012-06-25 17:16:24 +02:00
Acrobot
c31e902b4a Added chest protection 2012-06-25 17:15:32 +02:00
Acrobot
c63ba4c9a4 Fixed partial transactions
Removed stackAmount from Shop and TransactionEvent's constructor.
2012-06-10 23:32:57 +02:00
Acrobot
5908eb67fa - Added API (let's start with simple things first)
- Copied utilities from ChestShop-4
- Made code really, really nicer to read
- Made every external plugin's wrapper a listener, so it listens to events instead of being hard-coded.
2012-06-08 15:28:36 +02:00
Acrobot
f1ee558e3a - Reformatted code
- Switched from YamlConfiguration to BreezeConfiguration (from ChestShop 4)
- Fixed getDouble()
- Instead of checking for Admin Shops, we just pass in a new AdminShop Container
- Created events for shop creation, protection checks and protection creation
- Expanded string data value parsing, for example - you can use "Ocelot Monster" on the sign
- Collected all external plugin wrappers in a single folder
- Instead of using statics, now we use objects
- Fixed enchantments for armour
- Made config more readable
- Added a setting for removing empty shops
- Switched from System.out to logger
- Also, switched from ugly file logging to Java's native one (FileHandler)
- Added an option to tax transactions even when SERVER_ECONOMY_ACCOUNT is empty
- Changed the Container interface
2012-05-10 16:32:25 +02:00
Acrobot
e28548d534 Changed name of 1 class and 1 variable 2012-04-19 17:12:49 +02:00
Acrobot
7f8fe5e6c1 Instead of generating a new protection, use the new method 2012-04-19 16:37:33 +02:00
Acrobot
bb9f970148 Restructured Property enum 2012-04-19 16:37:15 +02:00
Acrobot
475ba36728 Removed BLOCK_UPDATE (which didn't work) 2012-04-19 16:36:31 +02:00
Acrobot
a71b56e1f7 Fixed MaxPrice 2012-04-19 16:36:01 +02:00
Acrobot
7a3078aedc Fixed Metrics' error message 2012-04-19 16:14:12 +02:00
Acrobot
6faa4321df - Added fancy formatting fo the item name in the chat message
- Fixed consle item fomatting
2012-04-19 16:13:42 +02:00
Acrobot
6bcac6fa01 Fixed getDouble() 2012-04-19 16:05:56 +02:00
Acrobot
e23184d0fa Updated Logging methods 2012-04-19 15:53:23 +02:00
Acrobot
edee5f217f Updated Towny 2012-04-19 15:53:15 +02:00
Acrobot
b1b97bbaf9 Added WorldGuard container protection 2012-04-19 15:53:08 +02:00
Acrobot
e2305225d3 Fixed buying from shops 2012-04-19 15:52:31 +02:00
Acrobot
5da5773879 Added getDefaultProtection() method so the objects gets created only once 2012-04-19 15:51:50 +02:00
Acrobot
e4e7329063 Switched from ugly statics to objects 2012-04-19 15:50:53 +02:00
Acrobot
fc475ff543 Synchronised Queue methods 2012-04-19 15:50:05 +02:00
Acrobot
fce5508aa3 Switched from float to double in economical stuff 2012-04-19 15:49:48 +02:00
Acrobot
9f63103ff3 Changed MaxPrice to also work globally 2012-04-19 15:46:05 +02:00
Acrobot
8156b38785 - Fixed the chest exploit, but still waiting for feedback
- Added new Metrics class
2012-04-16 16:34:00 +02:00
Acrobot
77aa60d2a2 Fixed the last merge 2012-04-07 12:44:58 +02:00
Andrzej Pomirski
12cc59aa35 Merge pull request #19 from Aiquen/master
Added an option to toggle the right-sign-click chest-open feature.
2012-04-07 03:42:06 -07:00
Acrobot
948dcf3653 - Added an option to toggle the WG flag
- Removed old pre-CB 1.1-R6 chest compatibility
- Changed priorities for block destroying
- Synchronised run() in Queue, as it's called from asynch thread.
2012-04-07 12:41:20 +02:00
Aiquen
1ce4191586 Opening chest with right click is bypassing lockette ([private]) access restriction. I don't know, imo chesthop should check event.isCancelled(), but adding this option to config is lesser invasive solution. 2012-04-06 21:24:11 +03:00
Aiquen
7213ca0fe4 Update com/Acrobot/ChestShop/Config/Property.java 2012-04-06 21:17:10 +03:00
Acrobot
d6bdb0486a - Fixed chests in 1.2.3
- Formatting
- Warning about old Bukkit version
- Renamed "TOWNY_CANNOT_CREATE_SHOP_HERE" to "CANNOT_CREATE_SHOP_HERE" to avoid confusion
- Renamed "NOT_ENOUGH_LWC_PROTECTIONS" to "NOT_ENOUGH_PROTECTIONS" and changed its message

- Fixed armour enchantments
- Logging shop location
- Fixed Heroes for the newest version
- Removed redutant plugin object
- Added dev-url for CraftBukkitUpToDate
- Removed redutant plugins from softdepend
- Fixed a bug when the player interacts with a shop with a sign in hand
2012-03-17 15:00:25 +01:00
Acrobot
73e3616238 - Fixed an issue with LWC (defaulting to public protection)
- Fixed an issue with admins not receiving the refund when destroying a shop
2012-03-11 22:56:51 +01:00
Acrobot
e87f5f4f11 - Added a warning if spawn-radius isn't set to 0
- Deleted a few outdated plugins from built-in Register
- System.out -> System.err for errors
- Blocked buying if you're holding a sign in your hand (allows, for example, for sign editors to work)
- Updated Heroes package
- Fixed WG integration (no longer throws errors, but uses ugly workaround)
- Fixed a small bug in Register plugin loading message
- Removed version checking for OddItem, WorldGuard and LWC
2012-03-06 19:41:14 +01:00
Acrobot
7f8af7b5b3 Breaking changes:
- Permissions 2/3 are no longer supported
- Changed ChestShop.shop.create permission to consist of 2 different permissions: ChestShop.shop.create.buy and ChestShop.shop.create.sell
- (Experimental) Ability to add max item prices to the config
- (Experimental) Added a custom "chestshop" WorldGuard flag using reflection

- Switched to new Config system
- Updated Metrics
- Removed chest masking option
2012-03-01 22:03:59 +01:00
Acrobot
a49d51ce97 - Changed to the new, more robust event system
- Added partial transactions (You have 5 items, shop wants 10 - you can sell your items for half the price)
- Added a warning to the HTML generator
- Fixed Towny integration
- Fixed occasional ArrayOutOfBoundsExceptions
- Fixed an error when a shop couldn't be created because a sign (not shop sign) was on other side of the block
- Added SCL (SimpleChestLock) protection plugin to supported plugins
- Updated Metrics (and added a new asynch thread for startup)
- Removed Bukkit-1.0 workaround
- Fixed plugin.yml formatting
2012-02-16 19:09:37 +01:00
Acrobot
c3b084fd1a - Added statistics to the plugin
- Added shop refund message
- Recoded Register for ChestShop
- Added VAULT support (Register is used when no Vault is found)
- Added Heroes exp option for granting exp for shop creation
- EXPERIMENTAL: Option to cause BlockState.update() every transaction (probably doesn't work, as Block.applyPhysics() is needed)
- Added ChestShop.nofee permission for free shop creation (and no refunds)
- Added a separate Admin Shop tax option
-
2012-01-25 16:32:34 +01:00
Acrobot
dc4d9961c1 - Fancy sign formatting :D
- Fixed LWC, Lockette and Default protections
- Added restricted signs (Changed how they work)
- Added an option to use another name
- Fixed a bug where default protection was initialized too many times
- Disallowed players to place another chest near a shop chest
- Speeded up and fixed enchantment and durability in itemstacks
- Changed /iteminfo a bit
- Added /chestshop reload
- Added many default permission kits
- Fixed dye colors
- Added an option to allow towny residents place shops in their town
2012-01-09 22:39:38 +01:00
Acrobot
505dfb3449 - Fixed potion stacking and adding items to stacks with a different durability
- Modified /iteminfo a bit
- Added a message to the DBpage generator
- Added more functions to word datavalue
- Modified the SignChange fourth line formatting
2011-12-20 21:39:45 +01:00
Acrobot
2e489774d8 - Added selling/buying of Enchanted items
- Modified /iteminfo command to show enchantments (and their id)
- Fixed LWC problem
- Added an option to ignore creative mode
- Fixed broken inventory.addItem(ItemStack) (adds up to custom Material max stack amount now) @Bukkit
2011-12-16 17:20:09 +01:00
Acrobot
353dacf1a0 - Fixed block destruction 2011-12-02 11:38:20 +01:00
Acrobot
06ff63ecfd - Added multiple protection plugins work at once
- Added custom LWC protection limit message
- Fixed block destroying
- Added a new permission node, to let people create shops as other user (also usable for Towns, Factions etc.)
2011-12-01 14:02:58 +01:00
Acrobot
637e08e985 Wow, that is ugly now :/
- Added WorldGuard support
- Fixed protection
- Added shop refund price
- Updated Register
2011-10-11 13:15:53 +02:00
Acrobot
9a6b9d0c38 - Added option to tax all transactions
- Updated Register and BukkitEx
- Can't place shops in the wilderness
- Fixed CraftBukkit's piston bug - no more try/catch
2011-09-29 20:29:39 +02:00
Acrobot
4440101a3a - Added support for OddItem 0.8
- Fixed getRetractBlock
2011-09-25 16:17:44 +02:00
Acrobot
06e02cbc3e - Fixed towny integration (grr... java)
- (Tried to) - it shouldn't cause too long message error.
2011-09-23 14:07:20 +02:00
Acrobot
ad51a87175 - Updated Register
- Support for Townie's shop plots
- Doesn't load Towny older than 0.76.0.47 (Yeah, long custom difficult method)
- Replaced onBlockPistonRetract to use custom method instead of try/catch
- You won't sell to your own shop anymore
- Added Towny to dependencies
2011-09-22 15:56:06 +02:00
Acrobot
7ec812a3e1 - Added parenthesis. It fixes a bug with signs... 2011-09-10 20:50:24 +02:00
Acrobot
9a914929d1 - Fixed a bug with admin placed signs 2011-09-09 15:15:53 +02:00
Acrobot
a84c68d49d - Changed how configuration works, so it works with plugin folder in different place
- Added support for Deadbolt
- By default, left clicking your own sign doesn't do anything
- Restricted signs now check if you've got permission ChestShop.group.groupName
- Added support for stacking unstackable things
- Updated Register
- Changed how plugins are loaded.
2011-09-06 19:01:57 +02:00
Acrobot
e47632793a - Added support for new Lockette
- Fixed LWC
2011-09-01 18:59:15 +02:00
Acrobot
fac79282df - Fixed new lines in configs
- Fixed sign protection
- Doesn't protect with LWC if the limit is reached
- Added a message when you paid for shop.
2011-08-31 20:57:10 +02:00
Acrobot
0418629062 - Fixed >64 item selling/buying
- Fixed block destroying
- Broke signChange into more methods
2011-08-26 23:12:32 +02:00
Acrobot
77bbf5de00 - Fixed bug when creating a shop locked by LWC/Lockette 2011-08-15 11:46:01 +02:00
Acrobot
c64627205e Final version.
- Speeded it up
- Added Buy/Sell specified ID permission
- Removed EXCLUDE_ITEM permission - just use normal Permission negating
- Doesn't add more LWC's on an already protected block
- Updated Register
- Added option to turn off messages
2011-08-13 12:08:34 +02:00