mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
1,413 Commits 1 Branch 0 Tags 64 MiB
14cf3fee37
Commit Graph

265 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
58ead59419 Added missing 1.13 stuff 2018-09-05 21:02:57 +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
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
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
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
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
Poslovitch
26c13b375e Explosive pickaxe could break BARRIER, and COMMAND blocks 2017-11-22 17:36:28 +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
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
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
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
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
John000708
5d3c7b643e 1.12 Support 2017-06-13 19:28:54 +02:00
AlexLander123
4a23613277 Added unplaceable-blocks for BlockPlacer 2017-05-30 17:14:11 +08:00
TheBusyBiscuit
9ae4baab44 Extend Backpack Fixes to Cooler 2017-05-02 15:38:20 +02:00
VoidAngel
1c04e66b65 Fixed typo 2017-04-25 09:16:25 -07:00
VoidAngel
41d462b265 Update SlimefunSetup.java 2017-04-25 08:21:15 -07:00
VoidAngel
8ecdec0491 Crucible fix 
Fix for the hardened_clay crucible recipe and prevent block place on use
 2017-04-24 10:43:12 -07:00
DeathlyPanda
5d8b0e4ddb Simplified Patch 2017-04-14 18:25:02 -04:00
DeathlyPanda
52d42a5744 Fix Pickaxe of Vein Mining Dupe 
Fixed pickaxe to prevent duplication of ores.
 2017-04-13 09:42:07 -04:00
TheBusyBiscuit
1962dbb0a5 Chain Armor no longer spams messages 2017-04-09 09:59:45 +02:00
TheBusyBiscuit
f751eafc86 Fixed Jet Boots Recipe 2017-04-09 09:46:05 +02:00
TheBusyBiscuit
10d87d37b3 Fixed Backpack Crafting 2017-04-08 19:19:29 +02:00
TheBusyBiscuit
8ebae91e36 You can now upgrade Backpacks 2017-04-08 19:13:06 +02:00
John000708
5c47a3f4fe Fixed Multimeter not showing with colors 2017-02-24 19:45:36 +01:00
John000708
4c5f7d5766 Fixed Shulker Boxes not dropping with contents in them 2017-02-06 19:56:37 +01:00
John000708
0d2ff61387 Added CoreProtect logging for the Explosive Pickaxe 2017-02-06 19:28:06 +01:00
NathanAdhitya
7b86df37fc . 2017-01-01 21:07:26 +07:00
NathanAdhitya
a3afb14a10 . 2017-01-01 20:26:50 +07:00
NathanAdhitya
1af833bf96 Tier 2 Electric Ore Grinder Speed and Energy is not at the proper value. 2017-01-01 20:23:53 +07:00
NathanAdhitya
8ff8daf4b5 Tier 2017-01-01 20:08:40 +07:00
AlexLander123
c565252072 Implemention of ExcludedTool and ExcludedSoulboundTool 
Fix Soulbound Shovel and Soulbound Hoe Duplication Bug;
 2016-12-30 10:09:08 +08:00
NathanAdhitya
8743da7c8e Coal Ore is more reasonable to give 4 coal, rather than two in Advanced Digi-Miner 2016-12-20 20:45:02 +07:00
NathanAdhitya
e4400a5229 Cargo Connected Color Text Doesn't Work on a few servers. 2016-12-19 17:19:21 +07:00
mrCookieSlime
3e7071561b Added Post Handler Method 2016-12-05 19:41:29 +01:00
TheBusyBiscuit
4ad601f90d Merge pull request #40 from John000708/master 
Fixed some stuff
 2016-12-04 15:18:05 +01:00
BuildTools
fa0f0a4012 Fixed some stuff 2016-12-04 00:08:59 +01:00
mrCookieSlime
0df97edfcc Changed Electric Ingot Pulverizer Speed 2016-11-28 20:06:37 +01:00
mrCookieSlime
622009d1b3 Minor Tweaks 2016-11-28 19:57:57 +01:00
BuildTools
ef9fa6a54b Update Version 2016-11-27 19:34:45 +01:00
mrCookieSlime
fe00a62730 Added Nether Ice 2016-11-26 13:03:45 +01:00
BuildTools
b31229deaa Added Electrified Crucibles 2016-11-26 12:54:32 +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
mrCookieSlime
1f4993e3cf Minor changes 2016-11-24 18:10:54 +01:00
BuildTools
ef748fe01e Added Electric Crucible 2016-11-24 17:36:46 +01:00
BuildTools
3e470d87fb Replaced all § with & 2016-11-23 16:51:57 +01:00
mrCookieSlime
1b674aed05 Minor Changes to the Nether Star Reactor 2016-11-20 21:40:05 +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