Upstream/Brewery
1
0
Fork 0
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-06-28 10:44:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
357 Commits 5 Branches 29 Tags 4 MiB
c474ccb9dd
Commit Graph

298 Commits

Author SHA1 Message Date
Sn0wStorm
15a3a5e701 Always recognize "Barrel" on sign 2016-06-27 20:14:29 +02:00
Sn0wStorm
a31247efca Fix Brews bugging in the distiller without glowstone 
Fixes #127
 2016-06-27 20:06:41 +02:00
Sn0wStorm
dfe8e09638 Also check Off hand for ingredients 
Fixes #132
 2016-06-20 23:30:20 +02:00
Sn0wStorm
b3a5013a7f Always use item in Main hand for Cauldron 
Fixes #130
 2016-06-17 22:09:04 +02:00
Sn0wStorm
8aed3df0c6 Extract new default configs when config is updating 2016-05-30 01:00:52 +02:00
Sn0wStorm
20c68454f4 Fixed base effect applying 2016-05-30 00:30:55 +02:00
Sn0wStorm
41c6782635 Implemented puke item despawn time, defaults to 1 min 2016-05-27 21:38:15 +02:00
Sn0wStorm
581dd69f38 Use Java 7 Language Level 2016-05-27 19:31:05 +02:00
Sn0wStorm
816dacf76b Removed longer passing out/overdrinking 2016-05-26 21:26:51 +02:00
Sn0wStorm
85acdcdbb6 Changed some config settings and descriptions 2016-05-26 21:10:48 +02:00
Sn0wStorm
d5296bdc8c Check loading Recipes better for validity 2016-05-25 20:01:28 +02:00
Sn0wStorm
6641cec20e Inform the reloading Player of any Errors 2016-05-25 19:22:29 +02:00
Sn0wStorm
169045839e Prepare the feature check for MC1.10 2016-05-23 18:49:33 +02:00
Sn0wStorm
41660c9b4f Release 1.4.2 for 1.9.x 
Fixed the BrewEvent firing and double distilling sometimes in 1.9
 2016-05-19 01:05:48 +02:00
Sn0wStorm
bf57320057 Store last updated time for brews 2016-05-18 22:31:32 +02:00
Sn0wStorm
024c05b817 Convert Potions for 1.9 
Convert existing brews to show correct color and lore
 2016-05-18 20:28:28 +02:00
Sn0wStorm
37ecf87276 Fix Potion Colors, using PotionType 
Workaround additional misleading effects showing in Lore by hiding all Potion Effects
 2016-04-27 21:28:42 +02:00
Sn0wStorm
0f38ef008f Fixed too much drunk-pushing in 1.9 2016-04-23 18:51:29 +02:00
Sn0wStorm
468b90be43 Changes for Distilling and 1.9 2016-04-23 17:45:01 +02:00
Daniel Boston
03c00f258e Replacing the potion data avoids the NPE and appears to avoid applying the main effect as desired. 2016-04-21 21:45:35 -04:00
ProgrammerDan
66297bd2e5 Addressing (hopefully) npe in Compat listener. 2016-04-21 18:50:04 -04:00
Daniel Boston
14962a2820 Testing done, should be ready for live. Fixed some issues with inventory scan timing, gotta love asynch. 2016-04-21 01:36:26 -04:00
Daniel Boston
0a91fec591 Distilling now functions in MC 1.9 via artificial tracking of distillation requirement satisfaction. Testing has been limited so far, but appears consistent with 1.8 behavior. Restarting the server will effectively cancel any ongoing brewing, and it will not begin again until manual interaction after restart. Other then that, should be as usual. 2016-04-20 23:55:15 -04:00
ProgrammerDan
76976ba12d qfix for infinite loop and brewtime 2016-04-20 17:17:23 -04:00
Daniel Boston
54e47bcf02 Adding new listeners to emulate prior behavior. Needs work. 2016-04-20 00:13:21 -04:00
Daniel Boston
950d36823d Testing illustrates that the brew event is being called for invalid brews any more, which brewery was leveraging. For distillation, a new way of approaching things is now required. 2016-04-19 07:59:18 -04:00
ProgrammerDan
2d0d059008 Slight adjustment to Sataniel's fixes to preserve tab-based indentation for easy merge compare. 2016-04-18 18:15:30 -04:00
Daniel Saukel
ddaa2bdbfc Update to GriefPrevention 13.9.1 2016-03-21 20:36:09 +01:00
Daniel Saukel
7a514d5378 Update to 1.9 2016-03-21 20:35:12 +01:00
Sn0wStorm
08a025fff6 Check if update is actually newer 2015-03-16 20:43:14 +01:00
Sn0wStorm
82837e1977 Allow all ingedients of recipes into the cauldron 2015-03-16 16:31:45 +01:00
Sn0wStorm
b8e0f1f38b Try to find Items with Vault 
Makes adding Ingredients a lot easier, as Vault has a great database of item names.
Will match things like "green dye", or even "stained glass pane green"
 2015-03-16 15:59:44 +01:00
