Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-11-29 12:45:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
320 Commits 5 Branches 29 Tags 2.8 MiB
c6ea0cd493
Commit Graph

268 Commits

Author SHA1 Message Date
Sn0wStorm
110862fb62 Workaround for Potion Drink Animation Bug 
Animation for drinking a Potion played when clicking a barrel with a potion in hand.
Fixes #201
 2019-10-10 21:56:22 +02:00
Sn0wStorm
29ea53683c Fixed rare case of endless loop over Inventory viewers 2019-09-12 11:01:13 +02:00
Sn0wStorm
f9871d23fa Fix bug when breaking a barrel 2019-08-19 14:37:45 +02:00
Sn0wStorm
4cd2da083c Small fixes, push to v1.8 2019-08-18 22:45:12 +02:00
Sn0wStorm
3ee9ced789 Change Command ConfigName -> ItemName 2019-08-18 21:46:03 +02:00
Sn0wStorm
86f2cd7546 Make sure campfire is lit 2019-08-18 20:41:52 +02:00
Sn0wStorm
435c9819d0 Added Chinese Language #193 
Thanks to Neubulae and kp06125
 2019-08-18 18:12:09 +02:00
Sn0wStorm
a5e33be15e Added configname command 
And removed some old config descriptions
 2019-08-18 17:46:49 +02:00
Sn0wStorm
930d4a2028 Moved some Utility to Util Class 2019-08-18 15:42:22 +02:00
Sn0wStorm
9567feed81 Make loading RGB colors easier 2019-08-17 22:42:58 +02:00
Sn0wStorm
c39b35d82a
Merge pull request #179 from Sataniel98/master 
Add RGB colored potions
 2019-08-17 21:50:30 +02:00
Sn0wStorm
dbe4d4fd93 Added open/close sounds to our Barrels 2019-08-17 21:00:15 +02:00
Sn0wStorm
67ab8e7de3 Support 1.14 Minecraft Barrels for Aging 2019-08-17 18:53:06 +02:00
Sn0wStorm
a95437cdf1 Started MCBarrel 2019-08-17 12:07:57 +02:00
Sn0wStorm
37f22f248f Fix Campfire detection on older versions 
Previous Commit was "Added campfire as fire source for cauldrons"
 2019-08-15 18:30:22 +02:00
Tristan van den Elzen
d643982dd3 Merge branch 'pr/194' 2019-08-15 17:59:06 +02:00
Sn0wStorm
e123f32728 Reduce random chunk loads 2019-08-15 17:44:26 +02:00
Sn0wStorm
ad58d7b609 Potion Effects have different durations now 2019-07-04 16:28:44 +02:00
Sn0wStorm
b713463ba3 Use latest WorldGuard-integration for all versions > 6 
Fixes FastAsyncWorldEdit incompatibility
implements #172
 2019-07-01 19:09:34 +02:00
Sn0wStorm
e62e9a61c2 Fix putting wrong uids on Brews in 1.14 2019-06-28 16:53:44 +02:00
Sn0wStorm
8fdfa41cc2 Use Gson api for update checking to fix build with 1.14 2019-06-28 16:12:52 +02:00
Daniel Saukel
aca7e54bfa Update to MC 1.14 2019-04-27 20:14:55 +02:00
Daniel Saukel
314889be89 Use dynamic placeholder potion type instead of null for custom potion colors 2019-03-07 18:41:45 +01:00
Daniel Saukel
edea97f9a2 Add RGB colored potions 2019-03-05 20:55:52 +01:00
Sn0wStorm
13d13dcf72 Give more Info to Admins ingame on Error 2019-01-17 17:48:36 +01:00
Sn0wStorm
c063037f89 Added number of recipes Chart 2019-01-17 17:28:58 +01:00
Sn0wStorm
dac29b3849 Added a few Metrics Charts 2019-01-17 16:37:55 +01:00
Sn0wStorm
213ef13c0e Fix older Builds of WorldGuard 7.0 
Created a Brewery maven repo, use that for some of the dependencies
 2019-01-17 12:30:12 +01:00
Daniel Saukel
9ec092b304 Replace getApplicableRegions() call with reflection call to allow compilation 2019-01-12 16:59:50 +01:00
Daniel Saukel
8294e928bc Update WG support to latest builds; resolves #175 2019-01-12 16:43:46 +01:00
Sn0wStorm
5b0945732d Split Catch Block again 2018-11-01 00:06:07 +01:00
Sn0wStorm
53ecc5c3c0 Also use setColor in 1.11 
Fixes #160
 2018-10-31 22:25:32 +01:00
Sn0wStorm
0815caf553 Allow Magma Block as Heat Source 
implements #166
 2018-10-31 21:00:21 +01:00
