1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

271 Commits

Author SHA1 Message Date
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
KyleEstein
b16b936b81 Fix Additional Devices Vulnerable to Duplication Bug 2018-04-25 23:40:46 -04:00
KyleEstein
66176b445a Merge branch 'master' of github.com:KyleEstein/Slimefun4 2018-04-25 19:36:37 -04:00
Rick
4acd3645dd Reverts change to isItem, makes changes instead to getByItem 2018-04-23 20:34:53 -04:00
Kyle Einstein
e2342c38eb Fix Two Player Duplication Bug 2018-04-23 08:33:29 -04:00
Rick
91587048c3 removes case for getbyitem... since i can't check items in the loop here, I can't check the actual item, so this just throws an error and doesn't work anyway. 2018-04-22 12:47:22 -04:00
Rick
e6199e3d46 Moves special case out of loop 2018-04-22 12:11:51 -04:00
Rick
83e55c255d Changed to special cases only for solving issue with Broken/Repaired spawner renaming ability. There may still be other items these routines don't define as "SlimeFun items" without identical lore to the example, but hopefully this covers everything. 2018-04-22 10:19:57 -04:00
Rick
6e1376cfb2 Fix for the Anvil being able to rename Broken and Reinforced Spawners resulting in becoming vanilla pig spawners. Problem with isDisabled... called isItem... which doesn't return an affirmative unless the lore matches exactly... however... lore would nearly never match exactly: backpacks have different ids or no ids, no item ever matches to "<type>" or "<id>" which should result in a great number of slimefun items being identified as NOT SlimeFun items. 2018-04-20 17:43:57 -04:00
Oliver Wright
d21f93239b
AReactor fix & a fix for chargable energy sources 2018-03-10 15:32:16 +00:00
Oliver Wright
7278f80c6f
Fix #617: Electric Dust Washer - Dust Choice. 2018-03-02 20:17:44 +00:00
VoidAngel
2bec58d361
Fix for #532 - Limited disenchanter dupe glitch 2018-02-20 14:14:56 -08:00
TheBusyBiscuit
0a6f54ec8d
Merge pull request #569 from Poslovitch/documentation
Documentation fixes and improvements
2018-01-07 20:48:12 +01:00
TheBusyBiscuit
1d0660db53
Merge pull request #570 from Redemption198/master
Fixed Android Miner not breaking Slimefun blocks correctly
2018-01-07 20:29:14 +01:00
Florian CUNY
f2a74bb46c Improved documentation in Category and Alloy 2018-01-06 15:26:01 +01:00
John000708
2777ec9407 Small fix 2018-01-06 11:07:54 +01:00
John000708
b6c3021355 Fixed speed modifier not getting applied to Enhanced Furnaces 2018-01-05 18:09:10 +01:00
Redemption
ffc9de3f7c
Added ANDROID_DIG as Unregister Reason 2018-01-03 16:26:43 +01:00
Florian CUNY
97bd64474f Wrapped the ID in \" to simplify reading the exception 2017-12-26 15:45:52 +01:00
Florian CUNY
c14aba1e6b Explicitly disallow registering two SFItems with same ID 2017-12-26 15:44:18 +01:00
Florian CUNY
36ddfbf65f Simplified the pass condition in Talisman 2017-12-09 15:53:44 +01:00
Florian CUNY
6cb081cfd3 Minor changes in Talisman and EnderTalisman
Renamed consumed field to consumable
Added javadoc : since