Sn0wStorm
834804e44f Update Metrics 2015-03-16 15:08:55 +01:00
Sn0wStorm
02b909a26a Fixed cauldron duplication bug 2015-03-14 21:57:56 +01:00
Sn0wStorm
1f16c6af04 Added 1.8 Fences 2015-01-10 22:51:01 +01:00
Sn0wStorm
bc56fc8770 Barrel implements InventoryHolder 2015-01-10 00:15:13 +01:00
Sn0wStorm
9f563669e2 Pack all resources and languages with jar 2015-01-09 23:02:56 +01:00
Sn0wStorm
a8720e01c0 Added a simple Update Checker 2015-01-09 18:08:38 +01:00
Sn0wStorm
224e096448 Fix maven some more 2015-01-09 02:28:04 +01:00
Sn0wStorm
9139d52089 Build using WorldGuard-Snapshot (fixes maven) 2015-01-09 01:33:30 +01:00
Sn0wStorm
46f9c9dc26 Also keep support for WorldGuard 5 2015-01-09 00:45:26 +01:00
Grafe
68d5820501 Added support for WorldGuard 6.0 2015-01-05 16:15:49 +01:00
Sn0wStorm
703edfc8b8 Spread Workload of Barrelchecks to multiple Ticks 2014-09-04 21:54:25 +02:00
Sn0wStorm
dac2bf90af Threaded savefile writes 2014-09-04 13:06:34 +02:00
Sn0wStorm
68c73ce8a8 Added "Static" Command 2014-09-03 22:03:03 +02:00
Sn0wStorm
30fa43633f More Options for Potion-Effects 2014-09-03 01:05:53 +02:00
Sn0wStorm
ebfbda884a Add 1.7 Woodtypes to the Config Description 2014-08-25 21:43:25 +02:00
Sn0wStorm
620ab93b6c "Create" Command 2014-08-25 20:42:40 +02:00
Sn0wStorm
70177e9f9e Added Ingredients by Data Value 2014-08-20 17:40:10 +02:00
Sn0wStorm
64b72e0118 Merge Branch RemoveItemIDs 2014-06-06 02:15:18 +02:00
Sn0wStorm
abce80e2ab Build with Bukkit 1.7.9 2014-06-06 01:36:22 +02:00
Sn0wStorm
e8c905e19f Added Support for UUID 2014-06-06 01:27:27 +02:00
Sn0wStorm
28dcfbe5d2 /br -> /brew, added Persistence 2014-06-03 23:10:47 +02:00
Sn0wStorm
f69d55ebb5 GetData Fixes, Added DataUpdater 2014-06-03 21:03:32 +02:00
Frank Baumann
ba87aaabcf Test: Replace GetData 2014-05-19 15:41:52 +02:00
Frank Baumann
8d8d83c176 Removed almost all uses from ItemIds 2014-05-19 15:17:55 +02:00
Sn0wStorm
a4b9b08f82 Config Formatting 2014-05-07 16:12:17 +02:00
Sn0wStorm
e1f10b6be1 Added some new Permissions 2014-05-07 02:37:28 +02:00
Sn0wStorm
31385edce5 Return empty buckets when using as ingredient 2014-05-06 23:41:01 +02:00
Sn0wStorm
cb773a3662 Option to disable Third-Party Support 
Put Calls to other Plugins in try blocks
 2014-05-06 23:19:25 +02:00