Sn0wStorm
0ed69b7125 Fixes to the Brewing Stand for distilling 2018-10-31 20:22:48 +01:00
Sn0wStorm
db61e27fa3 Added Simple Command Completion 2018-10-30 18:22:04 +01:00
Sn0wStorm
6da8bbcb48 Tested integrations 2018-10-30 17:34:52 +01:00
Sn0wStorm
9bb5936d0d Fixed some warnings 2018-10-30 15:59:56 +01:00
Sn0wStorm
72d13b30dd Convert Materials in old Data Files when loading in 1.13 2018-10-30 15:37:24 +01:00
Sn0wStorm
d29b8defd4 Fixed Brewing Stands not showing the correct Time 
Changed some whitespaces
Less String comparisons again
 2018-10-30 15:16:17 +01:00
Sn0wStorm
086f5b5c9e Config Updater to update Material names 
Updater will only update materials on 1.13
Updated configs as well
 2018-10-30 14:23:01 +01:00
Sn0wStorm
124267898e Less String Comparisons, More Cleanup 2018-10-27 23:24:24 +02:00
Sn0wStorm
f206e45d03 Exclude all unneeded dependencies from build 2018-10-27 12:41:27 +02:00
Sn0wStorm
54a05b83fe More merge fixes 
and use "Levelled" for Cauldrons in 1.13
 2018-10-27 12:09:53 +02:00
Sn0wStorm
4f85574e48 Merge branch '1.13' of https://github.com/Sataniel98/Brewery into Sataniel98-1.13 2018-10-26 21:17:09 +02:00
Daniel Saukel
0b57f2b855 Don't use Vault 1.7+ 2018-09-23 21:04:54 +02:00
Daniel Saukel
fcc60c133a Switch from MCStats to bStats 2018-09-21 22:28:35 +02:00
Daniel Saukel
f736a6e331 Load 1.13 configs in 1.13+ and 1.12 configs in 1.12- 2018-09-21 22:10:07 +02:00
Daniel Saukel
cc8d142ad9 Fix LogBlock integration 2018-09-21 15:05:50 +02:00
Daniel Saukel
221adfa7bb Fix WG7 integration 2018-09-21 02:02:47 +02:00
Daniel Saukel
8d4a73256d Update WorldGuard support to WG7 2018-09-08 02:28:52 +02:00
Daniel Saukel
ed369d55c9 Update LogBlock integration 2018-09-07 14:13:29 +02:00
Daniel Saukel
3d98b4d8db Fix LegacyUtil bugs 2018-08-30 19:44:16 +02:00
Daniel Saukel
7083ec323f LegacyUtil fixes 2018-08-14 17:03:03 +02:00
Daniel Saukel
3cb9588158 Access block byte data method in 1.13 2018-08-14 15:35:16 +02:00
Daniel Saukel
576ad7f3c9 Avoid MaterialData in 1.13 2018-08-14 15:32:30 +02:00
Sataniel98
27ecf2e196 Access legacy method with reflection to allow compilation 2018-03-25 22:27:28 +02:00
Daniel Saukel
70a386ec91 Update fence / wood stairs checks to use LegacyUtil 2018-03-10 17:10:42 +01:00
Daniel Saukel
00341a814d Rewrite Material switch statements to allow dynamic calls 2018-03-10 17:04:23 +01:00
Daniel Saukel
951fb18dc9 Replace old materials with dynamic calls 2018-01-28 20:48:27 +01:00
ProgrammerDan
5089b24dac Adding Citadel support and finally fixing brew colors for 1.12 2017-07-26 14:36:50 -04:00
ProgrammerDan
75a1734ee8 double hotfix fml 2016-12-31 17:42:44 -05:00
ProgrammerDan
838621715c hot-fix for array bounds error 2016-12-14 15:50:49 -05:00
Sn0wStorm
1a9e9e3a13 Made "using brewtime" a debug message 2016-06-29 23:30:17 +02:00
Sn0wStorm
e69deaba29 Detect more changes to Cauldrons 2016-06-28 21:35:37 +02:00
Sn0wStorm
49efceaaae Added recipe option to set Distill Time 2016-06-28 21:01:47 +02:00
Sn0wStorm
bd6742a599 Dont add effects in 1.9 2016-06-28 16:31:57 +02:00
Sn0wStorm
82223aafe1 Added config option to disable Chat distortion 
Closes: #125
 2016-06-28 16:04:45 +02:00
Sn0wStorm
2d714d25e2 Added Italian by FraazT0, Thanks! 2016-06-28 14:26:53 +02:00
Sn0wStorm
ae1ef10ccb Added optional Player argument to /brew create 
adds #73 allowing /brew create in command blocks
 2016-06-27 23:57:58 +02:00
Sn0wStorm
ad53ecf8b8 Better Woodtype recognition 
Fixes #126 Wood type not recognized on big barrels in 1.9
 2016-06-27 22:15:23 +02:00
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