mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
1,172 Commits 1 Branch 0 Tags 64 MiB
9aa7845293
Commit Graph

232 Commits

Author SHA1 Message Date
TheBusyBiscuit
8b55a4cd26 More Refactoring 2019-08-25 22:21:06 +02:00
TheBusyBiscuit
a1193781cb Reduced technical debt 2019-08-25 22:09:27 +02:00
TheBusyBiscuit
79c1120ae8 Refactoring, Bug Fix and Cleanup 2019-08-25 20:52:38 +02:00
TheBusyBiscuit
d589002430 Added Research-Caching (May improve Performance a lot) 2019-08-25 16:07:06 +02:00
TheBusyBiscuit
db1e69a94b Fixed Talisman of the Anvil (Fixes #800) 2019-08-23 21:15:47 +02:00
dNiym
17f65e26c7 Removed BlockStorageTag that was not needed. 2019-08-22 12:20:19 -04:00
dNiym
b5475f3d3c Made Requested Changes 2019-08-21 21:43:12 -04:00
dNiym
2418764806 Use a variable to compare reactor id types. 2019-08-18 23:43:22 -04:00
dNiym
aeacac0b01 Updated with requested changes 2019-08-18 14:47:25 -04:00
dNiym
8a56939931 Made Requested Changes 2019-08-05 09:44:40 -04:00
dNiym
bac456da25 REACTOR/PORT UPDATE 
Update Reactor and Reactor Access Port to be a bit easier to use, now
when a reactor detects an attached access port the GUI will be updated
to show the two are linked.  Once linked the reactor access port will
show the status of the actual reactor rather than it's own inventory,
allowing users to remotely control the reactor's priority and see the
remaining fuel/coolant.   Items can still be added to the access port
manually or sent in from the cargo manager.
 2019-08-05 01:15:12 -04:00
TheBusyBiscuit
c46d120df8
Merge pull request #991 from dniym/CargoNodeBugFix 
Fix issue #966 (Trying again)
 2019-08-03 19:37:34 +02:00
dNiym
640915d85a Fix issue #966 (Trying again) 2019-08-03 13:27:46 -04:00
NihilistBrew
50d74ced10
Fixed indents 2019-08-03 17:52:10 +02:00
NihilistBrew
8c8996368b
fix PR 2019-08-03 17:39:41 +02:00
NihilistBrew
00d376e213
Update SlimefunMachine.java 2019-08-01 12:03:08 +02:00
NihilistBrew
60064a0fe1 Added OUTPUT_CHEST functionality 
S
 2019-08-01 11:01:43 +02:00
TheBusyBiscuit
2812b84ea8 Minor Code Optimizations 2019-06-20 10:12:34 +02:00
TheBusyBiscuit
1fd0b40f9f Removed URID 2019-06-20 09:50:59 +02:00
TheBusyBiscuit
78cbc990f4 Fixes #912 2019-06-11 13:27:24 +02:00
TheBusyBiscuit
1c600efee3 Possibly fixes #822 2019-06-11 12:45:50 +02:00
TheBusyBiscuit
11fec71a94 Made Credits load asynchronously 2019-05-30 13:42:06 +02:00
sarhatabaot
f30c630bee Update JetBootsTask.java 2019-05-04 22:34:25 +03:00
sarhatabaot
1470ad598a Implemented SlimefunTask in Tasks 
* Implemented SlimefunTask in Tasks.
* This removes the duplication in the code.
 2019-05-04 22:31:26 +03:00
sarhatabaot
6b5b55f988 Changed access levels to enable inheritation of variables 
Changed access levels to enable inheritation of variables in sub classes.
 2019-05-04 22:30:33 +03:00
sarhatabaot
3c651dcccb Update SlimefunTask.java 2019-05-04 22:20:42 +03:00
sarhatabaot
2262222f60 Revert "Revert "Implemeted abstract Task class"" 
This reverts commit 74b89b9380.
 2019-05-04 22:19:12 +03:00
sarhatabaot
74b89b9380 Revert "Implemeted abstract Task class" 
This reverts commit 82b3f3c06c.
 2019-05-04 22:18:53 +03:00
sarhatabaot
82b3f3c06c Implemeted abstract Task class 
* Removes the duplicated code in every Task class.
 2019-05-04 22:18:28 +03:00
sarhatabaot
b20851da07 Encapsulated variables 2019-05-04 22:16:20 +03:00
sarhatabaot
f6312a9bd9 Encapsulated variables 2019-05-04 22:07:56 +03:00
sarhatabaot
4e32c4981c Extracted dupliocted code blocks to methods 2019-05-04 22:04:03 +03:00
sarhatabaot
a622e05ea8 Refactored Talisman 
Refactored the class for better readability.
* Added getPlayerByEventType method, instead of calling it directly from checkFor().
* Added pass method.
* Checking for false results first to reduce the amount of if-else.
* Renamed SlimefunItem talisman -> SlimefunItem item.
* Created new Talisman talisman = (Talisman) item, after instanceof check.
* Note: Casting the item every time to talisman clutters the code.
 2019-05-04 11:06:01 +03:00
sarhatabaot
833ce0108a Replaced iteration with addAll() 
* Iteration replaced with call Collection.addAll
* Encapsulated variables
 2019-05-04 10:25:54 +03:00
Omer Oreg
08538ad876
Return efficiency when getFuelEfficiency is called 
Return efficiency when getFuelEfficiency is called instead of speed.
 2019-04-19 18:09:55 +03:00
SoSeDiK
4fed304381 Fix for #888 2019-04-13 13:47:22 +03:00
SoSeDiK
4710fd809e Fix for SoulJars' spawner recipes not being displayed properly 2019-04-11 16:10:23 +03:00
SoSeDiK
c04b293d62 Fix for #885 2019-04-08 13:53:55 +03:00
SoSeDiK
385edf3cd7 Even more lambdas expressions 2019-03-31 21:32:40 +03:00
SoSeDiK
3c4e8e6b32 Use lambda expressions 2019-03-30 14:32:13 +02:00
SoSeDiK
0794fe8a2c Rename ORGANIC_FOOD and FERTILIZER 2019-03-30 11:59:52 +02:00
TheBusyBiscuit
6213c62f47
Merge pull request #866 from SoSeDiK/deprecations 
Replaced deprecated code
 2019-03-29 22:32:50 +01:00
SoSeDiK
75cbff530c Replaced spaces with tabs 2019-03-27 22:18:59 +02:00
SoSeDiK
c8965e120f Replaced deprecated code parts 2019-03-27 22:10:19 +02:00
SoSeDiK
9e9e36e5c2 Replaced Durability with Damageable meta 2019-03-27 22:09:04 +02:00
SoSeDiK
3c385770e1 Optimized researching progress 2019-03-27 21:38:30 +02:00
SoSeDiK
ef868eae31 Removed unused imports 2019-02-23 23:14:01 +02:00
SoSeDiK
0728523ab7 Keep Waterlogged BlockData 
Glass panes now keep their Waterlogged BlockData
 2019-02-23 22:59:12 +02:00
TheBusyBiscuit
b99a75f7a7 Removed Apache Lang 2019-02-20 12:20:44 +01:00
Sniddunc
b83f64a0a7 Fixed a Furnace bug where the item did not smelt and the GUI repeated off the screen. 2018-11-24 03:39:20 -05:00
Sniddunc
442a92c247 Fixed a Furnace bug where the item did not smelt and the GUI repeated off the screen. 2018-11-24 03:24:31 -05:00
TheBusyBiscuit
d56c872be2 Removed AdvancedRainbowTicker 2018-09-05 18:37:23 +02:00
TheBusyBiscuit
e592b0dc1e Removed deprecated code from Machines 2018-09-05 18:36:32 +02:00
MisterErwin
c0e51f2458 Code cleanup + MaterialHelper 2018-09-05 18:26:58 +02:00
MisterErwin
4632d2f55b Fixed RainbowTicker not updating glass pane facings 2018-09-05 18:11:42 +02:00
MisterErwin
81a0509b70 Added 1.13 Material for CharCoal to the Carbonpress 2018-09-05 18:10:01 +02:00
MisterErwin
acb4d0a922 Added the new Leaves & "clay"/terracotta to the ECrucible 2018-09-05 17:49:47 +02:00
MisterErwin
171e244a80 Using 1.13 Materials for CargoNodes (and the MaterialHook for the channel colour) 2018-09-05 17:49:14 +02:00
MisterErwin
da9b93b32e Using 1.13 Materials and Particles for Machines 2018-09-05 17:44:03 +02:00
MisterErwin
860a2dfe09 Using 1.13 Materials for Machines 2018-09-05 17:43:36 +02:00
MisterErwin
9ab28ad47c Using 1.13 Materials for Machines 2018-09-05 17:43:06 +02:00
MisterErwin
18c62bca95 Using 1.13 Materials 2018-09-05 17:41:08 +02:00
MisterErwin
7a6dc71f1b Removed unnötiges ToDo 2018-09-05 17:40:26 +02:00
MisterErwin
40bf16390f Added RainbowTicker 2018-09-05 17:40:11 +02:00
MisterErwin
9f8b728249 Added 1.13 logs 2018-09-05 17:39:51 +02:00
MisterErwin
3f588e92ba Disabled the AdvancedRainbowTicker - is this one still needed? 2018-09-05 11:41:54 +02:00
MisterErwin
f18aa30631 Using vanilla/spigot particles 2018-09-05 11:30:49 +02:00
TheBusyBiscuit
93039c7cc3 First steps towards 1.13.1 port. 2018-09-04 11:33:57 +02:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +03:00
SoSeDiK
6eb17d1d45 Removed unused imports 2018-06-06 11:46:18 +03:00
TheBusyBiscuit
340fc046d0
Fixed Reactor Overflows 2018-05-11 13:11:13 +02:00
TheBusyBiscuit
439818fb0e
Merge pull request #673 from KyleEstein/legacy_washers 
Allow admins to chose ore washer and dust washer behavior
 2018-05-05 19:38:29 +02:00
Rick
80e1a489c8 Fixes repaired/reinforced spawner in guide. 2018-05-05 09:20:10 -04:00
KyleEstein
07134165d6 Implement changes requested by TheBusyBiscuit 2018-05-04 21:41:24 -04:00
Rick
cc5e7c6e13 Stops constant calls to getByItem() for empty book stacks. 2018-05-03 23:21:14 -04:00
Rick
e3bbf4b442 Fixes Repaired Spawner in the guide... no idea why that's true. 2018-05-03 20:52:32 -04:00
KyleEstein
17ec56799a Allow admins to chose ore washer and dust washer behavior 2018-04-28 20:13:37 -04:00
KyleEstein
692904ffc3 Missed updating one onBreak() in AFarm.java 2018-04-28 12:14:17 -04:00
KyleEstein
a876301d94 Cast inventory to a variable instead of calling getInventory() over and over 2018-04-28 12:05:43 -04:00
KyleEstein
b16b936b81 Fix Additional Devices Vulnerable to Duplication Bug 2018-04-25 23:40:46 -04:00
KyleEstein
66176b445a Merge branch 'master' of github.com:KyleEstein/Slimefun4 2018-04-25 19:36:37 -04:00
Rick
4acd3645dd Reverts change to isItem, makes changes instead to getByItem 2018-04-23 20:34:53 -04:00
Kyle Einstein
e2342c38eb Fix Two Player Duplication Bug 2018-04-23 08:33:29 -04:00
Rick
91587048c3 removes case for getbyitem... since i can't check items in the loop here, I can't check the actual item, so this just throws an error and doesn't work anyway. 2018-04-22 12:47:22 -04:00
Rick
e6199e3d46 Moves special case out of loop 2018-04-22 12:11:51 -04:00
Rick
83e55c255d Changed to special cases only for solving issue with Broken/Repaired spawner renaming ability. There may still be other items these routines don't define as "SlimeFun items" without identical lore to the example, but hopefully this covers everything. 2018-04-22 10:19:57 -04:00
Rick
6e1376cfb2 Fix for the Anvil being able to rename Broken and Reinforced Spawners resulting in becoming vanilla pig spawners. Problem with isDisabled... called isItem... which doesn't return an affirmative unless the lore matches exactly... however... lore would nearly never match exactly: backpacks have different ids or no ids, no item ever matches to "<type>" or "<id>" which should result in a great number of slimefun items being identified as NOT SlimeFun items. 2018-04-20 17:43:57 -04:00
Oliver Wright
d21f93239b
AReactor fix & a fix for chargable energy sources 2018-03-10 15:32:16 +00:00
Oliver Wright
7278f80c6f
Fix #617: Electric Dust Washer - Dust Choice. 2018-03-02 20:17:44 +00:00
VoidAngel
2bec58d361
Fix for #532 - Limited disenchanter dupe glitch 2018-02-20 14:14:56 -08:00
TheBusyBiscuit
0a6f54ec8d
Merge pull request #569 from Poslovitch/documentation 
Documentation fixes and improvements
 2018-01-07 20:48:12 +01:00
TheBusyBiscuit
1d0660db53
Merge pull request #570 from Redemption198/master 
Fixed Android Miner not breaking Slimefun blocks correctly
 2018-01-07 20:29:14 +01:00
Florian CUNY
16af68b289 Simplified CategorySorter#compare() 2018-01-06 15:28:02 +01:00
Florian CUNY
f2a74bb46c Improved documentation in Category and Alloy 2018-01-06 15:26:01 +01:00
John000708
2777ec9407 Small fix 2018-01-06 11:07:54 +01:00
John000708
b6c3021355 Fixed speed modifier not getting applied to Enhanced Furnaces 2018-01-05 18:09:10 +01:00
Redemption
ffc9de3f7c
Added ANDROID_DIG as Unregister Reason 2018-01-03 16:26:43 +01:00
Florian CUNY
97bd64474f Wrapped the ID in \" to simplify reading the exception 2017-12-26 15:45:52 +01:00
Florian CUNY
c14aba1e6b Explicitly disallow registering two SFItems with same ID 2017-12-26 15:44:18 +01:00
Florian CUNY
36ddfbf65f Simplified the pass condition in Talisman 2017-12-09 15:53:44 +01:00