Sn0wStorm
c4a0a8dbbe Quote Regex Characters when Distorting Chat 
Untestet GriefPrevention Support
 2014-05-06 20:45:40 +02:00
Frank Baumann
c7a4a36699 Changed words replace from while to for 2014-05-05 12:38:03 +02:00
Sn0wStorm
13abf2475c LogBlock ChestAccess logging Support 2014-04-09 00:35:08 +02:00
Sn0wStorm
1c6fe6cc33 Listener for Barrel breaking -> LWC Support 2014-04-08 16:11:20 +02:00
Frank Baumann
3155bbab63 Updated the default language. Thanks to hellphish@bukkit.org. 2014-03-26 11:15:24 +01:00
Frank Baumann
472addcbdd Added metrics-support 2014-03-17 16:02:22 +01:00
Frank Baumann
47f8007817 The name of the barrel-inventory is now equal to the Etc_Barrel option in the language file. 2014-03-05 12:51:33 +01:00
Sn0wStorm
6d11efb0ad Added WorldGuard Support 2014-02-16 19:55:54 +01:00
Sn0wStorm
23972e69c6 Ignore most cancelled Events 2014-02-16 17:11:02 +01:00
Sn0wStorm
40d226af9e Fixed Adding Blocks to Cauldon in 1.7 2014-02-16 16:43:32 +01:00
Lucariatias
06325a2702 Update color method to use built-in Bukkit methods 
This allows for newer colours to automatically be supported, and reduces the amount of extra replacement code, delegating the colouring to Bukkit.
 2014-02-13 21:07:01 +00:00
Frank Baumann
2a1fee5d71 Fixed: Vomit can be picked up by hoppers 2014-01-07 09:44:54 +01:00
Sn0wStorm
471392dc68 Fixed Barrel Dupe Bug 2013-12-22 03:49:50 +01:00
Sn0wStorm
71a8a66d64 Added some bypass permissions 2013-11-21 23:06:43 +01:00
Sn0wStorm
9d5b90254a Added ConfigUpdater 2013-11-21 22:08:47 +01:00
Sn0wStorm
200f41f0c9 Removed dependency on vault 2013-11-21 17:36:03 +01:00
Sn0wStorm
a8d6a78b69 Implemented distortion override letters 2013-11-21 17:14:14 +01:00
Sn0wStorm
71963232f3 Distort Sign Text 2013-11-17 20:02:32 +01:00
Sn0wStorm
4e279fae2e Distort Certain Commands 2013-11-17 15:26:28 +01:00
Sn0wStorm
f4f0bc9511 Release 2013-10-27 22:54:48 +01:00
Sn0wStorm
548c14ae89 Translated config to English 2013-10-27 19:25:29 +01:00
Sn0wStorm
731fe40b0e Log Player tried to say 2013-10-25 17:59:21 +02:00
Sn0wStorm
fa3c1bc63a Language defaults to en 2013-10-25 15:24:16 +02:00
Sn0wStorm
26d368cf56 Changed LanguageReader to UTF-8 2013-10-25 14:05:05 +02:00
Sn0wStorm
54d4521b2b Added some more Strings to LanguageReader 2013-10-15 18:14:11 +02:00
Frank Baumann
46e6ca9773 Added Language to the config 2013-09-11 14:45:46 +02:00
Frank Baumann
24571d0c0e Added missing brackets (woops) 2013-09-11 14:10:18 +02:00
Frank Baumann
f729748ce7 Merge remote-tracking branch 'refs/remotes/origin/WIP-Brewingchanges' 
Conflicts:
	config.yml
	src/com/dre/brewery/BPlayer.java
	src/com/dre/brewery/listeners/CommandListener.java
 2013-09-11 13:15:03 +02:00