Talisman -
Field initialisation inline instead of in constructors
Simplified a condition
2017-12-09 15:46:50 +01:00
Florian CUNY
858f964b82 Privatized fields in Talisman and EnderTalisman 2017-12-09 15:38:14 +01:00
TheBusyBiscuit
595ef5f907
Merge pull request #507 from Poslovitch/4.1.12
4.1.12
2017-11-26 09:51:07 +01:00
TheBusyBiscuit
fe4ec68a35
Merge pull request #502 from Poslovitch/slimefunitem-improvements
SlimefunItem : renames of some methods, made ghost configurable, changed "name" to "id" and privatized all fields
2017-11-26 09:50:41 +01:00
Florian CUNY
2696f5a8a5 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/334 2017-11-25 22:05:34 +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
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
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
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
4a7ebf9377 Made EnderTalisman use the new addHint instead of addDescription 2017-08-15 16:56:01 +02:00
Poslovitch
1617c76d9d Documented SlimefunItem.State 2017-08-15 00:06:48 +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
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
18e0f1477c Merge pull request #340 from Poslovitch/documentation
Documented and improved Researches
2017-06-23 13:49:58 +02:00
Poslovitch
bc53533ca4 Documented and improved Researches 2017-06-23 13:06:08 +02:00
TheBusyBiscuit
e7593aaa16 Fixed SlimefunItem#getState() 2017-06-22 23:00:14 +02:00
Poslovitch
2aecee2492 Ticking check 2017-06-22 22:54:19 +02:00
Poslovitch
561caeaf51 Changed some checks 2017-06-22 22:49:36 +02:00
Poslovitch
b0d487fbc9 Fixed a useless check 2017-06-22 22:44:38 +02:00
Poslovitch
e388bf01f1 Added a State enum for SlimefunItem
Related to https://github.com/TheBusyBiscuit/Slimefun4/pull/337,
https://github.com/TheBusyBiscuit/Slimefun4/issues/231
2017-06-22 22:16:22 +02:00
TheBusyBiscuit
c2f877b47c First Steps towards Item Hashing 2017-06-22 16:42:56 +02:00
Poslovitch
18779b114b Lightened some heavy calls in (dis)enchantable checks 2017-06-19 18:49:38 +02:00
Poslovitch
8910839e31 Forgot to push the isEnchantable() check in AutoEnchanter 2017-06-19 18:34:58 +02:00
Poslovitch
9a04d52df9 Added option to toggle "enchantability" of an item
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/280
2017-06-19 17:04:28 +02:00
TheBusyBiscuit
1962dbb0a5 Chain Armor no longer spams messages 2017-04-09 09:59:45 +02:00
TheBusyBiscuit
8ebae91e36 You can now upgrade Backpacks 2017-04-08 19:13:06 +02:00
TheBusyBiscuit
abc808b95b Added SlimefunItem#isAddonItem() 2017-03-18 19:34:52 +01:00
John000708
de4f779a64 Added EmeraldEnchants limit to AutoEnchanter.
Started "documenting" the API
2017-02-06 18:23:11 +01:00
TheBusyBiscuit
485319a2f9 Fixed XP duplication 2017-01-21 08:30:41 +01:00
AlexLander123
b99b396902 Fix XP Dupe Bug 2017-01-20 23:57:19 +08:00
Admin
042ce48272 Added NotPlaceable Interface 2016-12-30 10:48:58 +01:00
TheBusyBiscuit
5b990aa4c5 Added NotPlaceable Interface 2016-12-30 10:48:27 +01:00
AlexLander123
c565252072 Implemention of ExcludedTool and ExcludedSoulboundTool
Fix Soulbound Shovel and Soulbound Hoe Duplication Bug;
2016-12-30 10:09:08 +08:00
mrCookieSlime
bcbbe3bbfa Potential Error Fix 2016-11-28 19:49:57 +01:00
BuildTools
ef9fa6a54b Update Version 2016-11-27 19:34:45 +01:00
mrCookieSlime
174658a4a1 Created abstract Drill 2016-11-26 20:25:36 +01:00
mrCookieSlime
7609ba04fb Added Nether Drill 2016-11-26 13:07:09 +01:00
mrCookieSlime
fe00a62730 Added Nether Ice 2016-11-26 13:03:45 +01:00
BuildTools
9f3bd4caf2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2016-11-26 12:49:54 +01:00
BuildTools
8fc62d4a30 Minor tweaks 2016-11-26 12:41:20 +01:00
mrCookieSlime
d5b9c98704 Added new Tiers of Electric Smelteries and Electrified Crucibles 2016-11-26 12:37:43 +01:00
BuildTools
7aa493a96d Replaced all § with & 2016-11-23 19:12:47 +01:00
BuildTools
3e470d87fb Replaced all § with & 2016-11-23 16:51:57 +01:00
BuildTools
f0e81533aa Refined reactor when no cooling is required 2016-11-21 19:01:34 +01:00
BuildTools
87bddc1fd8 Fixed ReactorHologram 2016-11-20 22:27:52 +01:00
mrCookieSlime
60635d6475 Added Coolant Hologram 2016-11-20 21:35:24 +01:00
BuildTools
269e10d2ff Added Nether Start Reactor. 2016-11-20 21:06:13 +01:00
BuildTools
b7c760649e Made the Nuclear Reactor abstract, which will allow developers to make their own reactors. 2016-11-20 17:50:20 +01:00
mrCookieSlime
aba9353ff2 Fixed Imports + Elytra Failsafe (3) 2016-10-30 11:13:20 +01:00
TheBusyBiscuit
dea3e7fa0d Fixed Opening Permission for Advanced Cargo Output Node 2016-10-30 11:02:56 +01:00
TheBusyBiscuit
55f192d82e Permission Update for Cargo Output Nodes 2016-10-30 11:02:16 +01:00
TheBusyBiscuit
4ec9cfda22 Permission Update for Cargo Input Nodes 2016-10-30 11:01:47 +01:00
TheBusyBiscuit
f3d9346619 Cargo Nodes can now be opened by anyone permitted to access Inventories in that Area 2016-10-30 11:01:01 +01:00
BuildTools
435d236ef1 Make the disenchanting feature individual for each item. 2016-10-28 22:08:40 +02:00
BuildTools
01bf454794 Added an option to disable the disenchanting of Slimefun Items. 2016-10-28 19:38:09 +02:00
Scott Tanner
d49a112ebc Fixes Reactor Crash
Fixes the possibility of the energy network crashing and the energy regulator disappearing.  This could have been caused by a Null pointer Exception on previous line 291 (now 294), where the BlockStorage checks for the stored "reactor-mode", when if the mode was never changed it would not have been set at all.
2016-06-28 01:25:32 -04:00
mrCookieSlime
43c91b37dd Added Infused & Soulbound Elytras 2016-05-29 10:46:11 +02:00
mrCookieSlime
0ab0b4492c Added OreGenSystem 2016-05-18 19:04:27 +02:00
mrCookieSlime
2f114ed3d8 Added Talismans Wiki Page 2016-05-15 13:24:58 +02:00
BuildTools
1873bb20fa Fixed the Pressure Chamber dropping Stained Glass Panes. 2016-05-14 17:56:49 +02:00
mrCookieSlime
7469e14aa0 Fixed Machines not consuming Energy 2016-05-09 19:51:04 +02:00
mrCookieSlime
686004304c Slimefun 4 2016-04-14 18:24:03 +02:00