1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

3154 Commits

Author SHA1 Message Date
TheBusyBiscuit
b855766239
Merge pull request #482 from akashaggarwal7/master
Minor fix and enhancement to tab completion
2017-11-01 11:52:28 +01:00
Akash Aggarwal
9a288debd6 Smart tab completion 2017-11-01 14:59:05 +05:30
Akash Aggarwal
ed6ba8ca67 Fixed typo 2017-11-01 14:31:07 +05:30
Florian CUNY
f2dd943df3 Added a "hide-in-recipe-book" option + cleaned up a lot of things
The SlimefunItem class was quite of a mess, due to all the successive additions made in the last year.
2017-10-14 14:42:14 +02:00
Florian CUNY
4e289a5ff5 Initialize some fields inline instead of constructors 2017-10-14 10:55:50 +02:00
TheBusyBiscuit
96e8e33391 Merge pull request #457 from dpkirchner/master
Fix ConcurrentModificationException that occurred when reactor explodes.
2017-10-14 09:45:03 +02:00
Florian CUNY
58b9bff978 Made the required permission a field 2017-10-13 21:12:33 +02:00
Florian CUNY
81c7bb169d Made use of the "id" instead of "name" of a SlimefunItem 2017-10-13 20:59:52 +02:00
Florian CUNY
657fd4d112 Added requirePermissionToUse field (https://github.com/TheBusyBiscuit/Slimefun4/issues/410) 2017-10-13 20:46:28 +02:00
Florian CUNY
cc79e62f34 Made use of the renamed methods 2017-10-13 16:34:38 +02:00
Florian CUNY
01d04caf66 Privatized all SlimefunItem fields 2017-10-13 15:56:48 +02:00
David Kirchner
393b4835d9 Fix ConcurrentModificationException that occurred when reactor explodes.
CraftBukket's HumanEntity.closeInventory() apparently removes the human
from the inventory's viewer list, resulting in an exception when we were
calling closeInventory while iterating over the list of said viewers.

Fixes TheBusyBiscuit/Slimefun4#364.
2017-10-08 19:46:42 -07:00
TheBusyBiscuit
5dd53540ee Merge pull request #448 from dpkirchner/master
Don't consume XP until we are about to unlock the requested research.
2017-10-07 09:15:57 +02:00
David Kirchner
287dcba37a Don't consume XP until we are about to unlock the requested research.
Fixes TheBusyBiscuit/Slimefun4#195.
2017-10-06 23:54:55 -07:00
TheBusyBiscuit
2644be0e2f Merge pull request #447 from dpkirchner/master
Only create a hopper "target" as long as the block is actually a hopper.
2017-10-06 16:46:28 +02:00
David Kirchner
f278abc76a Only create a hopper "target" as long as the block is actually a hopper.
This fixes a bug that led to abandoned ArmorStands (what I was referring
to when I said "target") that lingered after the hopper was destroyed.
The issue was that tick (called asynchronously) was creating a new
ArmorStand (via InfusedHopper.getArmorStand()) after the block handler's
onBreak call removed the one that was created in onPlace.

The code that recreates the ArmorStand remains in tick() just in case,
somehow, it ends up getting removed by some other force. However, this
code should never be reached if the hopper itself is removed.

This fixes TheBusyBiscuit/Slimefun4#189,
fixes TheBusyBiscuit/Slimefun4#190, and
fixes TheBusyBiscuit/Slimefun4#428.
2017-10-05 19:49:33 -07:00
TheBusyBiscuit
4e57bc30df Merge pull request #446 from dpkirchner/master
Remove code that swaps stacks of items between cursor and furnace.
2017-10-05 11:32:18 +02:00
David Kirchner
525dcf1594 Remove code that swaps stacks of items between cursor and furnace.
Shift-clicking stacks in and right-clicking while holding a stack
on your cursor over the furnace now works the same as those actions
work with other blocks such as the workbench.

Fixes TheBusyBiscuit/Slimefun4#328 and addresses
TheBusyBiscuit/CS-CoreLib#19 (which was indeed not a CS-CoreLib
issue).
2017-10-04 18:48:32 -07:00
TheBusyBiscuit
79c83c691a Update plugin.yml 2017-09-10 19:25:34 +02:00
TheBusyBiscuit
76a45475ca Merge pull request #425 from Poslovitch/piston-duplication-fix
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/415
2017-09-10 19:23:22 +02:00
TheBusyBiscuit
691363d655 Merge pull request #426 from Poslovitch/408-fix
Fixes ignored frequencies for Cargo
2017-09-10 19:22:19 +02:00
Poslovitch
319238f4b3 Fixes ignored frequencies for Cargo
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/408