Frank Baumann
e8eef218ba Changed "Umlaute" for ANSI 2013-09-11 13:06:00 +02:00
Frank Baumann
faf984cdcb Finished LanguageReader for p.msg 2013-09-11 13:02:41 +02:00
Frank Baumann
3d9d0cef70 Implemented LanguageReader for CommandListener 2013-09-11 12:46:19 +02:00
Sn0wStorm
ef7293883f Disable Debug Messages 2013-09-09 16:28:35 +02:00
Sn0wStorm
a549280ee6 Version 0.5 2013-09-07 19:31:02 +02:00
Sn0wStorm
080bcf2d76 Decrease Drunkeness on Death 2013-09-07 19:27:46 +02:00
Sn0wStorm
dcf92cf074 Remove Drunkeness on Death 2013-09-06 00:22:39 +02:00
Sn0wStorm
c691fea1ee Errorhandling for Recipeloading 2013-09-05 23:02:45 +02:00
Sn0wStorm
07a9778c8b Less Bad Effects for good Quality 2013-09-05 22:21:26 +02:00
Sn0wStorm
67a9a9e124 Add File Version 2013-09-05 20:05:19 +02:00
Sn0wStorm
dee9208b82 Save Worldnames for later use 2013-09-05 19:53:49 +02:00
Sn0wStorm
8ab8fe91a6 Fixed Recipes not reloading on cmd 2013-09-05 18:46:33 +02:00
Sn0wStorm
a466593920 Consider All Recipes 2013-09-05 17:53:55 +02:00
Sn0wStorm
4bd011f232 Handling for renamed or removed Recipes 2013-09-05 17:45:44 +02:00
Sn0wStorm
8a5f19899c Reworked Barrel Wood Type 2013-09-05 17:09:20 +02:00
Sn0wStorm
a990e91496 Dont Override Interaction while Sneaking 2013-09-04 23:46:07 +02:00
Sn0wStorm
bfe859d3bc Optimized Storage of BIngredients 2013-09-04 23:32:09 +02:00
Sn0wStorm
edfeab1fc8 Fixed Hangover 2013-09-01 23:47:01 +02:00
Sn0wStorm
16bb62c854 Fixed dropping Potions with colored Lore 2013-09-01 21:45:02 +02:00
Sn0wStorm
c7c72e1699 Dont get non-distill Recipe for distilled Brew 2013-09-01 21:37:38 +02:00
Sn0wStorm
b09131c2e0 Also for small cooking time 2013-09-01 20:26:19 +02:00
Sn0wStorm
c748e0b7b5 Reduced Difficulty for small Ingredient amounts 2013-09-01 18:58:51 +02:00
Sn0wStorm
33285e54de Alc changes for bad potions 2013-08-31 18:23:03 +02:00
Sn0wStorm
ea06f2d707 Added cmd Unlabel & Several Fixes 2013-08-30 21:19:49 +02:00
Frank Baumann
c396e70196 Started with multilanguage support 2013-08-26 16:50:27 +02:00
Sn0wStorm
d1e9ad29f8 Added cmd Delete 2013-08-21 00:04:24 +02:00
Sn0wStorm
925107fdfc Added cmd Copy 2013-08-20 23:19:23 +02:00
Sn0wStorm
b7d0b73aa0 Cancel Creation of Potion with full Inventory 2013-08-20 12:32:57 +02:00
Sn0wStorm
4496e94e55 Remove Brew when its Item combusts 2013-08-19 17:41:16 +02:00
Sn0wStorm
a166d6cfe6 Fixed Instant Effects 2013-08-19 17:14:43 +02:00
Sn0wStorm
ab6312331e Make Lore quality-colored while in Barrel/Brewer 2013-08-19 16:23:12 +02:00
Sn0wStorm
a347a16c06 Show Effects on Potion, Changed Lore 2013-08-15 18:17:05 +02:00
Sn0wStorm
ac9975fce9 Items can lower Drunkeness when consumed 2013-08-14 21:18:11 +02:00
Sn0wStorm
e2e6448cf6 Multiple Effects per Potion 2013-08-14 20:08:55 +02:00
Sn0wStorm
62f1d7686a Finally Beta! 2013-07-30 22:37:14 +02:00
Sn0wStorm
7a236a4297 Added Cmd Reload 2013-07-29 18:54:40 +02:00
Sn0wStorm
da0b1ddf54 Implemented Commands and Random Wakeups 2013-07-28 23:53:35 +02:00
Sn0wStorm
8e11062f56 Use Watch to display cooking time 2013-07-27 17:31:42 +02:00
Sn0wStorm
a003d6ad23 Use non-Italic Naming 2013-07-04 02:59:21 +02:00
Sn0wStorm
3a790c29f1 Decrease amount of denied Drunk-Logins 
Deny passed-out-Logins for only about 10 min
 2013-07-04 01:55:21 +02:00
