341 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	07271edc47	Reduced technical debt	2019-08-30 01:11:33 +02:00
TheBusyBiscuit	a83266104e	More Refactoring	2019-08-30 00:43:17 +02:00
TheBusyBiscuit	69d3990c64	Merge pull request #1060 from Sfiguz7/master ... Bigger code cleaning	2019-08-30 00:25:41 +02:00
ajan-12	2de2ac519d	Fixing Diet Cookie not being consumed.	2019-08-30 01:24:22 +03:00
ajan-12	30d3dfe038	Adding Diet Cookie. ... - A Cookie made by an elytra scale and a cookie! - Levitates the player for 3 seconds.	2019-08-30 01:12:02 +03:00
Sfiguz7	c11eb54037	Cleaning	2019-08-29 23:18:04 +02:00
Sfiguz7	85ee828abf	Separated variable declaration	2019-08-29 22:46:03 +02:00
TheBusyBiscuit	63c3ddcd99	Merge pull request #1057 from LinoxGH/master ... Adding Explosive Shovel and beautifying Tech Category.	2019-08-29 22:14:03 +02:00
Sfiguz7	f86e362e2f	Bigger code cleaning	2019-08-29 22:04:31 +02:00
ajan-12	4b60ddf8e7	Fixing the placeholder method.	2019-08-29 22:24:52 +03:00
ajan-12	388ca2decd	Renaming "Maximum Explosivity" to "Explosive Tools".	2019-08-29 22:24:19 +03:00
Sfiguz7	c23b0e438b	Code cleaning	2019-08-29 19:12:53 +02:00
ajan-12	f38323a2b4	Moved the Hologram Projector location for guide to look better.	2019-08-29 20:00:26 +03:00
ajan-12	ac7d1608e6	Adding Explosive Shovel. ... - Renamed the Research "Explosive Pickaxe" to "Maximum Explosivity" and added Explosive Shovel to it. - Added a new recipe to Magic Workbench for Explosive Shovel. - Explosive Shovel is made by 1 Ferrosilicon, 1 TNT and 1 Synthetic Diamond. - Made the Explosive Shovel so that it can only break dirt-like, sand and its variations, gravel, clay and snow blocks. - This adds the shovel the benefit of fast landscaping but still adds a reason to use Explosive Pickaxe.	2019-08-29 19:36:16 +03:00
TheBusyBiscuit	b6b914f03e	Merge pull request #1054 from LinoxGH/master ... Adding Auto Drier and optimizing imports for SlimefunSetup.java	2019-08-29 16:41:23 +02:00
TheBusyBiscuit	bbf0bfd006	Refactoring	2019-08-29 16:19:23 +02:00
ajan-12	8188c1986c	Adding a new electric machine Auto Drier. ... - Made in Enhanced Crafting Table with 2 heating coils, 1 smoker and 1 campfire. - Dries items. - Removes the water from water bucket. - Removes the liquids in potions. - Produces sticks from leaves and saplings. - Dries wet sponges to sponges. - Produces leathers from rotten flesh	2019-08-29 16:53:08 +03:00
TheBusyBiscuit	388873d6a2	Reduced technical debt	2019-08-29 15:13:40 +02:00
TheBusyBiscuit	99cd14fa5f	Added "legacy-ore-grinder" config option for old Ore Grinder Behaviour.	2019-08-29 10:26:36 +02:00
TheBusyBiscuit	e0316453d9	Reduced technical debt	2019-08-28 10:59:20 +02:00
TheBusyBiscuit	4875ce1241	Revert "Removed deprecated junk" ... This reverts commit cc3c026b1c.	2019-08-27 23:18:58 +02:00
TheBusyBiscuit	cc3c026b1c	Removed deprecated junk	2019-08-27 23:14:10 +02:00
TheBusyBiscuit	3ccf0722b6	Reduced technical debt again	2019-08-27 23:08:13 +02:00
TheBusyBiscuit	87ff5fdbc2	Pushing missing files	2019-08-27 21:46:50 +02:00
TheBusyBiscuit	aff264d66c	More Refactoring + Code Cleanup (Reduced cognitive load)	2019-08-27 20:37:33 +02:00
TheBusyBiscuit	3d3f1b6c87	Fixed Ignition Chamber Bug	2019-08-27 17:55:20 +02:00
TheBusyBiscuit	04444fc298	This File gets a Refactoring, ... that File gets a Refactoring, everybody gets a Refactoring!	2019-08-27 16:26:35 +02:00
TheBusyBiscuit	f4be2a8d5b	Fixes #708	2019-08-27 15:35:56 +02:00
TheBusyBiscuit	77a8911b8c	Another large wave of refactoring and technical debt reduction	2019-08-27 15:27:38 +02:00
TheBusyBiscuit	641a2e6e30	A LOT more Refactoring + Technical debt reduction	2019-08-27 14:08:09 +02:00
TheBusyBiscuit	fd36288efb	More Refactoring	2019-08-27 13:28:07 +02:00
TheBusyBiscuit	65af683a8a	Resolves #247	2019-08-27 13:09:30 +02:00
TheBusyBiscuit	c08674d8c7	Fixes #1040	2019-08-26 09:04:25 +02:00
TheBusyBiscuit	2a3b446d15	Improved Backpacks Performance	2019-08-25 17:35:19 +02:00
TheBusyBiscuit	d589002430	Added Research-Caching (May improve Performance a lot)	2019-08-25 16:07:06 +02:00
TheBusyBiscuit	0fad51e263	Fixes #1034	2019-08-24 20:27:25 +02:00
dNiym	b82d9571b7	Fix busted spawners	2019-08-24 00:26:37 -04:00
dNiym	da8def9d4f	Fix broken spawner error	2019-08-23 01:29:51 -04:00
NihilistBrew	ce1e3fb07c	Fix indents	2019-08-19 20:24:08 +02:00
NihilistBrew	4fd996e2fc	Add double-chest backpack (Radiant Backpack)	2019-08-19 20:15:25 +02:00
TheBusyBiscuit	36377c5777	Merge pull request #1014 from dniym/TableSaw2 ... Table Saw Bug #1003 fix	2019-08-19 09:45:39 +02:00
dNiym	24e9652857	fix Item Duplication Bug #1003 ... This fix currently prevents stripped_ logs from being used at all in the table saw as the MaterialHelper.java in CS-Core lib needs to be updated to allow the wood type to be properly detected from the material name. Update submitted in cs-corelib -> https://github.com/TheBusyBiscuit/CS-CoreLib/pull/109	2019-08-19 00:18:09 -04:00
HSGamer	8a6cecf7bd	SMELTERS_PICKAXE: return true	2019-08-04 21:26:27 +07:00
HSGamer	79e9839c6e	SMELTERS_PICKAXE: use hasBlockInfo	2019-08-04 14:46:51 +07:00
HSGamer	e00984816f	SMELTERS_PICKAXE: ignore Slimefun block	2019-08-04 08:44:05 +07:00
HSGamer	5746285881	EXPLOSIVE_PICKAXE: ignore liquid block	2019-08-04 08:38:58 +07:00
TheBusyBiscuit	80aecd2711	Merge pull request #989 from NihilistBrew/spawnerdupe ... Fix spawner dupe and objectified e.getBock()	2019-08-03 20:33:41 +02:00
NihilistBrew	b6a4322de6	Fix PR: Remove block storage clear	2019-08-03 20:16:19 +02:00
TheBusyBiscuit	eec510d32f	Merge pull request #979 from dniym/TableSaw ... Table saw	2019-08-03 20:06:05 +02:00
dNiym	e62a3d8509	Combined research for Table_Saw and Saw_Mill	2019-08-03 13:51:34 -04:00
dNiym	751cc88321	Re-Added SAW_MILL to research	2019-08-03 13:44:42 -04:00
TheBusyBiscuit	233c61e1d6	Merge pull request #990 from dniym/BioReactorFuelUpdate ... Adding new 1.14 materials to BioReactor	2019-08-03 19:27:24 +02:00
dNiym	4d326f5228	Fixing revert, no idea how that happened.	2019-08-03 13:19:10 -04:00
dNiym	bcbeafba53	made requested changes	2019-08-03 13:05:23 -04:00
NihilistBrew	8af503aceb	Fix spawner dupe and objectified e.getBock()	2019-08-03 18:59:47 +02:00
TheBusyBiscuit	862c14c403	Merge branch 'master' into master	2019-08-03 18:08:51 +02:00
TheBusyBiscuit	9afba9fa78	Merge pull request #984 from NihilistBrew/changetowire ... Add copper wire	2019-08-03 17:54:37 +02:00
NihilistBrew	460c082a51	Fixed research indent #2	2019-08-03 17:03:54 +02:00
NihilistBrew	5eaf3949b7	Fixed research indent	2019-08-03 17:02:32 +02:00
NihilistBrew	6af9307fe1	Accidentally edited a LOC	2019-08-02 15:04:22 +02:00
NihilistBrew	09b961ad1d	Added sandstone to grind stone	2019-08-02 14:55:07 +02:00
NihilistBrew	78cea97fff	Add copper wires	2019-08-02 13:20:28 +02:00
NihilistBrew	60064a0fe1	Added OUTPUT_CHEST functionality ... S	2019-08-01 11:01:43 +02:00
dniym	1386849d7d	Replace Saw_Mill with Table_Saw machine ... Replaced saw_mill machine with new table_saw machine in the research, to allow players who previously unlocked the saw_mill to craft it's replacement.	2019-07-30 12:53:03 -04:00
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
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	4946d428ad	Fixed Item Recognition System	2019-06-19 08:46:43 +02:00
TheBusyBiscuit	b333cfd7a5	Improved Ancient Altar Recipe Recognition System	2019-06-18 14:55:52 +02:00
TheBusyBiscuit	1c600efee3	Possibly fixes #822	2019-06-11 12:45:50 +02: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
TheBusyBiscuit	11fec71a94	Made Credits load asynchronously	2019-05-30 13:42:06 +02:00
Kry-Vosa	59a0811445	Fix for #913 ... Ported fix from #804	2019-05-24 14:51:49 +02:00
WalshyDev	733f401ff6	SF 4.1.17 - MC v1.14	2019-04-28 16:22:30 +01:00
jellysnake	0d65da0dd7	Fix miners not having the correct range	2019-04-19 01:07:35 +10:00
SoSeDiK	3e2f903425	Optimize tasks running	2019-03-30 14:06:44 +02:00
SoSeDiK	0794fe8a2c	Rename ORGANIC_FOOD and FERTILIZER	2019-03-30 11:59:52 +02:00
TheBusyBiscuit	358a73f73b	Merge pull request #871 from bverhoeven/master ... Fix Soulbound Axe duplication bug	2019-03-29 22:58:04 +01:00
Bas Verhoeven	6cbc0a9f92	Fix Soulbound Axe duplication bug ... Similiar to 2ae249dec4 Fixes issue #870	2019-03-29 22:45:15 +01:00
SoSeDiK	c8965e120f	Replaced deprecated code parts	2019-03-27 22:10:19 +02:00
SoSeDiK	9e9e36e5c2	Replaced Durability with Damageable meta	2019-03-27 22:09:04 +02:00
SoSeDiK	80642eeed1	Replaced deprecated enchantments code	2019-03-27 21:34:20 +02:00
TheBusyBiscuit	8c2746e775	Merge pull request #860 from SoSeDiK/spawners ... Spawners	2019-03-27 16:40:44 +01:00
SoSeDiK	0561cf9e05	Optimized code	2019-03-26 22:56:40 +02:00
SoSeDiK	ad462d1b50	Added BlockBreakHandler for REPAIRED_SPAWNER	2019-03-26 22:51:04 +02:00
SoSeDiK	c4b096434c	Updated CoreProtect API	2019-03-26 22:17:33 +02:00
SoSeDiK	ef868eae31	Removed unused imports	2019-02-23 23:14:01 +02:00
BuildTools	e950b264d8	Replaced some deprecated methods.	2019-01-18 20:38:02 +01:00
Sniddunc	092d79dda7	Fixed Sawmill Bug where only 1 item was dropped	2018-11-24 01:19:24 -05:00
VoidAngel	2ae249dec4	Fixes lumber axe dupe #797	2018-11-09 12:54:01 -08:00
TheBusyBiscuit	bd0c1949ba	Minor changes	2018-09-06 12:50:49 +02:00
TheBusyBiscuit	58ead59419	Added missing 1.13 stuff	2018-09-05 21:02:57 +02:00
MisterErwin	55c3d6f711	Re-Added isItemSimiliar for ALWAYS	2018-09-05 18:11:32 +02:00
MisterErwin	60b08ac917	Got rid of "is Similar" - as mc 1.13 now used a Material for every Item ... This one is WIP as all the colours & wood & stone types have to be re-added. Please also take a look	2018-09-05 18:11:21 +02:00
MisterErwin	83f3fb4c4b	Fied charcoal 1.13 material	2018-09-05 18:10:21 +02:00
DrOreo002	9d3ca22b1f	Some code cleanup and fix grappling hook dupe	2018-07-15 13:02:45 +07:00
VoidAngel	ae83e65871	Fix misplaced parentheses for digital miners ... Fixes issue #734	2018-07-09 17:55:32 -07:00
AtomicScience	a25bb15c93	Fix #690	2018-06-23 14:51:48 +03:00
SoSeDiK	c0f959f211	Added two additional recipes ... Allowed using acacia and dark oak logs for crafting the walking sticks.	2018-06-06 12:53:28 +03:00
SoSeDiK	3cf306ce34	Replaced deprecated methods	2018-06-06 12:41:56 +03:00
VoidAngel	24f09bc87a	Fixes soulbound backpack craft crafting ... Also a few more .clones() were added as a precaution for the future.	2018-05-21 12:38:42 -07:00
TheBusyBiscuit	803c19a27e	Removed BlockBreaker	2018-05-21 20:51:12 +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
VoidAngel	9d1ad3c866	Removed redundant code	2018-04-29 11:15:07 -07:00
VoidAngel	e0fd8a358e	Fixed the protection check location	2018-04-29 10:37:11 -07:00
VoidAngel	fc601bda6b	Updated saw mill block check ... The saw mill will now only use the CS-CoreLib protection manager. Also Ive added a check to prevent people from duping planks using barrels.	2018-04-29 10:27:30 -07:00
KyleEstein	17ec56799a	Allow admins to chose ore washer and dust washer behavior	2018-04-28 20:13:37 -04:00
Redemption	3a0d73ae9c	Added CS-CoreLib permission check for Slimefun Machines ... Removed the horrible whitespaces and updated the code to the last commit.	2018-04-25 11:18:49 +02:00
TheBusyBiscuit	827bc3c370	Merge branch 'master' into master	2018-04-25 10:13:47 +02:00
Redemption	0e7597e06f	Added CS-CoreLib permission check for Slimefun Machines ... Added CS-CoreLib permission check for Slimefun Machines. Updated some deprecated methods.	2018-04-23 22:33:08 +02:00
Rick	fd9ed5155a	cleaned up some whitespace that showed up in last commit.	2018-04-21 17:28:43 -04:00
Rick	201fb33eb4	Closes #631... player no longer needs to be "owner" of the item to break these two blocks. This makes sense to me since most Slimefun blocks do not check for this either except maybe those which have inventories, which neither of these do.	2018-04-21 17:20:43 -04:00
Rick	44e9a3cc43	Copies entirety of logic from the Enhanced Crafting table to the Magic Workbench for the crafting of Soulbound Backpacks. On further investigation, I discovered this did not "delete" the ID of the backpack being used for crafting, but instead recycles that ID for use in the final crafted pack and simply adjusts the size for that ID so that it matches. By taking that approach, I was forced to include all of this even though this will make it exponentially more difficult to make ID-less packs for sale in other plugins like ChestShop.	2018-04-20 17:47:41 -04:00
SoSeDiK	41b6cd389d	Added holidays prefixes	2018-04-16 19:11:50 +03:00
SoSeDiK	5a3978691f	Added holidays prefixes	2018-04-15 19:53:11 +03:00
SoSeDiK	86429da311	Oops... Forgot about the import.	2018-04-15 19:23:23 +03:00
SoSeDiK	42ae9103e5	Replace deprecated method	2018-04-10 02:12:25 +03:00
SoSeDiK	9f2d91a20c	Allow using different log types	2018-04-10 02:04:43 +03:00
SoSeDiK	f328300941	Food Fix For Creative Mode	2018-04-10 01:57:35 +03:00
SoSeDiK	9b64804461	Update SlimefunSetup.java	2018-04-10 01:53:16 +03:00
SoSeDiK	5267cdb82b	Fixed mistake	2018-04-10 01:52:24 +03:00
TheBusyBiscuit	7b07bc8c61	Merge pull request #630 from meiamsome/network-caching ... Create a Network class to manage networks in a stateful way	2018-03-25 10:19:07 +02:00
Oliver Wright	f30c61fcfc	Check if the chunk is loaded instead of relying on exceptions	2018-03-10 19:08:18 +00:00
Oliver Wright	2c0dc15e4c	Create a Network class to manage networks in a stateful way	2018-03-10 01:05:15 +00:00
Meta-Win	e7e195a43e	Fix Conflict Names	2018-02-15 14:24:27 -02:00
Dylan Xaldin	16899eb96a	Fix Reinforced Spawners being a Pig Spawner when placed.	2018-02-07 19:06:06 -06:00
TheBusyBiscuit	4f9c36c8a2	Merge pull request #557 from StarWishsama/master ... correct word in Files.java	2018-01-06 12:49:49 +01:00
StarWishsama	4d9b141f23	correct word of Files.java	2017-12-31 09:07:02 +08:00
Redemption	2a80104402	Removed useless checks	2017-12-28 23:15:09 +01:00
Redemption	815557c29e	Update SlimefunSetup.java	2017-12-28 11:44:54 +01:00
Redemption	349d4f7e90	Fixed pedestal not dropping item when is broken or explodes	2017-12-28 11:11:03 +01:00
Redemption	f9a6225793	Reverted to single message for obstructed pedestral.	2017-12-26 00:15:29 +01:00
Redemption	12ec120d48	Split pedestal obstructed message. ... Now there are two messages for the obstructed pedestal, one for blocks and one for liquids.	2017-12-25 20:45:44 +01:00
Florian CUNY	cd741d19d5	Fix NPE on BlockBreakEvent with Smelter's Pickaxe ... as well as optimizing it a bit. Fixes #367	2017-12-09 15:54:22 +01:00
Florian CUNY	5fb3ec967b	Fixed typo in SlimefunSetup	2017-12-09 15:37:53 +01:00
TheBusyBiscuit	a93a5e88d6	Fixed Christmas Cake Recipe	2017-12-02 21:38:16 +01:00
Meta-Win	c3d3685420	Fix Christmas Cookie and Chocolate Milk Recipes	2017-12-02 17:39:34 -02: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
TheBusyBiscuit	3bbd0e040c	Merge pull request #500 from Redemption198/master ... Fixed ancient pedestal bug #499	2017-11-25 17:34:01 +01:00
TheBusyBiscuit	fc5be2778d	Merge pull request #503 from AtomicScience/ore_washer_fix ... Ore washer dupe fix	2017-11-25 17:33:18 +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	179ad06bbf	Changed cant-place to cannot-place	2017-11-22 21:19:25 +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	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