1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

702 Commits

Author SHA1 Message Date
dniym
bd4732281b
Set SAW_MILL to be hidden in the slimefun guide 2019-07-30 12:49:04 -04:00
dniym
d0fa9a53fd
Added a new basic machine to replace the Saw Mill
Sawmill was obsolete and could not be easily reworked to allow for new minecraft logs.
2019-07-30 12:43:17 -04:00
TheBusyBiscuit
bf61b4a42f Added GitHubBuilds-Updater for development-builds 2019-07-17 14:57:52 +02:00
Nathan Adhitya
e1190a5d1e
Update ItemListener.java 2019-07-08 17:07:38 +07:00
SoSeDiK
839c263955 Replace SimpleJSON with Gson 2019-06-23 23:03:20 +03:00
CyberPatriot
f9ee475dca Push 2019-06-20 18:12:23 -05:00
CyberPatriot
ebd1275f89
Change boolean allow = true to false
The reason for this is because it solves a duplication glitch.
2019-06-20 17:50:03 -05:00
TheBusyBiscuit
2812b84ea8 Minor Code Optimizations 2019-06-20 10:12:34 +02:00
TheBusyBiscuit
7c011d916a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-06-20 09:51:15 +02:00
TheBusyBiscuit
1fd0b40f9f Removed URID 2019-06-20 09:50:59 +02:00
TheBusyBiscuit
5656a0564f
Update AncientAltarListener.java 2019-06-19 22:33:47 +02:00
TheBusyBiscuit
0a5c9e901e
Fixed Ancient Altar Items 2019-06-19 22:32:09 +02:00
CyberPatriot
2f301be679
Update ReactorHologram.java 2019-06-19 09:26:30 -05:00
CyberPatriot
3e6767cfb3
Update EnergyHologram.java 2019-06-19 08:32:33 -05:00
CyberPatriot
569f9bb329
Fix holograms for Cargo and energy 2019-06-19 08:32:18 -05:00
TheBusyBiscuit
4946d428ad Fixed Item Recognition System 2019-06-19 08:46:43 +02:00
TheBusyBiscuit
27cb4c389c Fixed Ancient Altar Recipes for good 2019-06-18 17:39:59 +02:00
TheBusyBiscuit
b2420b8271 Fixed Ancient Altar Recipes 2019-06-18 15:35:16 +02:00
TheBusyBiscuit
b333cfd7a5 Improved Ancient Altar Recipe Recognition System 2019-06-18 14:55:52 +02:00
Bas Verhoeven
eba6fb041f Drop Slimefun items when broken by another Slimefun tool
When a Slimefun item that doesn't have a BlockHandler is broken by a
tool that does have a BlockHandler and that tool's BlockHandler returns
true, Slimefun would stop handling the "onBlockBreak" event and would
not drop the Slimefun item that was broken but some vanilla block
instead.

This commit attempts to fix the way those events are handled, ensuring
that if a Slimefun item is broken one is dropped for the player.
2019-06-13 21:18:43 +02:00
CyberPatriot
877e01b1be
Fix for issue #879
This edit is for issue #879 . Tested on latest versions of Slimefun, ChestTerminal, and CS-CoreLib. 1.13 is to be determined.
2019-06-12 23:48:38 -05: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
Steve
3900cb7aff
Update ItemListener.java 2019-06-10 22:32:31 +04:00
Bas Verhoeven
7b2a869abe Damage explosive pickaxe on use (configurable, off by default)
The Explosive Pickaxe currently doesn't take any damage and therefore
doesn't lose durability, which isn't a desirable behavior for some of
us.

This commit adds a 'damage-on-use' item setting for EXPLOSIVE_PICKAXE,
which is disabled by default. When enabled, the Explosive Pickaxe will
get damaged for each block it breaks, in the same way a normal Diamond
Pickaxe would get damage if it were to break those blocks. This seems
to be similar to how Slimefun damages other tools.

Players can still enable Unbreaking (e.g. durability) on the pickaxe.
2019-05-30 21:07:36 +02:00
Bas Verhoeven
0af6ec13d6 Do not allow more than 54 items in reactor/generator setup guide slots
If we don't, opening the schematics for a Bio Reactor results in

"IllegalArgumentException: Size for custom inventory must be a multiple
 of 9 between 9 and 54 slots"

And the player is simply handed the Bio Reactor, which they can place
and use. Once they do that, the Slimefun guide can't be used until they
reconnect.

For generators and reactors we show the fuels underneath the schematics
or build instructions. When there are more fuels than available space to
show them, we'll overflow, causing the custom inventory to not work and
Slimefun throwing exceptions.
2019-05-30 20:08:35 +02:00
TheBusyBiscuit
3010e93675 Fixes #895 2019-05-30 13:50:20 +02:00
TheBusyBiscuit
11fec71a94 Made Credits load asynchronously 2019-05-30 13:42:06 +02:00
TheBusyBiscuit
ee4490c240 Fixes #839 2019-05-30 12:08:14 +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
Kry-Vosa
59a0811445
Fix for #913
Ported fix from #804
2019-05-24 14:51:49 +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
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
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
f1512ffeea
Merge pull request #900 from sarhatabaot/patch-1
Return efficiency when getFuelEfficiency is called
2019-04-20 10:16:24 +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