Sn0wStorm
353501bd84 Use Iterator when updating BPlayer 2013-07-04 01:01:29 +02:00
Sn0wStorm
c99da614c7 Fixed Distilling 2013-07-03 18:06:13 +02:00
Sn0wStorm
6e2df99c14 Added vomiting, "-all" for Words 2013-07-03 00:31:34 +02:00
Sn0wStorm
dd83ef55ad Fixed random Words 2013-07-01 01:07:56 +02:00
Sn0wStorm
d00c7888f9 PotionEffects for Drunkeness 2013-06-30 23:41:37 +02:00
Sn0wStorm
f1db040dbb Prevent 0 drunkeness 2013-06-05 22:08:49 +02:00
Sn0wStorm
ae3df4eb8f Autosave Interval 2013-06-05 20:06:44 +02:00
Sn0wStorm
edf8c7a840 Compatiblity with DungeonsXL 2013-06-05 19:44:30 +02:00
Sn0wStorm
84e37ec676 Effects, Hangover, Fixes 2013-05-28 16:25:06 +02:00
Sn0wStorm
5c82b08028 Changed alcohol calculation 2013-05-10 00:01:28 +02:00
Sn0wStorm
43824e80a6 Added multiworld support 2013-05-09 21:47:58 +02:00
Grafe
873b54f532 Formatting 
Signed-off-by: Grafe <flingelfrank@hotmail.com>
 2013-05-03 16:08:05 +02:00
Sn0wStorm
3bae71872e Implemented Player saving, more Words 2013-05-02 10:06:07 +02:00
Sn0wStorm
610fd8342a Added alteration of player messages 2013-05-01 21:47:41 +02:00
Sn0wStorm
c8a20f51bc Implemented saving 2013-04-30 21:41:16 +02:00
Sn0wStorm
2894985e71 Added basic drunkenness 2013-04-30 01:23:29 +02:00
Sn0wStorm
a7db7ff833 possibility to build smaller barrel 2013-04-29 09:50:19 +02:00
Sn0wStorm
23a9f2340a Added Brew, Distilling, Barrel 2013-04-28 23:57:41 +02:00
Sn0wStorm
9cb1981fe9 Added BCauldron, Config, Custom Recipes 2013-04-19 16:35:08 +02:00
Grafe
80c21409c9 Initial commit 
Signed-off-by: Grafe <flingelfrank@hotmail.com>
 2013-02-10 23:24:30 +01:00