Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-11-17 10:45:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
388 Commits 5 Branches 29 Tags 2.8 MiB
823f5a4204
Commit Graph

320 Commits

Author SHA1 Message Date
Sn0wStorm
55200608c1 Language Updater: Put new lines at the end 2019-12-02 15:56:30 +01:00
Sn0wStorm
4f0b56e2dc Config updater for 2.0 
+ config fixes & fix for unlabeled
 2019-12-01 23:50:56 +01:00
Sn0wStorm
c6ea0cd493 Updated other Config and Language variations 2019-11-29 18:00:49 +01:00
Sn0wStorm
6577cbf628 Added Barrel Check for GamemodeInventories 2019-11-27 13:52:19 +01:00
Sn0wStorm
40da30bf8e Optimizing Barrel retrieve 2019-11-26 21:29:41 +01:00
Sn0wStorm
16c03f9da1 Added and Fixed lots of JavaDocs 2019-11-25 22:16:16 +01:00
Sn0wStorm
c287b6350f Moved some test code, optimized Distiller 2019-11-25 20:28:08 +01:00
Sn0wStorm
a5f73ceacc Inline updater for Language file 2019-11-25 15:36:48 +01:00
Sn0wStorm
3b9f9ae26d Added some more Custom Metrics Charts 2019-11-24 19:06:35 +01:00
Sn0wStorm
32b6c3c4b1 Tweaked performance of data save and campfire check 2019-11-24 16:06:17 +01:00
Sn0wStorm
a1c0116650 Make Metrics work again 2019-11-23 19:59:53 +01:00
Sn0wStorm
fa2a4974d8 Added Messages and Commands when drinking 2019-11-22 20:00:05 +01:00
Sn0wStorm
d0198c9f04 Convert pre 1.11 Brews (cosmetic) 2019-11-15 14:43:26 +01:00
Sn0wStorm
036657747c Only reload config if valid yml 2019-11-14 16:16:12 +01:00
Sn0wStorm
f483f03560 Handle Hoppers for Distillers and MCBarrels 
Removed most mentions of Persistent
 2019-11-14 15:46:15 +01:00
Sn0wStorm
3332354846 Added more API and features for Events 2019-11-13 22:07:22 +01:00
Sn0wStorm
48a15a0e82 Convert on Chest Open, delete lost legacy brews 2019-11-12 17:02:01 +01:00
Sn0wStorm
318963b379 Add/change recipes by plugin 2019-11-09 17:02:48 +01:00
Sn0wStorm
81ea014e45 Save Alc content on the Brew 2019-11-09 11:46:34 +01:00
Sn0wStorm
4c77944eb8 Find more suitable Data Structures 2019-11-08 16:22:58 +01:00
Sn0wStorm
7f2f9d75dd Rewrite of the Custom item into RecipeItem 
and Ingredient with subclasses
Implemented adding custom items to Ingredients
Added support for plugin-items
 2019-11-06 19:44:52 +01:00
Sn0wStorm
d0263c611c Added Custom Items and Cauldron-Recipes 2019-10-29 16:20:32 +01:00
Sn0wStorm
92977d2c8e Show the Alc content in the distiller/always 2019-10-22 10:32:48 +02:00
Sn0wStorm
7a6e361a8c Show stars in lore according to quality 2019-10-21 20:39:31 +02:00
Sn0wStorm
185f3d9b9b Find Barrel Blocks by BoundingBox 2019-10-21 18:47:19 +02:00
Sn0wStorm
2d3e5dfbac Implemented Custom Lore 2019-10-21 12:44:26 +02:00
Sn0wStorm
4909e59c90 Implemented NBT Saving 
1.13: CustomItemTagContainer
1.14: PersistentDataContainer
 2019-10-20 21:06:35 +02:00
Sn0wStorm
f431c13100 Load Scramble Seed key from Config 
Remember all used Scramble seeds to unscramble potions
 2019-10-18 16:30:03 +02:00
Sn0wStorm
437f521a9b Refractor Utility 2019-10-16 20:07:09 +02:00
Sn0wStorm
7d177a3d9f Refractor Barrel 2019-10-16 19:35:29 +02:00
Sn0wStorm
7c0dcefb1b Refractoring 2019-10-16 17:21:04 +02:00
Sn0wStorm
595df50ca5 We only need one ModifyEvent 
Move PotionColor into its own Class
 2019-10-14 21:02:59 +02:00
Sn0wStorm
b761e83882 More features for BrewModifyEvent 2019-10-12 16:07:02 +02:00
Sn0wStorm
d355966d42 Some more merge fixes 2019-10-12 14:47:01 +02:00
Sn0wStorm
4a1f606e99 Finalized Merge of 2.0-StoreDataInLore 
Rebased onto Master Branch commit e5438e7ae3
And moved to new branch v2.0
 2019-10-12 13:52:55 +02:00
Sn0wStorm
519c4821d9 Started api and events 2019-10-11 20:44:43 +02:00
Sn0wStorm
49fb0e3d82 Changed Lore Handling 2019-10-11 18:19:20 +02:00
Sn0wStorm
2fc0b32179 Change Parity of Scrambler 2019-10-11 18:06:18 +02:00
Sn0wStorm
562f96e4b1 Slightly larger En/Decoder buffers, isSimilar for Brew 2019-10-11 18:06:18 +02:00
Sn0wStorm
2121bf5c8a Added Parity/Sanity to Scrambling 2019-10-11 18:05:49 +02:00
Sn0wStorm
9bf3268fb4 Added XOR Scrambler for Brew data 
Very fast obfuscator for brew data so that a client cant easily read it
 2019-10-11 18:05:49 +02:00
Sn0wStorm
cdb36b1736 Save ingredients of Brews 2019-10-11 18:04:40 +02:00
Sn0wStorm
4b18dceada Implemented Lore Save system 2019-10-11 18:03:42 +02:00
Sn0wStorm
cdd50f8504 Optimized LoreStreams 2019-10-11 17:51:50 +02:00
Sn0wStorm
ca2c49ea08 Made En/Decode table static 
Create a new En/Decoder Instance for each Stream
 2019-10-11 17:51:33 +02:00
Sn0wStorm
3b7e019de3 Use " instead of \ for encoding 2019-10-11 17:51:33 +02:00
Sn0wStorm
ed40a1f608 Test storing and loading a brew from lore 2019-10-11 17:51:07 +02:00
Sn0wStorm
6311b9ed15 Split LoreIn/OutputStream 
Implemented skip, mark and reset
 2019-10-11 17:51:07 +02:00
Sn0wStorm
41fac3b08a Created LoreInputStream 2019-10-11 17:51:07 +02:00
Sn0wStorm
75d0f2f201 Started LoreOutputStream storing data with Base91 2019-10-11 17:50:41 +02:00
Sn0wStorm
e5438e7ae3 Reapply potion effects to the player if he already has it 
Fixes #205
 2019-10-11 15:38:29 +02:00
Sn0wStorm
fc66ed6ab3 Delay passing out to update inventory properly 2019-10-11 12:43:27 +02:00
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