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

434 Commits

Author SHA1 Message Date
Redemption
229dca3766
Added parameters to EventHandler 2017-11-25 13:31:13 +01:00
Florian CUNY
fd4d678332
Use brackets in loops 2017-11-25 10:31:09 +01:00
Florian CUNY
93f877a2d4 Error reports : prioritized Slimefun Environment (addons, etc) 2017-11-25 10:22:53 +01:00
Florian CUNY
6093b4cf49
Fixed some typo from 05b1fe77a5 2017-11-23 22:23:50 +01:00
Florian CUNY
18017680e8
Fixed some spacing 2017-11-23 22:21:02 +01:00
Florian CUNY
05b1fe77a5
Re-added all the "this." to #register(boolean) 2017-11-23 22:16:45 +01:00
Florian CUNY
c95bafad6a
Fixed #addWikipage(String) link to TheBusyBiscuit 2017-11-23 22:11:32 +01:00
Florian CUNY
b4e85d96e7
Fixed Android being able to break command blocks 2017-11-23 09:16:05 +01:00
AtomicScience
cc9c07ad60 Fix "Ore Washer Dupe" 2017-11-23 00:09:44 +03:00
AtomicScience
bda7a18c5b Fix "Ore Washer Fix" 2017-11-23 00:00:33 +03:00
Redemption
3fcfadb189
Update Messages.java 2017-11-22 21:21:39 +01:00
Redemption
51f23f90c1
Changed cant-place to cannot-place 2017-11-22 21:20:08 +01:00
Redemption
179ad06bbf
Changed cant-place to cannot-place 2017-11-22 21:19:25 +01:00
Poslovitch
2c2bc42540 Changed key "hide-in-recipe-book" to "hide-in-guide" 2017-11-22 20:39:18 +01:00
Poslovitch
502efd862b Revert requirePermissionToUse (not ready yet) 2017-11-22 20:37:30 +01:00
Redemption
0eb52e6627
Removed else return (line 192) 2017-11-22 20:34:57 +01:00
Redemption
9ad714601b
Update Messages.java 2017-11-22 18:41:27 +01:00
Redemption
a0edb57464
Merge branch 'master' into master 2017-11-22 18:39:35 +01:00
Redemption
e57eec9b14
Added onBlockPlace event
Added onBlockPlace event to prevent block placements (by players) above the pedestals
2017-11-22 18:36:12 +01:00
Redemption
1749ae4131
Added messages.cant-place 2017-11-22 18:34:42 +01:00
Poslovitch
26c13b375e Explosive pickaxe could break BARRIER, and COMMAND blocks 2017-11-22 17:36:28 +01:00
Redemption
aa600a4ae3
Changed PEDESTAL.obstructed
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
2017-11-22 10:31:10 +01:00
Redemption
f4bc3d1f80
Changed pedestal.obstruct
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
2017-11-22 10:29:19 +01:00
Redemption
47c13fe9e7
Removed else at line 65 2017-11-21 19:33:05 +01:00
Redemption
d84e5a09e2
Pedestals now check for the block above 2017-11-21 19:32:06 +01:00
Redemption
cb7a8a3949
Added PEDESTAL.obstucted message 2017-11-21 19:27:31 +01:00
TheBusyBiscuit
fc58f9163d
Merge pull request #494 from AtomicScience/master
New Slimefun block - Automatic Ignition Chamber
2017-11-21 18:26:20 +01:00
AtomicScience
afb341acff
"resf" renamed to "chamber" 2017-11-21 11:25:06 +03:00
AtomicScience
cb5f146840
Code optimization 2017-11-20 17:59:20 +03:00
AtomicScience
89b1da7db8 Changed the way of detect the Chamber 2017-11-20 15:48:52 +03:00
atom
7270eee3c4 Changed the way of detect the Chamber in onIgnitionChamberItemMove 2017-11-20 15:48:17 +03:00
AtomicScience
b61bd7c3ef
Updated "machines.ignition-chamber-no-flint" 2017-11-20 15:12:09 +03:00
AtomicScience
4180f5548c
Changed the lore of Chamber a little 2017-11-20 15:09:36 +03:00
Redemption
373765d1ac
Changed guide's default permission to true 2017-11-19 23:06:36 +01:00
Redemption
d100d03b8c
Added slimefun.command.guide permission 2017-11-19 23:01:18 +01:00
Redemption
3bba53b20d
Added permission check to /sf guide command
The /sf guide command will now only be executed if the player has the permission "slimefun.command.guide"
2017-11-19 22:59:58 +01:00
Redemption
3f60207be7
Made a mistake
version reverted to: version: ${project.version}
2017-11-18 18:09:07 +01:00
Redemption
d6794c5820
Added permission check to open_guide
Now the command "/sf open_guide" will be executed only if the player has the "slimefun.command.open_guide" permission. (Default: op)
2017-11-18 18:05:50 +01:00
Redemption
e3ed803856
Added slimefun.command.open_guide permission 2017-11-18 18:03:19 +01:00
Redemption
cb354cd6eb
Added "commands.open_guide" description 2017-11-18 17:43:25 +01:00
Redemption
c2a641fd60
Open SF Guide with a command #491
From the suggestion of @oddare (https://github.com/TheBusyBiscuit/Slimefun4/issues/491), I've added the command to open the Slimefun Guide directly with the command "/sf open_guide". I also added the tab completion "open_guide" and a description of it.
2017-11-18 17:38:39 +01:00
AtomicScience
62293bed4e
Changed the lore of 'Ignition Chamber' 2017-11-16 13:23:09 +03:00
atom
9645b8db81 Revert "Added few more types of Jerky food - all vanilla types of meat and also fish. Removed 'Saturation' effects and changed types of Jerky food"
This reverts commit 534ea6b14f.
2017-11-15 21:45:52 +03:00
atom
534ea6b14f Added few more types of Jerky food - all vanilla types of meat and also
fish. Removed 'Saturation' effects and changed types of Jerky food
2017-11-15 21:28:38 +03:00
AtomicScience
6605ac9fe3
Fix issue #319 2017-11-15 20:56:04 +03:00
AtomicScience
d9ef5bab02
Fix issue #319 2017-11-15 20:52:30 +03:00
AtomicScience
d8655437c8
Added a research for Ignition Chamber 2017-11-15 19:23:22 +03:00
AtomicScience
3786ad327b
Fix some probelms 2017-11-15 15:24:18 +03:00
AtomicScience
ff9d0a08cf
Add files via upload 2017-11-15 14:36:30 +03:00
Florian CUNY
5a8a47537b Use ${project.version} from pom.xml in plugin.yml 2017-11-15 09:31:25 +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
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
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
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
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
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
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
Poslovitch
4aac192776 Crafting a Water Ancient Rune now gives 4 instead of 2 2017-08-17 13:08:59 +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
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
Poslovitch
00adbf84d7 Fixed SlimefunStartup#randomize(int) and #chance(int, int) 2017-08-12 13:24:16 +02:00
Poslovitch
ad3f52fe5a Fixes Fortune V impossible to be obtained using Wizard Talisman
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/380
2017-08-12 13:18:20 +02:00
Poslovitch
0b54f079e4 Fixes a NumberFormatException when trying to read inexistant frequency of a CargoManager
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/363
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/161
2017-08-10 17:02:38 +02:00
Poslovitch
c3e9717bdb Fixes IllegalArgumentException with negative randomize bound with Magician Talisman
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/366
2017-08-10 15:47:56 +02:00
TheBusyBiscuit
43e2d66f36 Fixed Ressearches 2017-07-21 11:50:59 +02:00
TheBusyBiscuit
4470d34555 Update plugin.yml 2017-07-14 12:02:32 +02:00
Poslovitch
1f927ea13d Documented categories 2017-06-23 18:01:44 +02:00
TheBusyBiscuit
18e0f1477c Merge pull request #340 from Poslovitch/documentation
Documented and improved Researches
2017-06-23 13:49:58 +02:00
Poslovitch
24900b855a Fixed indentation and a useless static access 2017-06-23 13:13:22 +02:00
Poslovitch
bc53533ca4 Documented and improved Researches 2017-06-23 13:06:08 +02:00