Was due to the JSON storage format (everything is String). #getInt was
therefore returning 0.
2017-09-10 16:13:59 +02:00
Poslovitch
eb17f19258 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/415 2017-09-10 11:05:54 +02:00
TheBusyBiscuit
55731ef532 Explicitly declare type arguments 2017-08-24 00:03:49 +02:00
TheBusyBiscuit
91150e53a6 Merge pull request #402 from Poslovitch/391-395-fix
Blockstates must be explicitly updated as of 1.12.1
2017-08-21 18:28:31 +02:00
Poslovitch
c34673ac14 Blockstates must be explicitly updated as of 1.12.1
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/391
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/395
2017-08-20 18:37:09 +02:00
TheBusyBiscuit
698ce1877a Merge pull request #398 from Poslovitch/runes-recipes
Crafting a Water Ancient Rune now gives 4 instead of 2
2017-08-18 09:30:38 +02:00
Poslovitch
4aac192776 Crafting a Water Ancient Rune now gives 4 instead of 2 2017-08-17 13:08:59 +02:00
TheBusyBiscuit
4152e3ed0e Merge pull request #397 from Poslovitch/documentation
Documentation - 1
2017-08-15 20:13:49 +02:00
Poslovitch
4a7ebf9377 Made EnderTalisman use the new addHint instead of addDescription 2017-08-15 16:56:01 +02:00
Poslovitch
39d77b5eb5 Documented Slimefun (except GuideHandler related) ; deprecated #addDescription() in favor of #addHint() 2017-08-15 16:37:25 +02:00
Poslovitch
1617c76d9d Documented SlimefunItem.State 2017-08-15 00:06:48 +02:00
Poslovitch
6eecee0eae Documented WikiSetup 2017-08-14 18:16:09 +02:00
Poslovitch
4b284a3005 Fixed VanillaItem since version 2017-08-14 18:15:59 +02:00
Poslovitch
a6fcd5146b Documented VanillaItem 2017-08-14 17:43:37 +02:00
Poslovitch
00ed41fcbe Documented UnregisterReason 2017-08-14 17:43:26 +02:00
Poslovitch
5389f2a46c Documented Alloy 2017-08-14 17:43:08 +02:00
TheBusyBiscuit
850b2c4c9e Merge pull request #393 from Poslovitch/silence-github
Added an option to toggle Github data retrieving print out
2017-08-13 00:25:40 +02:00
Poslovitch
f8442a3d0c Added an option to toggle Github data retrieving print out 2017-08-13 00:18:09 +02:00
TheBusyBiscuit
cd34d6d563 Merge pull request #389 from Poslovitch/338-fix
Fixed IllegalArgumentException when try to push null item from a ReactorAccessPort
2017-08-12 23:18:21 +02:00
Poslovitch
1d901c940f Fixed IllegalArgumentException when try to push null item from a ReactorAccessPort
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/338
2017-08-12 16:26:19 +02:00
TheBusyBiscuit
bbf4b5ed85 Merge pull request #387 from Poslovitch/297-fix
Fixed radioactive items giving effects even if they were disabled
2017-08-12 16:18:06 +02:00
Poslovitch
29ce4c428a Use #isEnabled() instead of #getWhitelist() 2017-08-12 16:08:50 +02:00
TheBusyBiscuit
cf9826a2d6 Merge pull request #388 from Poslovitch/blistering-ingot-research
Added a research for blistering ingots
2017-08-12 15:48:16 +02:00
TheBusyBiscuit
190cdaddd9 Merge pull request #385 from Poslovitch/380-fix
Fixes Fortune V impossible to be obtained using Wizard Talisman
2017-08-12 15:42:28 +02:00
TheBusyBiscuit
54b8f59ccd Merge pull request #386 from Poslovitch/366-fix
Fixes IllegalArgumentException caused by a mis-handled negative bound in randomizer
2017-08-12 15:22:41 +02:00
Poslovitch
bd7b7c7ca0 Fixed an error my IDE didn't notice me 2017-08-12 15:21:29 +02:00
Poslovitch
00ef07b0bb Added a research for blistering ingots 2017-08-12 15:18:05 +02:00
Poslovitch
9f9252991c Fixed radioactive items giving effects even if they were disabled
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/297
2017-08-12 14:28:34 +02:00
Poslovitch
b3e3160f73 Fixes a missing bracket 2017-08-12 13:27:58 +02:00