TheBusyBiscuit
b398686b1c
Merge pull request #932 from TheBusyBiscuit/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
...
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.0.0
2019-06-11 23:17:53 +02:00
Renovate Bot
057a3a4419
Update dependency net.coreprotect:coreprotect to v2.16.3
2019-06-11 19:59:53 +00:00
Renovate Bot
814b89af56
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.0.0
2019-06-11 19:59:22 +00:00
TheBusyBiscuit
7bf46a6cb5
Update renovate.json
2019-06-11 21:58:58 +02:00
TheBusyBiscuit
8506777955
Merge pull request #931 from TheBusyBiscuit/renovate/configure
...
Configure Renovate
2019-06-11 21:53:12 +02:00
Renovate Bot
41cc400da3
Add renovate.json
2019-06-11 19:51:55 +00:00
TheBusyBiscuit
78cbc990f4
Fixes #912
2019-06-11 13:27:24 +02:00
TheBusyBiscuit
1c600efee3
Possibly fixes #822
2019-06-11 12:45:50 +02:00
TheBusyBiscuit
eba0753b10
Merge pull request #930 from STEngineer/master
...
Add PrepareItemCraftEvent listener
2019-06-10 21:12:23 +02:00
Steve
3900cb7aff
Update ItemListener.java
2019-06-10 22:32:31 +04:00
Steve
302062c01f
Merge pull request #1 from TheBusyBiscuit/master
...
Update from upstream
2019-06-10 22:31:25 +04:00
TheBusyBiscuit
2821939027
Updated CS-CoreLib
2019-06-09 10:02:47 +02:00
TheBusyBiscuit
63ecc1fbfb
Merge pull request #922 from bverhoeven/explosive-pick-damage
...
Damage explosive pickaxe on use (configurable, off by default)
2019-06-02 10:23:11 +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
7dae7766e2
Merge pull request #921 from bverhoeven/inventory-overflow
...
Fix for guide bug when building Bio Reactor (and maybe others)
2019-05-30 20:33:23 +02:00
Bas Verhoeven
0af6ec13d6
Do not allow more than 54 items in reactor/generator setup guide slots
...
If we don't, opening the schematics for a Bio Reactor results in
"IllegalArgumentException: Size for custom inventory must be a multiple
of 9 between 9 and 54 slots"
And the player is simply handed the Bio Reactor, which they can place
and use. Once they do that, the Slimefun guide can't be used until they
reconnect.
For generators and reactors we show the fuels underneath the schematics
or build instructions. When there are more fuels than available space to
show them, we'll overflow, causing the custom inventory to not work and
Slimefun throwing exceptions.
2019-05-30 20:08:35 +02:00
TheBusyBiscuit
3010e93675
Fixes #895
2019-05-30 13:50:20 +02:00
TheBusyBiscuit
11fec71a94
Made Credits load asynchronously
2019-05-30 13:42:06 +02:00
TheBusyBiscuit
ee4490c240
Fixes #839
2019-05-30 12:08:14 +02:00
TheBusyBiscuit
98cbec3840
Merge pull request #918 from freethemice/patch-3
...
unclosed character literal
2019-05-29 22:25:44 +02:00
freethemice
5ffb1a5170
unclosed character literal
...
fixes "unclosed character literal" error some people may get on compile.
2019-05-28 17:19:15 -05:00
TheBusyBiscuit
7107c04ecd
Merge pull request #917 from Kry-Vosa/patch-1
...
Fix for #913
2019-05-25 17:36:59 +02:00
Kry-Vosa
59a0811445
Fix for #913
...
Ported fix from #804
2019-05-24 14:51:49 +02:00
TheBusyBiscuit
7f8b38cf43
Merge pull request #916 from Kry-Vosa/patch-1
...
Fix for #915
2019-05-24 12:29:21 +02:00
Kry-Vosa
d9015cbbf3
Fix for #915
...
setCustomName removes unnecesary ChatColor codes (e.g. &r that doesn't reset anything). Saving the true CustomName in BlockStorage resolves the issue.
2019-05-22 18:14:32 +02:00
TheBusyBiscuit
6df3f8dfe1
Updated CS-CoreLib Version to the latest Release
2019-05-12 21:19:11 +02:00
TheBusyBiscuit
8fe3fece6e
Update issue templates
2019-05-11 13:20:02 +02:00
TheBusyBiscuit
cbfb0cb906
Update issue templates
2019-05-11 13:16:03 +02:00
TheBusyBiscuit
f5bc2445a5
Merge pull request #909 from sarhatabaot/master
...
Refactored Talisman, and tasks
2019-05-07 21:49:31 +02:00
sarhatabaot
f30c630bee
Update JetBootsTask.java
2019-05-04 22:34:25 +03:00
sarhatabaot
1470ad598a
Implemented SlimefunTask in Tasks
...
* Implemented SlimefunTask in Tasks.
* This removes the duplication in the code.
2019-05-04 22:31:26 +03:00
sarhatabaot
6b5b55f988
Changed access levels to enable inheritation of variables
...
Changed access levels to enable inheritation of variables in sub classes.
2019-05-04 22:30:33 +03:00
sarhatabaot
3c651dcccb
Update SlimefunTask.java
2019-05-04 22:20:42 +03:00
sarhatabaot
2262222f60
Revert "Revert "Implemeted abstract Task class""
...
This reverts commit 74b89b9380
.
2019-05-04 22:19:12 +03:00
sarhatabaot
74b89b9380
Revert "Implemeted abstract Task class"
...
This reverts commit 82b3f3c06c
.
2019-05-04 22:18:53 +03:00
sarhatabaot
82b3f3c06c
Implemeted abstract Task class
...
* Removes the duplicated code in every Task class.
2019-05-04 22:18:28 +03:00
sarhatabaot
b20851da07
Encapsulated variables
2019-05-04 22:16:20 +03:00
sarhatabaot
f6312a9bd9
Encapsulated variables
2019-05-04 22:07:56 +03:00
sarhatabaot
4e32c4981c
Extracted dupliocted code blocks to methods
2019-05-04 22:04:03 +03:00
sarhatabaot
a622e05ea8
Refactored Talisman
...
Refactored the class for better readability.
* Added getPlayerByEventType method, instead of calling it directly from checkFor().
* Added pass method.
* Checking for false results first to reduce the amount of if-else.
* Renamed SlimefunItem talisman -> SlimefunItem item.
* Created new Talisman talisman = (Talisman) item, after instanceof check.
* Note: Casting the item every time to talisman clutters the code.
2019-05-04 11:06:01 +03:00
sarhatabaot
833ce0108a
Replaced iteration with addAll()
...
* Iteration replaced with call Collection.addAll
* Encapsulated variables
2019-05-04 10:25:54 +03:00
TheBusyBiscuit
3feff223bc
Merge pull request #902 from WalshyDev/patch/mc_1_14
...
SF 4.1.17 - MC v1.14
2019-04-29 20:02:20 +02:00
Daniel Walsh
b0832702af
Update CS-CoreLib to 1.14 patch
2019-04-29 18:08:05 +01:00
TheBusyBiscuit
15555872c7
Merge pull request #905 from sarhatabaot/patch-1
...
Minor codecleanup & fixed spelling mistake
2019-04-29 18:43:54 +02:00
Omer Oreg
364a7944a6
Minor codecleanup & fixed spelling mistake
...
* Specifying the type in the diamond operator is not necessary in from java 7
* Spelling mistake: convertable -> convertible
* Encapsulated the item & machine variables.
* Changed the constructor as Slimefunitem item is not used anywhere except in the constructor.
2019-04-29 14:12:55 +03:00
WalshyDev
733f401ff6
SF 4.1.17 - MC v1.14
2019-04-28 16:22:30 +01:00
TheBusyBiscuit
bc27ac81b1
Update pom.xml
2019-04-20 13:40:46 +02:00
TheBusyBiscuit
f1512ffeea
Merge pull request #900 from sarhatabaot/patch-1
...
Return efficiency when getFuelEfficiency is called
2019-04-20 10:16:24 +02:00
TheBusyBiscuit
5b0a3f2acf
Merge pull request #898 from jellysnake/master
...
Fix miners not having the correct range
2019-04-20 10:16:16 +02:00
Omer Oreg
08538ad876
Return efficiency when getFuelEfficiency is called
...
Return efficiency when getFuelEfficiency is called instead of speed.
2019-04-19 18:09:55 +03:00