1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Commit Graph

879 Commits

Author SHA1 Message Date
TheBusyBiscuit
c77a2c2997 Did some long overdue refactoring 2020-06-16 01:54:18 +02:00
TheBusyBiscuit
d628f8586f Really really big refactoring and deprecation 2020-06-16 01:16:14 +02:00
TheBusyBiscuit
ffa3ea1c1b Further improvements to Unit Tests 2020-06-15 15:01:33 +02:00
TheBusyBiscuit
944c009afb [CI skip] Added Unit Tests for GEO Resources 2020-06-15 13:29:15 +02:00
TheBusyBiscuit
4efc10db15 Fixes #1907 2020-06-15 11:53:38 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
cf24923e9c Fixes #1985 2020-06-14 02:39:01 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
TheBusyBiscuit
e3dc17a9df [CI skip] Reduced technical debt 2020-06-13 13:52:53 +02:00
TheBusyBiscuit
4dbc66fc4e [CI skip] More refactoring 2020-06-13 13:05:22 +02:00
TheBusyBiscuit
872c83f1a6 [CI skip] Updated translators 2020-06-13 10:21:15 +02:00
TheBusyBiscuit
7baa3cb81b [CI skip] Reduced technical debt 2020-06-13 10:15:18 +02:00
TheBusyBiscuit
e45764ade1 Refactored a bunch of android-related things 2020-06-13 01:50:48 +02:00
TheBusyBiscuit
e7b7061b56 Added further documentation 2020-06-13 01:08:42 +02:00
TheBusyBiscuit
62ffb59ba2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-13 01:02:39 +02:00
Josh
0b4904831b
update 2020-06-12 18:52:54 -04:00
Josh
a232d82851
add check 2020-06-12 18:10:06 -04:00
Josh
5f8ae4b182
don't get it twice 2020-06-12 18:04:55 -04:00
Josh
e989969713
safety check in CustomItemDataService 2020-06-12 18:01:19 -04:00
Josh
56bd432719
check if null in getItemMeta 2020-06-12 17:29:04 -04:00
Josh
6bc28d6b69
allow null meta 2020-06-12 17:09:57 -04:00
TheBusyBiscuit
b304ce14e1 [CI skip] Added lots more unit tests, some will be skipped 2020-06-12 19:18:29 +02:00
TheBusyBiscuit
9b2c378c3a [CI skip] Refactored unit tests 2020-06-12 18:55:09 +02:00
TheBusyBiscuit
c5cc2a86ff [CI skip] Refactoring and optimizations 2020-06-11 13:50:22 +02:00
TheBusyBiscuit
79e8ca46ff Another small optimization 2020-06-11 11:42:24 +02:00
TheBusyBiscuit
aeab6df103 Small performance improvements for cargo networks 2020-06-11 10:08:08 +02:00
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
5c20d3b470
Merge pull request #1963 from siaynoq/gold-ingot-pulverize
Adding recipe for vanilla Gold Ingot -> Gold Dust conversion
2020-06-11 00:43:49 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
Siaynoq
1156cb33c0 Removed unneeded construction of GOLD_DUST 2020-06-11 08:33:37 +10:00
Siaynoq
5bf4604026 Removed unneeded array objects 2020-06-11 08:05:50 +10:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
22650f53dd [Ci skip] Refactoring 2020-06-10 21:26:28 +02:00
TheBusyBiscuit
dc592605d6 [Ci skip] Fixed javadoc warning 2020-06-10 17:51:02 +02:00
TheBusyBiscuit
316d70ecc6 [CI skip] Added Unit Tests for /sf backpack 2020-06-10 17:48:00 +02:00
TheBusyBiscuit
9eb22db6de [CI skip] Added more Unit Tests 2020-06-10 17:33:14 +02:00
TheBusyBiscuit
da7291995b [CI skip] Added some Unit Tests for commands 2020-06-10 17:11:28 +02:00
Siaynoq
c44730c589 Adding recipe for vanilla Gold Ingot -> Gold Dust conversion 2020-06-10 14:06:03 +10:00
TheBusyBiscuit
b659e51008
Merge pull request #1953 from TheBusyBiscuit/feature/miner
Added Industrial Miner & Removed Digital Miner
2020-06-09 23:23:56 +02:00
TheBusyBiscuit
d645fcc75b [CI skip] Updated translators list 2020-06-09 23:23:02 +02:00
TheBusyBiscuit
df947e0967 [CI skip] Refactoring 2020-06-09 23:21:37 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
4f7b06be4c Changes to organic food/fertilizer 2020-06-09 00:10:32 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
70738a45ee Refactored recipe service for electric furnaces 2020-06-08 14:20:01 +02:00
TheBusyBiscuit
615e0c07a2 Minor changes 2020-06-07 17:48:10 +02:00
TheBusyBiscuit
586a6970ed
Updated translator list 2020-06-05 18:18:18 +02:00
TheBusyBiscuit
8bde659daf The Advanced Miner now preserves buckets 2020-06-05 14:34:24 +02:00
TheBusyBiscuit
cd79775402 Added Advanced Industrial Miner 2020-06-05 14:13:53 +02:00
TheBusyBiscuit
e41eca9caa Refactoring 2020-06-05 14:09:32 +02:00
TheBusyBiscuit
4f21fd03bc Finished Industrial Miner 2020-06-05 00:21:45 +02:00
TheBusyBiscuit
c8f78379a1 Added Industrial Miner 2020-06-05 00:00:07 +02:00
TheBusyBiscuit
4664fb00fe Added back researches 2020-06-04 23:59:58 +02:00
TheBusyBiscuit
aebd03301d Added new ItemStacks 2020-06-04 23:56:08 +02:00
TheBusyBiscuit
7e8a63bff8 Dried Kelp Blocks are now valid coal generator fuel 2020-06-04 15:26:35 +02:00
TheBusyBiscuit
968b3df10a Relocated Multiblock class 2020-06-03 09:51:51 +02:00
TheBusyBiscuit
31a9b69651 Refactored Backpacks 2020-06-02 13:58:03 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
2f09470b51 [Ci skip] Reduced technical debt 2020-06-01 13:52:04 +02:00
PhanaticD
dc351f51ad remove metadata on entity death, and when items are removed from pedestal. Also remove references to "item_placed" I do not see anywhere where this key is actually set, maybe leftover from old code? 2020-06-01 01:19:41 -04:00
TheBusyBiscuit
4bb81c0f5f Updated changelog 2020-05-31 00:38:19 +02:00
TheBusyBiscuit
c85b29c009 Fixes #1943 2020-05-30 16:21:13 +02:00
TheBusyBiscuit
5378341839 [Ci skip] Refactoring and proper deprecation of the HandledBlock class 2020-05-30 14:53:29 +02:00
TheBusyBiscuit
343a18a95d Added dried Kelp and bone block recipes to the Electric Press 2020-05-30 13:36:48 +02:00
TheBusyBiscuit
929f26d103 [CI skip] Reduced technical debt 2020-05-30 13:21:17 +02:00
TheBusyBiscuit
d19da209d5 Fixes #1942 2020-05-29 16:07:02 +02:00
TheBusyBiscuit
efd9903ace [CI skip] Refactoring 2020-05-29 12:07:24 +02:00
TheBusyBiscuit
6ca1f7dca9 [Ci skip] Removed deprecated stuff 2020-05-29 01:39:21 +02:00
TheBusyBiscuit
7039eb1312 [skip] Removed weird line breaks und updated translator list 2020-05-28 12:47:01 +02:00
TheBusyBiscuit
982a07262e Another relocation 2020-05-26 10:21:58 +02:00
TheBusyBiscuit
4af26f3b00 [Ci skip] Added some more basic tests 2020-05-26 09:57:45 +02:00
TheBusyBiscuit
1b951f77ea [CI skip] Added an extremely simple ResearchSetup test 2020-05-25 12:58:01 +02:00
TheBusyBiscuit
a34abcb1e7 Some refactoring, also fixes #1935 2020-05-24 20:19:22 +02:00
TheBusyBiscuit
7ae16f8358 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-24 19:13:03 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
bito-blosh
aab6624ce0
Fixed android ATTACK part deals wrong damage 2020-05-24 15:39:48 +09:00
TheBusyBiscuit
23c2ab0f65 Fixed custom player heads errors 2020-05-24 01:57:38 +02:00
TheBusyBiscuit
6a4e23853c Added more Unit Tests 2020-05-24 01:48:42 +02:00
TheBusyBiscuit
0af8c41eeb Added a toggle for #1924 and fixes #1933 2020-05-24 01:11:10 +02:00
TheBusyBiscuit
efcc9c1a4b [CI skip] Refactoring 2020-05-24 00:49:27 +02:00
TheBusyBiscuit
323ddc949b Fixes #1926 2020-05-23 20:34:37 +02:00
TheBusyBiscuit
a96f85ece4 [CI skip] Coverage ahoy! 2020-05-23 20:18:43 +02:00
TheBusyBiscuit
a6a4a0a671 [CI skip] Infrastructure for further Unit Testing 2020-05-22 18:01:25 +02:00
TheBusyBiscuit
902367de0c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-22 16:40:33 +02:00
TheBusyBiscuit
de93daf9be [CI skip] Updated MockBukkit 2020-05-22 16:40:26 +02:00
TheBusyBiscuit
c51ff84640
Merge pull request #1925 from WalshyDev/fix/walshys-fixes
Add a way to reload BlockMenu
2020-05-22 16:36:52 +02:00
Daniel Walsh
9ddbaf70cd So... I can't test this 2020-05-22 15:02:26 +01:00
Daniel Walsh
984a96bcb5 REEE I can't sleep 😢 2020-05-22 14:42:28 +01:00
TheBusyBiscuit
a94da8a372 [Ci skip] Removed unused imports 2020-05-22 12:19:40 +02:00
Daniel Walsh
8db67af455 Requested pickiness 2020-05-22 10:28:21 +01:00
Daniel Walsh
3048f0f6a0 Unit tests save the day 2020-05-22 07:11:58 +01:00
Daniel Walsh
f269c37f76 Add build num to UpdaterService 2020-05-22 07:08:17 +01:00
Daniel Walsh
fffd9921b3 Doc 2020-05-22 06:51:39 +01:00
Daniel Walsh
f049a75006 Add a way to reload menus 2020-05-22 06:43:02 +01:00
FabioZumbi12
7a6e6cd8eb Missing space on line 2020-05-22 01:13:59 -03:00
FabioZumbi12
d1a968d4ff Changed to Block explode, and added the event to Explosive Shovel 2020-05-22 01:07:20 -03:00
FabioZumbi12
388ed255b8 Fix compatibility with other plugins firing bukkit explosion event to do not drop near blocks on pickaxe area if the block was removed from explosion event. 2020-05-22 00:24:18 -03:00
TheBusyBiscuit
9a85120597 Removed debug message 👀 2020-05-21 19:09:49 +02:00
TheBusyBiscuit
69d32bd6f2 Fixes TheBusyBiscuit/ChestTerminal#25 2020-05-21 18:51:53 +02:00
TheBusyBiscuit
04a7435f2b [CI skip] #GiveMeMoreCoverage 2020-05-21 13:44:00 +02:00
TheBusyBiscuit
624f0b298e [Ci skip] Removed debug message 2020-05-21 12:45:04 +02:00
TheBusyBiscuit
83d5eafb54 [CI skip] Added Unit Tests for Waypoints 2020-05-21 12:35:21 +02:00
TheBusyBiscuit
ec33df8e93 [CI skip] Added a little more javadocs 2020-05-20 17:33:18 +02:00
TheBusyBiscuit
0d00e52c29 [CI skip] Added SlimefunUtils.getCustomHead() 2020-05-20 16:47:56 +02:00
TheBusyBiscuit
27fd81298c [CI skip] Added more Unit Tests 2020-05-18 17:11:12 +02:00
Daniel Walsh
c4cb29b897 Add location data to error message 2020-05-18 10:06:24 +01:00
TheBusyBiscuit
e3ba751cf9 [CI skip] Added more unit tests to cover multiblocks 2020-05-17 16:41:16 +02:00
TheBusyBiscuit
d7a7230d6c [CI skip] Refined the newly added Unit Tests 2020-05-17 15:00:46 +02:00
TheBusyBiscuit
c69a86ae42 [CI skip] Added a Research unlocking unit test 2020-05-17 14:54:16 +02:00
TheBusyBiscuit
65228fbeb1 Added a callback to Research#unlock(...) 2020-05-17 14:13:46 +02:00
TheBusyBiscuit
de8fb5ccef [ci skip] refactoring 2020-05-17 12:49:11 +02:00
TheBusyBiscuit
6eebb9c04d AncientAltar now has a speed variable 2020-05-17 00:40:07 +02:00
TheBusyBiscuit
dec22b9960 Added WaypointCreateEvent 2020-05-16 17:51:42 +02:00
TheBusyBiscuit
3a2cced5d0 Infused Magnets can no longer be placed down 2020-05-16 17:04:16 +02:00
TheBusyBiscuit
b3a3f4511b [CI skip] Fixed PerWorldSettingsService handling some files wrongly 2020-05-16 15:40:22 +02:00
TheBusyBiscuit
7e137fb360 [CI skip] Refactoring 2020-05-16 15:06:32 +02:00
TheBusyBiscuit
e07933a911 [ci skip] Included translators in latest github improvement 2020-05-16 14:22:47 +02:00
TheBusyBiscuit
29d2aaf055 Fixes #1914 2020-05-16 12:42:46 +02:00
TheBusyBiscuit
c4012fe697 [ci skip] Reduced mojang.com connection errors 2020-05-16 12:04:19 +02:00
TheBusyBiscuit
d181d54245 Some refactoring 2020-05-16 02:16:29 +02:00
TheBusyBiscuit
11383cad1d Fixes #1829 2020-05-15 17:45:13 +02:00
TheBusyBiscuit
d5f430c723 Refactoring 2020-05-15 17:44:57 +02:00
TheBusyBiscuit
6553aeb3e1 Fixes #1883 2020-05-15 16:57:47 +02:00
TheBusyBiscuit
c4a3cdc833 Fixed Organic food/fertilizer not being recognized 2020-05-15 16:47:01 +02:00
TheBusyBiscuit
6aeee8f4be [ci skip] Reduced some technical debt 2020-05-15 16:10:25 +02:00
TheBusyBiscuit
3aff637f4f [CI skip] more Unit Tests 2020-05-15 12:16:46 +02:00
TheBusyBiscuit
9f4557185a
Merge pull request #1910 from Sfiguz7/tests
setBackpackId param type change, fix in bp command
2020-05-15 09:59:02 +02:00
Sfiguz7
00fa225d4a Made BackpackListener#setBackpackId accept OfflinePlayer instead, fix in BackpackCommand 2020-05-15 09:11:15 +02:00
TheBusyBiscuit
d11bfe8278 [CI skip] Added more Unit Tests 2020-05-15 01:16:25 +02:00
TheBusyBiscuit
741d18a8e8 Fixes #1903 2020-05-15 00:36:39 +02:00
TheBusyBiscuit
886121e226 Fixes #1908 2020-05-14 20:07:18 +02:00
TheBusyBiscuit
c2fb42b721 Relocated an Interface 2020-05-14 20:05:08 +02:00
TheBusyBiscuit
cf32902730 Fixed DyedBackpacks 2020-05-13 23:52:22 +02:00
TheBusyBiscuit
3adbc84d53 Removed some longtime deprecated methods 2020-05-12 22:32:59 +02:00
TheBusyBiscuit
67121760cd Added Unit Tests for "Soulboundness" 2020-05-12 22:12:42 +02:00
Daniel Walsh
c0a530f532 Fix conflict 2020-05-12 20:17:34 +01:00
Daniel Walsh
6634d44033
Merge branch 'tests' into feature/soulbound-key 2020-05-12 20:15:47 +01:00
Daniel Walsh
0bd78104cc Requested changes and performance improvements 2020-05-12 18:43:34 +01:00
TheBusyBiscuit
471a271518 Another one bites the Unit Tests 2020-05-12 00:50:01 +02:00
TheBusyBiscuit
05e36bf839
Merge pull request #1898 from Sfiguz7/tests
Backpack command
2020-05-12 00:08:42 +02:00
TheBusyBiscuit
736f7bc542 Added an additional validation and unit test 2020-05-11 23:20:40 +02:00
TheBusyBiscuit
d01a7d2186 Added Unit Tests for NetworkManager and Network class 2020-05-11 23:02:24 +02:00
Sfiguz7
8b09111b4a Overridden description getter 2020-05-11 22:19:33 +02:00
TheBusyBiscuit
3597fc0388 Reduced technical debt 2020-05-11 18:56:01 +02:00
Sfiguz7
8c0ff9acfb Now cloning :/ Also fixed double key in messages 2020-05-11 16:58:58 +02:00
Sfiguz7
b2856755d9 Added Javadocs, removed unnecessary parameter 2020-05-11 16:11:41 +02:00
Sfiguz7
23fdd45b3d Messages fixes, Refactored HiddenBackpack to be dedicated to restored bp 2020-05-11 15:35:35 +02:00
Sfiguz7
bcb2add2a6 Integrity! HiddenBackpack now accepts size, restored bp has 54 2020-05-11 15:19:50 +02:00
Sfiguz7
da25ac9f80 Redone fixes without formatting 2020-05-11 09:24:01 +02:00
Sfiguz7
cb8efb2d55 Revert "Last fixes(?)"
This reverts commit 21f21ed671.
2020-05-11 09:19:25 +02:00
Sfiguz7
21f21ed671 Last fixes(?) 2020-05-11 02:18:06 +02:00
Daniel Walsh
b4f19e8548 Document 2020-05-11 01:12:41 +01:00
Daniel Walsh
bd02eb9570 Tested! 2020-05-11 01:09:49 +01:00
Daniel Walsh
8795900ec6 Quick soulbound key to speed this up 2020-05-11 00:50:40 +01:00
Sfiguz7
cedd749edb Split a line for readability 2020-05-11 01:46:12 +02:00
Sfiguz7
e021fb9ce3 Tweaked, requested changes added 2020-05-11 01:25:59 +02:00
Sfiguz7
0fc0a0be29 I said, added a command! 2020-05-10 23:28:30 +02:00
Sfiguz7
fcf28fdf7f Added a command to retrieve lost backpacks 2020-05-10 23:27:09 +02:00
TheBusyBiscuit
ccad2982ab Fixes #1897 2020-05-10 21:37:24 +02:00
TheBusyBiscuit
ea200b37aa Added UpdaterService#isEnabled() 2020-05-10 21:35:48 +02:00
TheBusyBiscuit
0eeef20b1f A little bit more Unit Tests 2020-05-10 17:13:31 +02:00
TheBusyBiscuit
feadc9f231 Some refactoring and documentation 2020-05-10 16:54:33 +02:00
TheBusyBiscuit
990b717339 Added ItemStackWrapper Unit Tests 2020-05-10 15:34:04 +02:00
TheBusyBiscuit
d39906866d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests
2020-05-10 10:32:55 +02:00
TheBusyBiscuit
eacbd2c5c1 Refactored Talismans a bit 2020-05-10 10:31:28 +02:00
jacky
bacd14a833 Removed unuse parameter for consumeItem() 2020-05-10 10:54:19 +08:00
jacky
64451244cd Removed unuse parameter for consumeItem() 2020-05-10 10:43:53 +08:00
jacky
13afbecb90 Fixed Ender Talisman to be consumed inside Ender Chest 2020-05-10 10:41:31 +08:00
TheBusyBiscuit
71d13869a1 Added Unit Tests for Player Profile and related 2020-05-10 02:22:38 +02:00
TheBusyBiscuit
6a0c45c788 Removed Reflection 2020-05-09 21:39:59 +02:00
TheBusyBiscuit
1646d7c82d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests

Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
2020-05-09 18:24:11 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
jacky
d806837000 Fixes Prismarine Brick duplication bug with Grind Stone #1851 2020-05-09 22:04:27 +08:00
jacky
e329560d6d Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829"
This reverts commit cd0baa30
2020-05-09 22:04:07 +08:00
jacky
cd0baa307e Fixes Prismarine Brick duplication bug with Grind Stone #1829 2020-05-09 21:22:25 +08:00
TheBusyBiscuit
922444c046 Added new api method for researches 2020-05-09 10:41:36 +02:00
TheBusyBiscuit
c4026966a2 Removed api method 2020-05-09 10:35:21 +02:00
TheBusyBiscuit
d8c06a2270 Updated repository names 2020-05-09 10:17:04 +02:00
TheBusyBiscuit
b30190da5c Refactoring 2020-05-08 23:05:29 +02:00
TheBusyBiscuit
5360e4d085 MOOORE Unit Tests 2020-05-08 22:09:08 +02:00
TheBusyBiscuit
cc21fb8fe3 Removed temporary migration method 2020-05-08 19:21:49 +02:00
TheBusyBiscuit
a37fe6d62a disabledItems now also uses the Worlds UUID 2020-05-08 19:07:06 +02:00
TheBusyBiscuit
ebf6725d7e Prevent World Settings from saving inside tests 2020-05-08 19:05:03 +02:00
TheBusyBiscuit
eb321e9ee5 Lots more refactoring 2020-05-08 18:59:51 +02:00
TheBusyBiscuit
dc137d04bf Player Profiles are now truly asynchronous 2020-05-08 18:47:25 +02:00
TheBusyBiscuit
a4ebd663d5 Refactoring and Research Unit tests 2020-05-08 17:55:48 +02:00
TheBusyBiscuit
aa897a5de7 More tests and relocated a class 2020-05-08 17:13:16 +02:00
TheBusyBiscuit
a2512ce03a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-08 16:00:31 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
66ac945b5f No such thing as too many Unit Tests 2020-05-08 15:44:12 +02:00
TheBusyBiscuit
a3afe615b5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-07 20:39:42 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
de1af960bb [CI skip] Updated translator list 2020-05-07 20:35:03 +02:00
TheBusyBiscuit
2d3cfaee73 Updated PerWorldSettings 2020-05-07 20:32:37 +02:00
TheBusyBiscuit
220d5ef41f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests

Conflicts:
	CHANGELOG.md
2020-05-07 18:18:09 +02:00
TheBusyBiscuit
0b416c3201 More tests 2020-05-07 18:00:44 +02:00
TheBusyBiscuit
41b0356bbc Refactoring 2020-05-07 18:00:30 +02:00
TheBusyBiscuit
7e04566393 Further unit tests and jacoco coverage reports 2020-05-07 14:28:54 +02:00
TheBusyBiscuit
b456da9ffc First Unit Tests 2020-05-06 22:08:15 +02:00
TheBusyBiscuit
e95c5939a3 [CI skip] Added Ukrainian language 2020-05-04 21:21:01 +02:00
TheBusyBiscuit
113377ceb1 [CI skip] Added 4 new languages 2020-05-04 16:36:07 +02:00
TheBusyBiscuit
0e58c3fa35 Added first Unit Tests 2020-05-04 16:25:47 +02:00
TheBusyBiscuit
3e2d1847ed Little performance improvement 2020-05-03 18:36:29 +02:00
TheBusyBiscuit
4131a900e1
Merge pull request #1844 from clementgallois/master
Resolves #1843
2020-05-02 19:13:00 +02:00
TheBusyBiscuit
0c123631d9 [CI skip] Fixed one assignment 2020-05-02 19:10:48 +02:00
TheBusyBiscuit
343c2dbaf9 [CI skip] Added more translators to the credits 2020-05-02 19:09:28 +02:00
TheBusyBiscuit
b9f22fbe2a [CI skip] Minor changes 2020-05-02 19:07:31 +02:00
TheBusyBiscuit
e69cdff244 [CI skip] Added failsafe for misconfigured addons 2020-05-02 10:40:53 +02:00
clement.gallois@epitech.eu
6cb196898f Fixed typo 2020-05-02 00:18:59 +02:00
clement.gallois@epitech.eu
6ce560bdfe Resolves #1843 2020-05-02 00:01:01 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +02:00
TheBusyBiscuit
8cb5579a12 Fixes #1833 2020-04-30 20:51:17 +02:00
TheBusyBiscuit
2b9d109d16 Bandages, Rags and Splints will no longer be consumed if at full health 2020-04-26 16:08:01 +02:00
TheBusyBiscuit
804e450f51 Only retry Mojang lookups if it was rate-limiting 2020-04-26 15:51:12 +02:00
TheBusyBiscuit
ec96e13c82 [CI Skip] Refactoring 2020-04-26 13:50:37 +02:00
TheBusyBiscuit
9eb9a98410 Fixes #1824 2020-04-25 19:14:50 +02:00
TheBusyBiscuit
f18cb33eef [CI skip] Reduced technical debt 2020-04-25 13:01:32 +02:00
TheBusyBiscuit
45ed89c6f5 Bugged Generators from Addons will no longer destroy Energy Regulators 2020-04-25 02:16:21 +02:00
TheBusyBiscuit
d896462c2d Fixed Emergency Transmitters + Reduced technical debt 2020-04-23 18:08:15 +02:00
TheBusyBiscuit
a04676b27c Various improvements, including Pull Request #1790 2020-04-23 13:01:47 +02:00
DNx5
5cf0487cb7 Moved the tick delay value into static constant 2020-04-22 07:54:34 +07:00
DNx5
034ff1948a missed a spot 2020-04-22 06:32:53 +07:00
DNx5
81add1caa2 code cleanup 2020-04-22 06:18:42 +07:00
DNx5
2a22eebd8a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	pom.xml
2020-04-22 06:16:35 +07:00
DNx5
92e8aa955b - Get the tick delay value directly in method
- Added comment to explain how the skipping ticks work
2020-04-22 06:16:03 +07:00
TheBusyBiscuit
ca6170e64b Fixes #1490 2020-04-21 21:07:05 +02:00
TheBusyBiscuit
9aa6fa68ca [CI skip] Reduced technical debt 2020-04-21 20:25:46 +02:00
TheBusyBiscuit
b013247ea2 Fixes #1798 2020-04-21 01:48:22 +02:00
DNx5
70b5a5a9d1 code cleanup 2020-04-20 15:49:17 +07:00
DNx5
0784077821 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
2020-04-20 15:32:45 +07:00
TheBusyBiscuit
d5eb1eddae [CI skip] Fixed javadocs 2020-04-19 13:23:20 +02:00
TheBusyBiscuit
61b4a1fe1a /sf teleporter will now open your own teleporter if no player was given 2020-04-19 13:18:33 +02:00
TheBusyBiscuit
a6a061588c Performance optimizations for large addons like ColoredEnderChests 2020-04-18 18:28:20 +02:00
TheBusyBiscuit
cbf7251dcd Added a few more Item Settings 2020-04-18 00:11:57 +02:00
TheBusyBiscuit
1957bee667 Refactored Talismans 2020-04-17 22:33:13 +02:00
TheBusyBiscuit
79867d79cf [CI skip] Some refactoring 2020-04-17 22:01:09 +02:00
TheBusyBiscuit
c007611cae Geo Scans are now paginated 2020-04-17 22:00:35 +02:00
TheBusyBiscuit
8c0c2e6c95 The Composter now also supports the Output Chest 2020-04-17 22:00:07 +02:00
Panda.com
5cf0d6d061 changed requested changes 2020-04-17 19:11:13 +02:00
Panda.com
fbdf934045 Change Automated ignition chambers recipe 2020-04-17 19:04:13 +02:00
TheBusyBiscuit
eead20cb7e Fixes #1814 2020-04-17 14:59:49 +02:00
TheBusyBiscuit
1dd8cd20d9 [CI skip] Refactoring 2020-04-17 14:14:24 +02:00
TheBusyBiscuit
a7c3ca1ab1
Merge pull request #1812 from Liruxo/master
Changed Inventory opening behaviour
2020-04-17 12:00:00 +02:00
TheBusyBiscuit
882d28cabe Fixed #1813 2020-04-17 11:59:40 +02:00
Liruxo
1cf461f986
Changed Inventory opening behaviour 2020-04-16 12:00:48 +02:00
TheBusyBiscuit
f5022ca790 [CI skip] Refactoring and deprecation 2020-04-15 17:52:15 +02:00
TheBusyBiscuit
76b8204bd0 [CI skip] You can no longer /sf give yourself a Multiblock 2020-04-14 23:50:12 +02:00
TheBusyBiscuit
6dd02aaf6a Fixes #1806 2020-04-13 17:40:09 +02:00
DNx
f505d6f740 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
2020-04-13 20:22:15 +07:00
DNx
e985698f9f Implement cargo network tick delay 2020-04-13 20:19:41 +07:00
TheBusyBiscuit
5842598f8e Fixes #1803 2020-04-12 23:25:52 +02:00
TheBusyBiscuit
2ebd003f3a Finalized new and improved Item Settings API 2020-04-12 12:57:35 +02:00
TheBusyBiscuit
15ed598552 [CI skip] Various fixes and documentation [javadocs] 2020-04-12 12:15:05 +02:00
TheBusyBiscuit
0c96323de9
[CI skip] Merge pull request #1800 from TweepCoding/master
AncientAltarOutputEvent added
2020-04-12 00:31:05 +02:00
TweepCoding
666c9a2a31 Adding Fixes Part... you get the point 2020-04-11 17:29:31 -05:00
TweepCoding
79737886ac Adding Fixes Part 3: I dont know what to put here 2020-04-11 17:23:07 -05:00
TweepCoding
fb9e0f1ab8 Adding Fixes Part 2: Electric Bungaloo 2020-04-11 11:37:57 -05:00
TweepCoding
7a798b0bc8 Adding Fixes 2020-04-11 09:08:36 -05:00
TheBusyBiscuit
46ff8b076d [CI skip] Removed Java 1.9 only stuff... 2020-04-11 15:07:24 +02:00
TheBusyBiscuit
8cb99fd7ae [CI skip] More refactoring, more documentation [javadocs] 2020-04-11 14:38:28 +02:00
TweepCoding
332a017c63 Adding Extra Method 2020-04-10 23:21:40 -05:00
TweepCoding
9c6c80da6c Adding Extra Method 2020-04-10 23:00:44 -05:00
SlimeyDerp
b7929dfebf Adding Altar Output Event 2020-04-10 22:49:30 -05:00
DNx
ec6698602c optimize Cargo Node's filter index saving. 2020-04-11 05:32:18 +07:00
DNx
ebd8974155 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-11 04:18:27 +07:00
TheBusyBiscuit
65116afbe7 [CI skip] Refactoring and documentation [javadocs] 2020-04-10 20:30:24 +02:00
DNx
2233a0314d added leftover changes, and bug fixes.
with possibility of bringing more bugs
2020-04-10 13:59:50 +07:00
DNx
e4a5e78cc6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	pom.xml
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
2020-04-10 08:08:27 +07:00
DNx
c00fb1dc1b simplify cargo withdraw methods.
trying to reduce unnecessary item clone as much as possible.
2020-04-10 08:05:17 +07:00
DNx
88a5129b1a Move BlockUtils into cargo package. removed ender chest from the list. use slimefun's method to check minecraft version 2020-04-10 07:22:32 +07:00
DNx
4cc2e8c4d2 Fix OreCrusher, add recipes on post-register 2020-04-10 07:04:24 +07:00
DNx
75564fc7f1 fix OreCrusher item registration 2020-04-10 04:41:10 +07:00
DNx
fa8c07884c fix 1.13 compatibility 2020-04-10 04:40:38 +07:00
TheBusyBiscuit
e3d84de7b9 [CI skip] Refactoring 2020-04-09 22:16:32 +02:00
DNx
9eb3ee2d53 Simplify and optimize the Cargo insertion 2020-04-10 03:12:30 +07:00
DNx
aeab78b174 simplify the shulker boxes check 2020-04-10 02:20:54 +07:00
TheBusyBiscuit
911f8aeceb [CI skip] More refactoring and overall API improvements 2020-04-09 14:22:30 +02:00
TheBusyBiscuit
8f698bebee [CI skip] Reduced technical debt 2020-04-09 03:18:14 +02:00
TheBusyBiscuit
0e6af8e0a1 [CI skip] A bunch of improvements [javadocs] 2020-04-09 02:21:30 +02:00
TheBusyBiscuit
d03cb64c02 Removed /sf elevator 2020-04-08 20:33:10 +02:00
TheBusyBiscuit
ab31180050 [CI skip] Added a new exception [javadocs] 2020-04-08 15:49:44 +02:00
TheBusyBiscuit
a77c9c3dad [CI skip] Forgot a character [javadocs] 2020-04-07 19:38:00 +02:00
TheBusyBiscuit
df06dde53e [CI skip] Some minor changes [javadocs] 2020-04-07 19:01:30 +02:00
TheBusyBiscuit
afd978b2ad [CI skip] More refactoring [javadocs] 2020-04-07 01:01:13 +02:00
TheBusyBiscuit
82bd45a960 [CI skip] More work on the book 2020-04-05 20:54:28 +02:00
DNx
9461447410 split shulker boxes check 2020-04-05 23:30:19 +07:00
DNx
2396db25ad code cleanup 2020-04-05 23:25:10 +07:00
TheBusyBiscuit
8011956459 [CI skip] Added /sf search suggestion to the book interface 2020-04-05 18:02:45 +02:00
TheBusyBiscuit
af4de4fd10 [CI skip] WIP Refactoring 2020-04-05 17:35:50 +02:00
DNx
ab41129d6b Cargo - small performance improvements 2020-04-05 09:26:46 +07:00
DNx
e07c2f5263 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-05 09:12:07 +07:00
TheBusyBiscuit
f65563b28c [CI skip] More refactoring 2020-04-04 20:55:28 +02:00
TheBusyBiscuit
b96fd1d4dc [CI skip] Fixed javadocs [javadocs] 2020-04-04 15:20:34 +02:00
TheBusyBiscuit
007a4c6f83 [CI skip] More refactoring and documentation [javadocs] 2020-04-04 15:16:11 +02:00
DNx
6d9bd2ccf2 Cargo - small performance improvements 2020-04-04 12:20:56 +07:00
TheBusyBiscuit
f8765ea84e [CI skip] Building javadocs [javadocs] 2020-04-04 03:29:13 +02:00
TheBusyBiscuit
b3cc976ac3 Added ItemSetting API [javadocs] 2020-04-04 03:24:49 +02:00
TheBusyBiscuit
b01b980d2f Refactoring and more error contexts 2020-04-04 02:45:51 +02:00
TheBusyBiscuit
ab3c0eb945 [CI skip] Fixed javadocs [javadocs] 2020-04-03 12:17:30 +02:00
TheBusyBiscuit
44ab15811a Fixes #1779 and some other changes 2020-04-03 11:41:58 +02:00
TheBusyBiscuit
7944c44c43 Fixed a small bug 2020-03-30 18:50:55 +02:00
TheBusyBiscuit
ad6dfb676c [CI skip] Some API changes 2020-03-30 18:43:24 +02:00
TheBusyBiscuit
6d12b23fc1 [CI skip] Added remaining recipe translation keys 2020-03-30 13:58:36 +02:00
TheBusyBiscuit
d763a38308 [CI skip] Added Guide Options API 2020-03-29 18:57:43 +02:00
TheBusyBiscuit
a449b62dba [CI skip] Added an API for Guide Options 2020-03-29 18:54:46 +02:00
TheBusyBiscuit
03a42ab946 [CI skip] Fixed javadocs [javadocs] 2020-03-28 21:14:31 +01:00
TheBusyBiscuit
ebe686d458 [CI skip] Prevent non-dependents from becoming addons 2020-03-28 21:02:36 +01:00
TheBusyBiscuit
04345735df [CI skip] Added new exception that prevents Addons from doing dumb stuff 2020-03-28 15:47:01 +01:00
TheBusyBiscuit
83685533f9 Filing a new release 2020-03-28 12:12:26 +01:00
TheBusyBiscuit
e6100a20df [Ci skip] Refactoring 2020-03-27 13:19:47 +01:00
TheBusyBiscuit
03d1bd709d [CI skip] Refactoring 2020-03-27 12:16:42 +01:00
TheBusyBiscuit
1cd84ff17a [Ci skip] Added a small failsafe 2020-03-27 08:39:27 +01:00
TheBusyBiscuit
de9039e6db [CI skip] Refactoring 2020-03-27 01:55:11 +01:00
TheBusyBiscuit
d78e8fa44c [CI skip] Include EmeraldEnchants integration now properly 2020-03-27 01:21:48 +01:00
TheBusyBiscuit
35f45df852 [CI skip] Moved Cargo network classes 2020-03-27 00:31:12 +01:00
TheBusyBiscuit
724810bb4a :dumb cookie facepalm emote: 2020-03-26 19:04:44 +01:00
TheBusyBiscuit
6cd3b1baea Quick fix 2020-03-26 19:03:45 +01:00
TheBusyBiscuit
f2c7964dc6 Refactored some things 2020-03-26 18:59:28 +01:00
TheBusyBiscuit
3e90349551 Refactored some things 2020-03-26 18:56:14 +01:00
Nicolas Saavedra gonzalez
49afe21f15 .DS_Store banished! 2020-03-24 00:32:03 -05:00
Nicolas Saavedra gonzalez
19dd69ffdc Upload 2020-03-24 00:08:55 -05:00
TheBusyBiscuit
f8d17472f2 [CI skip] Very small improvements to cargo networks 2020-03-24 02:00:21 +01:00
TheBusyBiscuit
7458aa5bb8 [CI skip] Refactoring and updated documentation [javadocs] 2020-03-23 16:52:51 +01:00
TheBusyBiscuit
2c290c9601 [CI skip] A little refactoring 2020-03-23 04:21:06 +01:00
TheBusyBiscuit
6d40852afc [CI skip] Refactoring and documentation [javadocs] 2020-03-22 16:45:57 +01:00
TheBusyBiscuit
0babf64d62 [CI skip] Refactoring and documentation [javadocs] 2020-03-22 16:44:28 +01:00
TheBusyBiscuit
2a0c3ff93c [CI skip] Added some package documentations [javadocs] 2020-03-21 21:17:21 +01:00
TheBusyBiscuit
dd29abf24a [CI skip] Added package docs [javadocs] 2020-03-21 21:16:25 +01:00
TheBusyBiscuit
9ac325adbc [CI skip] Updated translators 2020-03-21 20:55:42 +01:00
TheBusyBiscuit
2f70eaf8d4 [CI skip] Fixed javadocs annotations 2020-03-21 17:40:35 +01:00
TheBusyBiscuit
bfcbda1030
Merge pull request #1722 from StarWishsama/patch-3
Fixed #1721
2020-03-20 11:37:54 +01:00
TheBusyBiscuit
777b54e696 Fixed Android Fuel Interfaces 2020-03-20 11:37:37 +01:00
Nameless
847c545d07
Fixed #1721 2020-03-20 15:12:26 +08:00
TheBusyBiscuit
84dbea4473 Improved Slimefun Guide History, it now remembers category pages 2020-03-19 20:38:13 +01:00
TheBusyBiscuit
afac5cc0ce Fixes #1719 2020-03-19 13:14:29 +01:00
TheBusyBiscuit
4744fbac56 [CI skip] Refactoring 2020-03-18 15:52:36 +01:00
TheBusyBiscuit
3cd31e2c2f Some minor improvements 2020-03-18 14:20:49 +01:00
TheBusyBiscuit
2de6c9d249 Fixed #1711 2020-03-17 16:46:08 +01:00
TheBusyBiscuit
bd09ea0d9d Fixed #1710 2020-03-17 16:45:13 +01:00
TheBusyBiscuit
32a922ec7f Fixes #1706 2020-03-17 00:43:57 +01:00
TheBusyBiscuit
c45fe146f6 Firework from researching no longer deals damage 2020-03-16 19:06:51 +01:00
TheBusyBiscuit
0c5ef6fc83 Added Makeshift Smeltery + Tree Growth Accelerator 2020-03-16 02:18:35 +01:00
TheBusyBiscuit
fef2a4ae2d Added Makeshift Smeltery 2020-03-16 01:57:37 +01:00
TheBusyBiscuit
3c70941514 Added RecipeChoiceTask to Multiblocks 2020-03-16 01:57:20 +01:00