1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

664 Commits

Author SHA1 Message Date
SoSeDiK
ecd97b3e50 Fixed a tiny typo 2020-06-25 05:54:21 +03:00
SoSeDiK
c175596536 Improve the handling of non-registered worlds 2020-06-25 05:33:02 +03:00
TheBusyBiscuit
cccc8f2162
[CI skip] Merge pull request #2015 from LinoxGH/master
Added Magic Pills. The Edited Version
2020-06-24 21:11:30 +02:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
LinoxGH
3278457441 Did the requested changes. 2020-06-24 01:06:48 +03:00
LinoxGH
9205b143ed Added Magic Pills.
Added Magic Pills which are used to cure zombie villagers.
Approved suggestion #178
2020-06-23 21:11:08 +03:00
TheBusyBiscuit
4504259546 Fixed a Unit test 2020-06-22 23:02:21 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
a06e49cf13 Improvements to error logging in world loading 2020-06-22 01:55:11 +02:00
TheBusyBiscuit
8e07ada321 Reduced technical debt / Refactoring 2020-06-21 10:26:54 +02:00
TheBusyBiscuit
68532ea38f Small improvement 2020-06-20 21:41:19 +02:00
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
TheBusyBiscuit
c98aca37f1 Massive Performance improvements to GEO-Miner and Oil Pump 2020-06-20 19:33:37 +02:00
TheBusyBiscuit
4b38dd655d Added ReactorExplodeEvent to the API 2020-06-20 19:21:44 +02:00
TheBusyBiscuit
1456245ee0 Added a toggle for backwards compatibility 2020-06-20 11:56:29 +02:00
TheBusyBiscuit
7059ad216c Refactoring and general improvements 2020-06-19 13:22:52 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
e82acc0b3c Refactoring 2020-06-16 15:36:44 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
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
da7291995b [CI skip] Added some Unit Tests for commands 2020-06-10 17:11:28 +02:00
TheBusyBiscuit
005d2a3c6a Fixed lore 2020-06-09 23:36:01 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
fcd17d3a5a Updated lore for advanced industrial miner 2020-06-05 14:37:31 +02:00
TheBusyBiscuit
8bde659daf The Advanced Miner now preserves buckets 2020-06-05 14:34:24 +02:00
TheBusyBiscuit
15aabd6a63 Attributes are now hidden 2020-06-05 00:37:21 +02:00
TheBusyBiscuit
aebd03301d Added new ItemStacks 2020-06-04 23:56:08 +02:00
TheBusyBiscuit
618bbfff24 Optimized Fuel 2020-06-04 23:55:53 +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
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
2f09470b51 [Ci skip] Reduced technical debt 2020-06-01 13:52:04 +02:00
TheBusyBiscuit
5378341839 [Ci skip] Refactoring and proper deprecation of the HandledBlock class 2020-05-30 14:53:29 +02:00
TheBusyBiscuit
929f26d103 [CI skip] Reduced technical debt 2020-05-30 13:21:17 +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
e2b979fca9 Pushing a new "stable" build 2020-05-27 13:43:52 +02:00
TheBusyBiscuit
982a07262e Another relocation 2020-05-26 10:21:58 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
TheBusyBiscuit
6a4e23853c Added more Unit Tests 2020-05-24 01:48:42 +02:00
TheBusyBiscuit
efcc9c1a4b [CI skip] Refactoring 2020-05-24 00:49:27 +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
Daniel Walsh
8db67af455 Requested pickiness 2020-05-22 10:28:21 +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
TheBusyBiscuit
acd759ae4c [CI skip] Refactoring 2020-05-20 17:20:52 +02:00
TheBusyBiscuit
0d00e52c29 [CI skip] Added SlimefunUtils.getCustomHead() 2020-05-20 16:47:56 +02:00
TheBusyBiscuit
dd633df96f [CI skip] Provoking our discord webhook 2020-05-17 20:20:08 +02:00
TheBusyBiscuit
c69a86ae42 [CI skip] Added a Research unlocking unit test 2020-05-17 14:54:16 +02:00
TheBusyBiscuit
de8fb5ccef [ci skip] refactoring 2020-05-17 12:49:11 +02:00
TheBusyBiscuit
7e137fb360 [CI skip] Refactoring 2020-05-16 15:06:32 +02:00
TheBusyBiscuit
9cafd147aa [ci skip] New texture for restored backpacks 2020-05-16 13:38:26 +02:00
TheBusyBiscuit
d181d54245 Some refactoring 2020-05-16 02:16:29 +02:00
TheBusyBiscuit
3aff637f4f [CI skip] more Unit Tests 2020-05-15 12:16:46 +02:00
TheBusyBiscuit
c2fb42b721 Relocated an Interface 2020-05-14 20:05:08 +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
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
3597fc0388 Reduced technical debt 2020-05-11 18:56:01 +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
Sfiguz7
e021fb9ce3 Tweaked, requested changes added 2020-05-11 01:25:59 +02:00
TheBusyBiscuit
0eeef20b1f A little bit more Unit Tests 2020-05-10 17:13:31 +02:00
TheBusyBiscuit
6a0c45c788 Removed Reflection 2020-05-09 21:39:59 +02:00
TheBusyBiscuit
4df99b6fd8 You better work :reeeee: 2020-05-09 20:31:03 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
TheBusyBiscuit
0e6ce77fd8 Deprecated these methods again 2020-05-09 10:51:55 +02:00
TheBusyBiscuit
c4026966a2 Removed api method 2020-05-09 10:35:21 +02:00
TheBusyBiscuit
974657fadc Fixed some unit tests 2020-05-08 21:26:18 +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
9e63f1ce79 Added Unit Tests for Categories 2020-05-07 19:56:45 +02:00
TheBusyBiscuit
0b416c3201 More tests 2020-05-07 18:00:44 +02:00
TheBusyBiscuit
8577b9ef50 Added Unit Tests for ItemSetting<T> 2020-05-07 17:12:31 +02:00
TheBusyBiscuit
7e04566393 Further unit tests and jacoco coverage reports 2020-05-07 14:28:54 +02:00
TheBusyBiscuit
0e58c3fa35 Added first Unit Tests 2020-05-04 16:25:47 +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
ec96e13c82 [CI Skip] Refactoring 2020-04-26 13:50:37 +02:00
TheBusyBiscuit
15b64fc1d5
Revert "Easier to register items" 2020-04-25 23:13:00 +02:00
Daniel Walsh
a3f7c2dc46
Chaining whooo 2020-04-25 21:57:46 +01:00
Daniel Walsh
15b6e3fa31
Easier to register items
Instead of having to do registerResearch(Research, ItemStack...) you can just do new Research(..., items).register()

