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

246 Commits

Author SHA1 Message Date
TheBusyBiscuit
2940db51ad Refactoring 2019-08-30 22:56:44 +02:00
Sfiguz7
29a8d81345 Local variables name compliance changes 2019-08-30 22:49:18 +02:00
TheBusyBiscuit
591160a45f Removed more empty methods 2019-08-30 22:41:58 +02:00
TheBusyBiscuit
1b27287f15
Merge pull request #1068 from Sfiguz7/master
Removed empty methods
2019-08-30 22:18:51 +02:00
TheBusyBiscuit
1de54daf5d Refactoring 2019-08-30 22:18:36 +02:00
Sfiguz7
a5eeb7c414 Removed empty methods 2019-08-30 22:05:49 +02:00
TheBusyBiscuit
f9bbfdc869 Changed Pressure Chamber and Table Saw Slabs 2019-08-30 21:48:11 +02:00
TheBusyBiscuit
5ec7a27b2b Fixed Multiblocks 2019-08-30 20:41:39 +02:00
TheBusyBiscuit
0fd44d2136 Reduced technical debt 2019-08-30 13:47:58 +02:00
TheBusyBiscuit
c378697f42 More Cleanup 2019-08-30 12:47:22 +02:00
TheBusyBiscuit
1ec935b334 More Code Cleanup 2019-08-30 11:28:27 +02:00
TheBusyBiscuit
09354e0be1 Refactored code 2019-08-30 11:15:26 +02:00
TheBusyBiscuit
2e89de4d3a Code cleanup 2019-08-30 09:21:49 +02:00
TheBusyBiscuit
5fa929e633 Reduced technical debt 2019-08-30 01:40:18 +02:00
TheBusyBiscuit
f8ad7bd13c Hotfix 2019-08-30 01:15:21 +02:00
TheBusyBiscuit
07271edc47 Reduced technical debt 2019-08-30 01:11:33 +02:00
TheBusyBiscuit
a83266104e More Refactoring 2019-08-30 00:43:17 +02:00
Sfiguz7
c11eb54037 Cleaning 2019-08-29 23:18:04 +02:00
Sfiguz7
85ee828abf Separated variable declaration 2019-08-29 22:46:03 +02:00
Sfiguz7
f86e362e2f Bigger code cleaning 2019-08-29 22:04:31 +02:00
Sfiguz7
c23b0e438b Code cleaning 2019-08-29 19:12:53 +02:00
LinoxGH
12fa69ac42
Changing the progress bar and removing redundant checks.
Implementing the changes requested in the PR to original Slimefun4 repo.
2019-08-29 17:30:30 +03:00
LinoxGH
6f09eaa1e4
Fixing the auto drier using multiple inputs. 2019-08-29 17:16:39 +03:00
LinoxGH
4e152ca180
Adding the file of the Auto Drier machine itself. 2019-08-29 16:56:18 +03:00
TheBusyBiscuit
388873d6a2 Reduced technical debt 2019-08-29 15:13:40 +02:00
TheBusyBiscuit
99cd14fa5f Added "legacy-ore-grinder" config option for old Ore Grinder Behaviour. 2019-08-29 10:26:36 +02:00
TheBusyBiscuit
e0316453d9 Reduced technical debt 2019-08-28 10:59:20 +02:00
TheBusyBiscuit
dc1cff31f5 Connected Interfaces to abstract classes 2019-08-28 00:48:39 +02:00
TheBusyBiscuit
1b3c0fcdc2 Fixed more stupid backwards compatibility 2019-08-28 00:43:18 +02:00
TheBusyBiscuit
9982292e80 Final fix 2019-08-28 00:09:23 +02:00
TheBusyBiscuit
33266c7c88 Fixed even more Issues 2019-08-27 23:48:41 +02:00
TheBusyBiscuit
2b09ca5e61 Stupid backwards compatibility 2019-08-27 23:24:43 +02:00
TheBusyBiscuit
4875ce1241 Revert "Removed deprecated junk"
This reverts commit cc3c026b1c.
2019-08-27 23:18:58 +02:00
TheBusyBiscuit
cc3c026b1c Removed deprecated junk 2019-08-27 23:14:10 +02:00
TheBusyBiscuit
204e61d3a5 Fixes #1049 again 2019-08-27 22:32:26 +02:00
TheBusyBiscuit
87ff5fdbc2 Pushing missing files 2019-08-27 21:46:50 +02:00
TheBusyBiscuit
31c7c50f64 Fixes #1049 2019-08-27 21:43:43 +02:00
TheBusyBiscuit
aff264d66c More Refactoring + Code Cleanup (Reduced cognitive load) 2019-08-27 20:37:33 +02:00
TheBusyBiscuit
3d3f1b6c87 Fixed Ignition Chamber Bug 2019-08-27 17:55:20 +02:00
TheBusyBiscuit
04444fc298 This File gets a Refactoring,
that File gets a Refactoring,
everybody gets a Refactoring!
2019-08-27 16:26:35 +02:00
TheBusyBiscuit
77a8911b8c Another large wave of refactoring and technical debt reduction 2019-08-27 15:27:38 +02:00
TheBusyBiscuit
effca277ba
Merge pull request #1039 from dniym/ElectricFurnace
Fix electric furnaces not being able to use logs.
2019-08-25 23:30:56 +02:00
dNiym
1859aef846 Fix electric furnaces not being able to use logs. 2019-08-25 17:24:51 -04: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
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
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
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
ef868eae31 Removed unused imports 2019-02-23 23:14:01 +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
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
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
f18aa30631 Using vanilla/spigot particles 2018-09-05 11:30:49 +02:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +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