Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-12-19 06:47:33 +01:00
Code Issues Projects Releases Wiki Activity
227 Commits 6 Branches 11 Tags 7.3 MiB
198b4fc086
Commit Graph

200 Commits

Author SHA1 Message Date
Acrobot
6f61f3cce0 Spacing! 2012-12-19 18:54:23 +01:00
Acrobot
4ee3e091d7 Un-deprecated the code 2012-12-19 18:49:13 +01:00
Acrobot
f77dddb323 Removed Essentials from built-in Register system - the system has been reported not working properly in Register, please use Vault 2012-12-19 17:50:45 +01:00
Acrobot
7bdcce2826 One missing "!" can make a huge difference 2012-12-18 23:35:13 +01:00
Acrobot
7d377bb068 Updated Metrics class 2012-12-16 21:13:56 +01:00
Acrobot
a5728dc2d0 Yeah, kind of screwed that before :P 2012-11-30 21:50:03 +01:00
Acrobot
ac7a14cab8 Fixed a bug where the piston could break a shop 2012-11-30 14:26:13 +01:00
Acrobot
a781ef51b5 Formatting 2012-11-29 20:28:16 +01:00
Acrobot
69e08d0c7d Fixed item stacking, because Bukkit didn't 
Yay for named loops!
 2012-11-29 20:28:05 +01:00
Acrobot
9fa32c448a Let's use a human-readable name 2012-11-28 21:31:24 +01:00
Acrobot
0f0fd3b60e Fixed OddItem integration 2012-11-28 21:31:03 +01:00
Acrobot
817fdeae3f Added prevention against NPEs in MaterialUtil 2012-11-28 21:30:53 +01:00
Acrobot
a2e9cc81c3 Small fixes & starting to clean up code 2012-11-25 23:34:21 +01:00
Acrobot
cb44575270 Configured all classes to use the newest config 2012-11-23 21:04:13 +01:00
Acrobot
0d22ddc4a4 Fixed errors in PlayerInventoryListener 2012-11-23 21:03:29 +01:00
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
4252ede145 Yes... This too... 2012-11-23 21:01:53 +01:00
Acrobot
724cc4077c A bit of tweaking 2012-11-23 21:01:43 +01:00
Acrobot
9c492ac031 Added a utility method to merge similar stacks 2012-11-23 21:01:29 +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
df0de0ab44 Ready! :D 2012-11-03 20:40:16 +01:00
Acrobot
b1528ddc6f We're coding for SQLite at the moment 2012-11-02 20:48:14 +01:00
Acrobot
533d9eacdd Added a bit of functionality to automatic class parser 2012-11-02 20:12:46 +01:00
Acrobot
51d4cf1b61 I hate you too, GitHub for Windows 2012-10-28 23:56:40 +01:00
Acrobot
efc8a32f98 Database stuffffff 2012-10-28 23:55:30 +01:00
Acrobot
aed6eff863 Fixed enchantments -.- 2012-10-28 23:55:29 +01:00
Acrobot
b0a04c42cc Fixed enchantments -.- 2012-10-28 23:55:27 +01:00
Cyprias
7cb8cafd01 * Fixed enchants not being added to items. 2012-10-28 14:22:11 -06:00
Acrobot
8c5d0f9c01 Started working on the database stuff :D 2012-10-21 22:46:16 +02:00
Acrobot
988a3a549c Using libraries built in Bukkit > manually 2012-10-21 22:46:00 +02: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
80f658e748 Added roundDown 
Added another round function as required.
 2012-08-18 21:56:46 +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
92aeee4a86 Trying to fix "Item not recognised" message 2012-08-10 18:54:49 +02:00
Acrobot
a467e405c2 Add SecureChests support and Fix Towny integration 2012-07-26 13:44:57 +02:00
Acrobot
47dc473163 Fix negative prices 2012-07-26 13:44:29 +02:00
Acrobot
919b9728f5 Fix enchantment detection 2012-07-26 13:44:19 +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
ec5092900b Fixed FREE shops 2012-06-25 17:15:10 +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