Commit Graph

748 Commits

Author SHA1 Message Date
Brianna
b738d7e683 Merge branch 'development' 2020-06-06 14:31:34 -05:00
Brianna
4d1dfd2db4 version 4.6.8 2020-06-06 14:31:27 -05:00
Brianna
b79c33590d Typo 2020-06-06 14:30:58 -05:00
Brianna
3325b91711 Merge branch 'development' 2020-05-31 10:41:20 -05:00
Brianna
b52eab0a5a version 4.6.7 2020-05-31 10:41:13 -05:00
Brianna
6582b364b2 Fixed FabledSkyBlock integration (beta) 2020-05-31 10:40:39 -05:00
Brianna
261a61a847 Merge branch 'development' 2020-05-30 09:10:32 -05:00
Brianna
1507234fa4 version 4.6.6 2020-05-30 09:10:22 -05:00
Brianna
6684beff9e FabledSkyBlock compatibility (beta) 2020-05-30 09:01:50 -05:00
Brianna
6cf11be83f Added in a null check when loading hoppers. 2020-05-30 08:51:32 -05:00
Brianna
b9cc12ae0e Merge branch 'development' 2020-05-23 15:55:36 -04:00
Brianna
77a17b5987 version 4.6.5 2020-05-23 15:54:27 -04:00
Christian Koop
8d360eb886 Fix AutoCrafting in Spigot 1.12.2
Back in the ol' days... There were no such thing as `Material.BIRCH_PLANKS`. And that caused a NoSuchMethodError. As simple as that ^^
2020-05-23 15:54:18 -04:00
Brianna
c8cec714b7 Fix issue with saving. 2020-05-21 17:48:43 -04:00
Brianna
8f7e48fc0c Merge branch 'development' 2020-05-12 17:49:26 -04:00
Brianna
afd5db5c64 version 4.6.4 2020-05-12 17:49:20 -04:00
Brianna
6b6ed7a403 Fix saving auto crafting on back button. 2020-05-12 17:48:31 -04:00
Brianna
0e546f9894 Remove SyncTouch. 2020-05-06 08:57:28 -04:00
Brianna
606991c41f Merge branch 'development' 2020-05-03 20:07:44 -04:00
Brianna
6de2f2ff08 version 4.6.3 2020-05-03 20:07:37 -04:00
Brianna
4c24979d7c Fix issue with comparators. 2020-05-03 20:07:22 -04:00
Brianna
e9dc2ee4fb Merge branch 'development' 2020-04-22 10:35:20 -04:00
Brianna
6f05368dec version 4.6.2 2020-04-22 10:35:13 -04:00
Brianna
3b24a9227c Implement NBT tags rather than invisible strings. 2020-04-22 10:33:59 -04:00
Brianna
c120b57866 Move comparator system to SongodaCore. 2020-04-22 10:32:23 -04:00
Brianna
ee9aa64197 Fix issue with WorldGuard. 2020-04-22 10:10:26 -04:00
Brianna
589e9b9e93 Merge branch 'development' 2020-04-21 06:31:38 -04:00
Brianna
e1eb82b4cd version 4.6.1 2020-04-21 06:31:32 -04:00
Brianna
7215cea363 Total typo. 2020-04-21 06:31:11 -04:00
Brianna
ad250acd1b Don't process less than 0 for auto sell. 2020-04-20 09:10:58 -04:00
Brianna
8ff503961e Merge branch 'development' 2020-04-19 07:19:48 -04:00
Brianna
0dcc22be4e version 4.6 2020-04-19 07:19:24 -04:00
Christian Koop
f37b03bf14 Fix AutoCrafter only requiring one ingredient
When reformatting the code one closing bracked was moved to the end where it did not belong. Resulting in not even continuing the right loop ,_,
2020-04-19 07:19:19 -04:00
Brianna
b4256c49cf Add queued async threading. 2020-04-18 09:35:25 -04:00
Christian Koop
0afc6dc38e Improve AutoCrafter-Ejection to use items not used for crafting
I wrote some fallback code to eject an item used for crafting (use the ingredient and then eject) but it looks like it is not playing nice with the cachedInventory, so it is commented out.
Looks like the old ejection did have the same problems as mine but I don't use Streams in mine witch may have quit an over-head in this case.
2020-04-18 09:23:11 -04:00
Christian Koop
c65ac98f71 Rename allTypes to make it more intuitive 2020-04-18 09:23:07 -04:00
Christian Koop
e77d89173f Fix hacky fix of 2cf3c6
Only modify inventory array when it's changes will be applied (The cachedInventory is not a deep clone and should not be modified as I did expect because of Player#getInventory()#getContents()
2020-04-18 09:23:02 -04:00
Brianna
58fa0cbe61 Code cleanup
Code cleanup
2020-04-18 09:22:57 -04:00
Christian Koop
96076eb0e4 Hacky fix for disappearing items because of AutoCrafter
Should only be temporarily. Check if a slot is free or would be free after removing used ingredients and only then apply changes to the array
2020-04-17 09:25:50 -04:00
Christian Koop
b6926b931f AutoCrafter: Cache ingredients as ItemStack
Instead of cloning and changing it'S type for every ingredient on every hopper, just keep an ItemStack that can has been created already and can be used instead.
2020-04-17 09:25:45 -04:00
Christian Koop
124a796546 More detailed comments/TODOs and code cleanup 2020-04-17 09:25:41 -04:00
Christian Koop
df40a6323e Remove unneeded hacky fix for log recipes from e927aa69 2020-04-17 09:25:38 -04:00
Christian Koop
6c6af33eaf Fix my JavaDoc comment 2020-04-17 09:25:35 -04:00
Christian Koop
a729496af1 Remove trailing white space 2020-04-17 09:25:32 -04:00
Christian Koop
e10daf1362 Recoded AutoCrafting logic
These changes reintroduce crafting with alternative ingredients. Example: Instead of crafting a `Material.CHEST` only using `Material.SPRUCE_LOGS` you can now use any other wooden logs.
2020-04-17 09:25:29 -04:00
Brianna
94ac11fa7f Add FabledSkyBlock as a dependency. 2020-04-17 09:25:24 -04:00
Brianna
9b30bae3a2 Forgot an s xD 2020-04-17 09:25:04 -04:00
Brianna
d73ad85008 Added long overdue back buttons to GUI's. 2020-04-10 05:40:27 -04:00
Brianna
7730f40ade Convert to SQLite.
s
2020-04-10 05:40:23 -04:00
Brianna
91189c9e5b Fix for WorldGuard related issues. 2020-04-10 05:24:08 -04:00