TheBusyBiscuit
ee4490c240
Fixes #839
2019-05-30 12:08:14 +02:00
TheBusyBiscuit
98cbec3840
Merge pull request #918 from freethemice/patch-3
...
unclosed character literal
2019-05-29 22:25:44 +02:00
freethemice
5ffb1a5170
unclosed character literal
...
fixes "unclosed character literal" error some people may get on compile.
2019-05-28 17:19:15 -05:00
TheBusyBiscuit
7107c04ecd
Merge pull request #917 from Kry-Vosa/patch-1
...
Fix for #913
2019-05-25 17:36:59 +02:00
Kry-Vosa
59a0811445
Fix for #913
...
Ported fix from #804
2019-05-24 14:51:49 +02:00
TheBusyBiscuit
7f8b38cf43
Merge pull request #916 from Kry-Vosa/patch-1
...
Fix for #915
2019-05-24 12:29:21 +02:00
Kry-Vosa
d9015cbbf3
Fix for #915
...
setCustomName removes unnecesary ChatColor codes (e.g. &r that doesn't reset anything). Saving the true CustomName in BlockStorage resolves the issue.
2019-05-22 18:14:32 +02:00
TheBusyBiscuit
6df3f8dfe1
Updated CS-CoreLib Version to the latest Release
2019-05-12 21:19:11 +02:00
TheBusyBiscuit
8fe3fece6e
Update issue templates
2019-05-11 13:20:02 +02:00
TheBusyBiscuit
cbfb0cb906
Update issue templates
2019-05-11 13:16:03 +02:00
TheBusyBiscuit
f5bc2445a5
Merge pull request #909 from sarhatabaot/master
...
Refactored Talisman, and tasks
2019-05-07 21:49:31 +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
TheBusyBiscuit
3feff223bc
Merge pull request #902 from WalshyDev/patch/mc_1_14
...
SF 4.1.17 - MC v1.14
2019-04-29 20:02:20 +02:00
Daniel Walsh
b0832702af
Update CS-CoreLib to 1.14 patch
2019-04-29 18:08:05 +01:00
TheBusyBiscuit
15555872c7
Merge pull request #905 from sarhatabaot/patch-1
...
Minor codecleanup & fixed spelling mistake
2019-04-29 18:43:54 +02:00
Omer Oreg
364a7944a6
Minor codecleanup & fixed spelling mistake
...
* Specifying the type in the diamond operator is not necessary in from java 7
* Spelling mistake: convertable -> convertible
* Encapsulated the item & machine variables.
* Changed the constructor as Slimefunitem item is not used anywhere except in the constructor.
2019-04-29 14:12:55 +03:00
WalshyDev
733f401ff6
SF 4.1.17 - MC v1.14
2019-04-28 16:22:30 +01:00
TheBusyBiscuit
bc27ac81b1
Update pom.xml
2019-04-20 13:40:46 +02:00
TheBusyBiscuit
f1512ffeea
Merge pull request #900 from sarhatabaot/patch-1
...
Return efficiency when getFuelEfficiency is called
2019-04-20 10:16:24 +02:00
TheBusyBiscuit
5b0a3f2acf
Merge pull request #898 from jellysnake/master
...
Fix miners not having the correct range
2019-04-20 10:16:16 +02: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
jellysnake
0d65da0dd7
Fix miners not having the correct range
2019-04-19 01:07:35 +10:00
TheBusyBiscuit
4f05f8047d
Merge pull request #891 from SoSeDiK/cargo
...
Fix for #888
2019-04-13 14:25:57 +02:00
SoSeDiK
4fed304381
Fix for #888
2019-04-13 13:47:22 +03:00
TheBusyBiscuit
9436c3d654
Merge pull request #889 from SoSeDiK/SoulJars
...
Fix for SoulJars' spawner recipes not being displayed properly
2019-04-11 15:23:42 +02:00
SoSeDiK
4710fd809e
Fix for SoulJars' spawner recipes not being displayed properly
2019-04-11 16:10:23 +03:00
TheBusyBiscuit
eab826539b
Update README.md
2019-04-10 22:03:21 +02:00
TheBusyBiscuit
e919fe336c
Added Discord
2019-04-10 22:00:22 +02:00
TheBusyBiscuit
506c54149e
Changed Script Rating System
2019-04-10 18:45:14 +02:00
TheBusyBiscuit
090471167c
Merge pull request #886 from SoSeDiK/androids
...
Better Androids
2019-04-10 18:31:38 +02:00
SoSeDiK
3826993be2
Better menu switching for Androids
2019-04-08 14:45:02 +03:00
SoSeDiK
c04b293d62
Fix for #885
2019-04-08 13:53:55 +03:00
TheBusyBiscuit
33073a4100
Merge pull request #877 from SoSeDiK/lambda
...
Use lambda expressions
2019-04-07 11:44:42 +02:00
TheBusyBiscuit
0c96f69346
Merge pull request #882 from SoSeDiK/temp
...
Temporary fix for #881
2019-04-07 11:44:06 +02:00
TheBusyBiscuit
a736484e55
Merge pull request #884 from bverhoeven/null-item-fix
...
Prevent Slimefun blocks from getting corrupted at startup
2019-04-07 11:38:59 +02:00
Bas Verhoeven
0d45fee741
Do not overwrite block for a location that already has a valid block
...
This shouldn't happen, but if it does happen it'll definitely break the block.
We'll notify the server administrator on load and only keep the first block we
see.
Note that this will only happen if there's something seriously wrong with the
block as generally there'll not be a situation where information is stored in
two different files.
2019-04-07 03:02:09 +02:00
Bas Verhoeven
1d7c1e68c8
Do not load incomplete blocks (missing "id")
...
If incomplete blocks are loaded, without an "id", items will not have
any usable slimefun block information and will not be usable. Breaking
these blocks will give you a "CSCoreLib's Head".
2019-04-07 03:01:53 +02:00
SoSeDiK
fb50e6c59a
Update SlimefunItems.java
2019-04-03 16:37:39 +03:00
SoSeDiK
385edf3cd7
Even more lambdas expressions
2019-03-31 21:32:40 +03:00