Makes this more consistent with the other registering too.
2020-04-25 21:28:04 +01: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
a04676b27c Various improvements, including Pull Request #1790 2020-04-23 13:01:47 +02:00
DNx5
2a22eebd8a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	pom.xml
2020-04-22 06:16:35 +07:00
TheBusyBiscuit
1baefd37b0 Updated dependency 2020-04-21 20:28:26 +02:00
TheBusyBiscuit
9aa6fa68ca [CI skip] Reduced technical debt 2020-04-21 20:25:46 +02:00
TheBusyBiscuit
485cde8c90 Added stronger state preservation to the BlockMenuPreset class 2020-04-21 20:25:33 +02:00
TheBusyBiscuit
b013247ea2 Fixes #1798 2020-04-21 01:48:22 +02: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
16e2376604 Fixes #893 2020-04-19 13:06:58 +02:00
TheBusyBiscuit
a6a061588c Performance optimizations for large addons like ColoredEnderChests 2020-04-18 18:28:20 +02:00
TheBusyBiscuit
79867d79cf [CI skip] Some refactoring 2020-04-17 22:01:09 +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
5115175d7f Fixes #1807 2020-04-13 20:08:05 +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
TheBusyBiscuit
8cb99fd7ae [CI skip] More refactoring, more documentation [javadocs] 2020-04-11 14:38:28 +02: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
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
TheBusyBiscuit
e3d84de7b9 [CI skip] Refactoring 2020-04-09 22:16:32 +02:00
TheBusyBiscuit
f5bd880227 [Ci skip] Forgot to delete this class 2020-04-09 14:31:02 +02: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
ab31180050 [CI skip] Added a new exception [javadocs] 2020-04-08 15:49:44 +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
DNx
2396db25ad code cleanup 2020-04-05 23:25:10 +07: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
TheBusyBiscuit
f65563b28c [CI skip] More refactoring 2020-04-04 20:55:28 +02:00
TheBusyBiscuit
007a4c6f83 [CI skip] More refactoring and documentation [javadocs] 2020-04-04 15:16:11 +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
f054d83130 [CI skip] Generate javadocs [javadocs] 2020-04-03 12:10:42 +02:00
TheBusyBiscuit
44ab15811a Fixes #1779 and some other changes 2020-04-03 11:41:58 +02:00
TheBusyBiscuit
107483d64f [CI skip] Finally... [javadocs] 2020-03-30 18:47:24 +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
a449b62dba [CI skip] Added an API for Guide Options 2020-03-29 18:54:46 +02:00
TheBusyBiscuit
c5793405ee [CI skip] Rebuild javadocs [javadocs] 2020-03-28 21:04:16 +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
43cbdf25e9 [CI skip] Removed deprecated intefaces 2020-03-28 12:50:17 +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
35f45df852 [CI skip] Moved Cargo network classes 2020-03-27 00:31:12 +01:00
TheBusyBiscuit
6553dfce6e Fixes #1768 2020-03-27 00:30:05 +01:00
TheBusyBiscuit
3e90349551 Refactored some things 2020-03-26 18:56:14 +01:00