mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
1,219 Commits 1 Branch 0 Tags 64 MiB
1eb2c217d9
Commit Graph

942 Commits

Author SHA1 Message Date
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
00d376e213
Update SlimefunMachine.java 2019-08-01 12:03:08 +02:00
NihilistBrew
b9d8e8f5dd
Update config.yml 2019-08-01 11:17:47 +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
6db2e48e64
Add Table_Saw to the SlimeFunItems List 2019-07-30 12:50:36 -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
TheBusyBiscuit
bf61b4a42f Added GitHubBuilds-Updater for development-builds 2019-07-17 14:57:52 +02:00
Nathan Adhitya
e1190a5d1e
Update ItemListener.java 2019-07-08 17:07:38 +07:00
SoSeDiK
839c263955 Replace SimpleJSON with Gson 2019-06-23 23:03:20 +03: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
7c011d916a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-06-20 09:51:15 +02:00
TheBusyBiscuit
1fd0b40f9f Removed URID 2019-06-20 09:50:59 +02:00
TheBusyBiscuit
5656a0564f
Update AncientAltarListener.java 2019-06-19 22:33:47 +02:00
TheBusyBiscuit
0a5c9e901e
Fixed Ancient Altar Items 2019-06-19 22:32:09 +02:00
CyberPatriot
2f301be679
Update ReactorHologram.java 2019-06-19 09:26:30 -05:00
CyberPatriot
3e6767cfb3
Update EnergyHologram.java 2019-06-19 08:32:33 -05:00
CyberPatriot
569f9bb329
Fix holograms for Cargo and energy 2019-06-19 08:32:18 -05:00
TheBusyBiscuit
4946d428ad Fixed Item Recognition System 2019-06-19 08:46:43 +02:00
TheBusyBiscuit
27cb4c389c Fixed Ancient Altar Recipes for good 2019-06-18 17:39:59 +02:00
TheBusyBiscuit
b2420b8271 Fixed Ancient Altar Recipes 2019-06-18 15:35:16 +02:00
TheBusyBiscuit
b333cfd7a5 Improved Ancient Altar Recipe Recognition System 2019-06-18 14:55:52 +02:00
Bas Verhoeven
eba6fb041f Drop Slimefun items when broken by another Slimefun tool 
When a Slimefun item that doesn't have a BlockHandler is broken by a
tool that does have a BlockHandler and that tool's BlockHandler returns
true, Slimefun would stop handling the "onBlockBreak" event and would
not drop the Slimefun item that was broken but some vanilla block
instead.

This commit attempts to fix the way those events are handled, ensuring
that if a Slimefun item is broken one is dropped for the player.
 2019-06-13 21:18:43 +02:00
CyberPatriot
877e01b1be
Fix for issue #879 
This edit is for issue #879 . Tested on latest versions of Slimefun, ChestTerminal, and CS-CoreLib. 1.13 is to be determined.
 2019-06-12 23:48:38 -05: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
Steve
3900cb7aff
Update ItemListener.java 2019-06-10 22:32:31 +04: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
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
freethemice
5ffb1a5170
unclosed character literal 
fixes "unclosed character literal" error some people may get on compile.
 2019-05-28 17:19:15 -05:00
Kry-Vosa
59a0811445
Fix for #913 
Ported fix from #804
 2019-05-24 14:51:49 +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
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
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
f1512ffeea
Merge pull request #900 from sarhatabaot/patch-1 
Return efficiency when getFuelEfficiency is called
 2019-04-20 10:16:24 +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
jellysnake
0d65da0dd7
Fix miners not having the correct range 2019-04-19 01:07:35 +10:00
SoSeDiK
4fed304381 Fix for #888 2019-04-13 13:47:22 +03:00
SoSeDiK
4710fd809e Fix for SoulJars' spawner recipes not being displayed properly 2019-04-11 16:10:23 +03:00
TheBusyBiscuit
506c54149e
Changed Script Rating System 2019-04-10 18:45:14 +02:00
SoSeDiK
3826993be2 Better menu switching for Androids 2019-04-08 14:45:02 +03:00
SoSeDiK
c04b293d62 Fix for #885 2019-04-08 13:53:55 +03:00
TheBusyBiscuit
33073a4100
Merge pull request #877 from SoSeDiK/lambda 
Use lambda expressions
 2019-04-07 11:44:42 +02:00
TheBusyBiscuit
0c96f69346
Merge pull request #882 from SoSeDiK/temp 
Temporary fix for #881
 2019-04-07 11:44:06 +02:00
Bas Verhoeven
0d45fee741 Do not overwrite block for a location that already has a valid block 
This shouldn't happen, but if it does happen it'll definitely break the block.
We'll notify the server administrator on load and only keep the first block we
see.

Note that this will only happen if there's something seriously wrong with the
block as generally there'll not be a situation where information is stored in
two different files.
 2019-04-07 03:02:09 +02:00
Bas Verhoeven
1d7c1e68c8 Do not load incomplete blocks (missing "id") 
If incomplete blocks are loaded, without an "id", items will not have
any usable slimefun block information and will not be usable. Breaking
these blocks will give you a "CSCoreLib's Head".
 2019-04-07 03:01:53 +02:00
SoSeDiK
fb50e6c59a Update SlimefunItems.java 2019-04-03 16:37:39 +03:00
SoSeDiK
385edf3cd7 Even more lambdas expressions 2019-03-31 21:32:40 +03:00
SoSeDiK
77654eb23c Merge remote-tracking branch 'upstream/master' into lambda 2019-03-31 11:46:17 +03:00
TheBusyBiscuit
530189ecac
Merge pull request #876 from SoSeDiK/items 
Update SlimefunItems.java
 2019-03-31 09:41:57 +02:00
SoSeDiK
3c4e8e6b32 Use lambda expressions 2019-03-30 14:32:13 +02:00
SoSeDiK
2cc3c5c4d3 Update SlimefunItems.java 2019-03-30 14:11:51 +02:00
SoSeDiK
3e2f903425 Optimize tasks running 2019-03-30 14:06:44 +02:00
TheBusyBiscuit
009dede7cf
Merge pull request #872 from SoSeDiK/food 
Rename ORGANIC_FOOD and FERTILIZER
 2019-03-30 12:29:34 +01:00
TheBusyBiscuit
b44cce7a5e
Merge pull request #874 from SoSeDiK/AEA 
Prevent "Asynchronous entity add!"
 2019-03-30 11:29:26 +01:00
SoSeDiK
4a4934de68 Prevent "Asynchronous entity add!" 2019-03-30 12:15:56 +02:00
SoSeDiK
0361dfb6a0 Implement listeners for some events 2019-03-30 12:10:54 +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
TheBusyBiscuit
6213c62f47
Merge pull request #866 from SoSeDiK/deprecations 
Replaced deprecated code
 2019-03-29 22:32:50 +01:00
TheBusyBiscuit
7eb074daaa
Merge pull request #869 from SoSeDiK/startup 
Implement createDir() method
 2019-03-27 23:33:37 +01:00
SoSeDiK
56a3941f2f Updated method 2019-03-28 00:31:32 +02:00
TheBusyBiscuit
00b99072e7
Merge pull request #868 from SoSeDiK/guide 
Don't reset guide history when using cheat mode
 2019-03-27 23:25:32 +01:00
SoSeDiK
8a1cb8dad9 Replace deprecated code 2019-03-27 22:48:34 +02:00
SoSeDiK
2c62cae68e Implemented createDir() method 2019-03-27 22:46:04 +02:00
SoSeDiK
4e7f6bfa47 Replace deprecated code 2019-03-27 22:41:29 +02:00
SoSeDiK
eeb51fde41 Don't reset guide history when using cheat mode 2019-03-27 22:38:53 +02:00
SoSeDiK
81e18514ef Use ExoticGarden format for drinks 2019-03-27 22:31:48 +02:00
TheBusyBiscuit
7a0a98bb6d
Merge pull request #863 from SoSeDiK/furnace 
Update FurnaceListener.java
 2019-03-27 21:21:00 +01:00
SoSeDiK
75cbff530c Replaced spaces with tabs 2019-03-27 22:18:59 +02: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
TheBusyBiscuit
4fad8aa82c
Merge pull request #864 from SoSeDiK/sneaking 
Prevent opening inventory while sneaking with an item
 2019-03-27 21:08:52 +01:00
SoSeDiK
3c385770e1 Optimized researching progress 2019-03-27 21:38:30 +02:00
SoSeDiK
80642eeed1 Replaced deprecated enchantments code 2019-03-27 21:34:20 +02:00
SoSeDiK
76d00f9a34 Optimized error logging 2019-03-27 21:31:51 +02:00
SoSeDiK
bb35ab3d82 Remove juice one tick faster 2019-03-27 21:07:33 +02:00
SoSeDiK
5915e0dff4 Prevent opening inventory while sneaking with an item 
Vanilla behaviour.
 2019-03-27 21:07:13 +02:00
SoSeDiK
fbf01b1c39 Update FurnaceListener.java 2019-03-27 20:58:47 +02:00
SoSeDiK
2337004c17 Update FurnaceListener.java 2019-03-27 20:51:23 +02:00
SoSeDiK
da16fee28b Update FurnaceListener.java 2019-03-27 20:45:45 +02:00
SoSeDiK
38bcb6b731 Update FurnaceListener.java 2019-03-27 20:25:50 +02:00
TheBusyBiscuit
02ee0f1ce4
Merge pull request #859 from SoSeDiK/androids 
Androids
 2019-03-27 16:55:28 +01:00
TheBusyBiscuit
8c2746e775
Merge pull request #860 from SoSeDiK/spawners 
Spawners
 2019-03-27 16:40:44 +01:00
TheBusyBiscuit
3d3d6ab554
Merge pull request #858 from SoSeDiK/cp 
Updated CoreProtect API
 2019-03-27 16:37:13 +01:00
SoSeDiK
0561cf9e05 Optimized code 2019-03-26 22:56:40 +02:00
SoSeDiK
cb9f1b40f7 Fixed Block Place & Break Handlers not being fired for blocks 
Needed for blocks like REPAIRED_SPAWNER whick can't be written using "SlimefunItem.blockhandler".
 2019-03-26 22:52:27 +02:00
SoSeDiK
ad462d1b50 Added BlockBreakHandler for REPAIRED_SPAWNER 2019-03-26 22:51:04 +02:00
SoSeDiK
00019ef5ce Update ProgrammableAndroid.java 2019-03-26 22:32:25 +02:00
SoSeDiK
63ec77fcbc Fixed Androids movement 
Fixed moving forward actually being backwards (texture bug?)
 2019-03-26 22:26:27 +02:00
SoSeDiK
d85a51ed87 Allow Androids movement in CAVE_AIR 2019-03-26 22:24:50 +02:00
SoSeDiK
c4b096434c Updated CoreProtect API 2019-03-26 22:17:33 +02:00
SoSeDiK
99ad2d4ddf Updated WorldEdit API 2019-03-26 22:03:43 +02:00
SoSeDiK
f5670dddf1 Added a missing tab complete 
& Replaced deprecated method in SlimefunCommand
 2019-02-24 02:10:04 +02:00
SoSeDiK
ef868eae31 Removed unused imports 2019-02-23 23:14:01 +02:00
SoSeDiK
0728523ab7 Keep Waterlogged BlockData 
Glass panes now keep their Waterlogged BlockData
 2019-02-23 22:59:12 +02:00
SoSeDiK
ad2ebaddc9 Fix for #825 
Fixed the issue #825
 2019-02-23 22:45:06 +02:00
SoSeDiK
fab821742d Updated deprecated code parts 
Also replaced spaces with tabs.
 2019-02-23 22:21:03 +02:00
SoSeDiK
c762dc8461 Updated skull rotation handling 
Replaced deprecated methods.
Changed Ageable import.
Androids can be placed in any rotation from the beginning now.
 2019-02-23 22:05:30 +02:00
TheBusyBiscuit
02674e2463
Merge pull request #841 from PrzemoVi/master 
Fixed particles, some bugs.
 2019-02-20 12:55:47 +01:00
TheBusyBiscuit
02613cd577
Merge pull request #837 from TSEngineer/master 
Fix org.bukkit.Color is not imported
 2019-02-20 12:46:03 +01:00
TheBusyBiscuit
b99a75f7a7 Removed Apache Lang 2019-02-20 12:20:44 +01:00
PrzemoVi
5c29f9c8d4
Merge branch 'master' into master 2019-02-08 18:05:48 +01:00
Steve
a91b6253aa
Import Color 2019-02-03 12:45:26 +03:00
Steve
c62c3246ff
Fix particles 2019-01-26 16:21:27 +03:00
BuildTools
e950b264d8 Replaced some deprecated methods. 2019-01-18 20:38:02 +01:00
BuildTools
d88eaf9674 Fixed network particles, pom.xml, some other bugs. 2019-01-17 00:27:39 +01:00
TheBusyBiscuit
5f246ed523 Fixed WorldEdit support 2018-12-30 00:34:27 +01:00
TheBusyBiscuit
c74b14140e
Merge pull request #814 from PrzemoVi/master 
WorldEdit 7.0 support, Ancient Altar fix.
 2018-12-29 21:02:17 +01:00
PrzemoVi
9da3370edf
Fixed itemstack fixing ;) 2018-12-11 18:48:28 +01:00
PrzemoVi
af59dfa5ea
Add files via upload 
WorldEdit 7.0 fix
 2018-12-06 22:17:26 +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
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
188818061c Fixed Bronze Ingot being a brick block. 2018-09-18 10:52:50 +02:00
TheBusyBiscuit
464f15bf97 Nerfed Juices 2018-09-06 13:03:51 +02: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
TheBusyBiscuit
d56c872be2 Removed AdvancedRainbowTicker 2018-09-05 18:37:23 +02: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
4632d2f55b Fixed RainbowTicker not updating glass pane facings 2018-09-05 18:11:42 +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
MisterErwin
81a0509b70 Added 1.13 Material for CharCoal to the Carbonpress 2018-09-05 18:10:01 +02:00
MisterErwin
f6e6ef0cdf Using 1.13 Materials and BlockData for farming 2018-09-05 17:52:40 +02:00
MisterErwin
81031d3acc Using spigot Particles and BlockData Directional 2018-09-05 17:51:38 +02:00
MisterErwin
1a7e094657 Using the BlockData to drop correctly 2018-09-05 17:51:13 +02:00
MisterErwin
ef74d04125 Using 1.13 Skull Materials and Entity Types 2018-09-05 17:50:48 +02:00
MisterErwin
2d9afec1a4 Using BlockData Directional for onBlockDispensing 2018-09-05 17:50:15 +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
d46aaad34c Using 1.13 Materials 2018-09-05 17:42:34 +02:00
MisterErwin
18c62bca95 Using 1.13 Materials 2018-09-05 17:41:08 +02:00
MisterErwin
7a6dc71f1b Removed unnötiges ToDo 2018-09-05 17:40:26 +02:00
MisterErwin
40bf16390f Added RainbowTicker 2018-09-05 17:40:11 +02:00
MisterErwin
9f8b728249 Added 1.13 logs 2018-09-05 17:39:51 +02:00
MisterErwin
3f588e92ba Disabled the AdvancedRainbowTicker - is this one still needed? 2018-09-05 11:41:54 +02:00
MisterErwin
f18aa30631 Using vanilla/spigot particles 2018-09-05 11:30:49 +02:00
MisterErwin
d5aa03ca28 Using vanilla/spigot particles 2018-09-05 11:30:22 +02:00
MisterErwin
812fd1e271 Updated to 1.13 biomes 2018-09-05 11:30:01 +02:00
MisterErwin
aafbdc7512 Added api-version to plugin.yml 2018-09-05 11:23:17 +02:00
TheBusyBiscuit
93039c7cc3 First steps towards 1.13.1 port. 2018-09-04 11:33:57 +02:00
TheBusyBiscuit
b7385d1fc1
Merge pull request #751 from creator3/master 
Hopefully reduce input node breakage
 2018-08-06 21:17:46 +02:00
TheBusyBiscuit
1c649a4537
Merge branch 'master' into master 2018-08-06 21:13:46 +02:00
TheBusyBiscuit
79ef1c73dc
Merge pull request #733 from Ajptlink/Ajptlink-patch-1 
Fixed issue #686
 2018-08-06 21:12:18 +02:00
TheBusyBiscuit
934f46a03f
Merge pull request #730 from Firebuggie/master 
Fixes Butcher Androids being able to loot Wither Skeleton Skulls again.
 2018-08-06 21:02:47 +02:00
creator3
338621670b Hopefully reduce input node breakage 2018-07-31 15:55:18 -04: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
Ajptlink
391845fe86
Update RitualAnimation.java 2018-07-09 16:41:22 +02:00
Firebuggie
bf643cf02e
Update AndroidKillingListener.java 2018-07-04 20:48:58 +02:00
TheBusyBiscuit
69e1654985
Merge pull request #724 from AtomicScience/master 
Fix issue #690
 2018-06-23 14:05:03 +02:00
AtomicScience
a25bb15c93
Fix #690 2018-06-23 14:51:48 +03:00
creator3
ae3ba64f54 Parse block info at startup 2018-06-15 19:23:51 -04: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
a5e38577d2 Fixed colors in the Book GUI 2018-06-06 12:50:26 +03:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +03:00
SoSeDiK
6eb17d1d45 Removed unused imports 2018-06-06 11:46:18 +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
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
0d3fa24290 changing again to ampersands... 2018-05-04 14:44:09 -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
Rick
41da2c4402 put e back from texture address... don't know why that vanished. 2018-05-03 18:50:23 -04:00
Rick
391e897911 Trying again to refix the UTF-8 characters (I guess they changed the file type too, changed it to UTF-8 to fix this from happening again) 2018-05-03 17:20:05 -04:00
Rick
e8f3c62e02 Removes non UTF-8 chars from Programmable Android (Miner) which broke it. 2018-05-03 14:48:25 -04:00
Rick
4cde9413ba Adds checks for and adds to altarinuse. 2018-05-03 14:47:44 -04:00
Rick
5d830fca94 Removes altar and pedistals from altarinuse when finish()-ed. May fix dupe on break during craft (abort()). 2018-05-03 14:47:12 -04:00
Rick
d036d297c0 Adding alterinuse variable 2018-05-03 14:45:38 -04:00
Rick
a65fe55a43 altarinuse addition 2018-05-03 14:41:11 -04:00
VoidAngel
b3b2ec5978 Fixes a bug where mobs could pick up altar probe items 2018-04-30 18:00:37 -07:00
VoidAngel
f8112ccb37 Prevent SF items from being used in brewing stands 2018-04-30 17:58:04 -07: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
f9ab6492ee Merge remote-tracking branch 'upstream/master' 2018-04-29 10:27:40 -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
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
TheBusyBiscuit
dbdfa3cdb7
Merge pull request #662 from Redemption198/master 
Added CS-CoreLib permission check for Slimefun Machines
 2018-04-26 00:04:15 +02:00
VoidAngel
5f8328c02c Removed unintended code 2018-04-25 10:45:54 -07:00
VoidAngel
2506437339 Revert "Fix for players getting stuck in elevator books/teleporter guis" 
This reverts commit f595cb06a8.
 2018-04-25 08:52:31 -07: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
VoidAngel
6482f317b2 Merge remote-tracking branch 'upstream/master' 2018-04-24 21:31:19 -07:00
VoidAngel
f91c319c49 Fixes SF Guide dupe glitch and accidental item loss bug 
This patch makes the menu slots unclickable in all Guide menus.
 2018-04-24 21:30:41 -07:00
VoidAngel
846d0b41d3 Revert "Slimefun book GUI dupe fix" 
This reverts commit 19f4666235.
 2018-04-24 20:43:24 -07:00
Rick
4acd3645dd Reverts change to isItem, makes changes instead to getByItem 2018-04-23 20:34:53 -04: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
Kyle Einstein
e2342c38eb Fix Two Player Duplication Bug 2018-04-23 08:33:29 -04:00
Rick
1f88557e4c Removing all changes. 2018-04-22 12:48:19 -04:00
Rick
444cb1538e Removing all changes. 2018-04-22 12:48:00 -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
47d95af0a0 Fix whitespace issue. 2018-04-22 12:12:52 -04:00
Rick
e6199e3d46 Moves special case out of loop 2018-04-22 12:11:51 -04:00
Rick
3b5669dbaf Fixing some character issue from prior pull requests. 2018-04-22 12:00:23 -04:00
Rick
8e3d2e332b redoing this to fix a thing. 2018-04-22 11:59:53 -04:00
Rick
c65d8cf49b Redoing this to fix a thing. 2018-04-22 11:59:36 -04:00
Rick
2b9e24b45b Commit 1 of 2 for ticket #643 -- eliminates Altar dupe bug by disallowing all interactions while altar is in use. 2018-04-22 10:58:57 -04:00
Rick
34150791bc Commit 2 of 2 for ticket #643 -- eliminates Altar dupe bug by disallowing all interactions while altar is in use. 2018-04-22 10:58:36 -04:00
Rick
fda8f56f8a Switched to "continue" as stated. Although... pondering as to why this would have seemed to have worked anyway... the way I did it, in the case of a match, the whole thing quits... which is actually fine if the user just died in a keep-inventory region. If there was a better way of determining the existence of a keep-inventory region from all plugins that might produce one, really, that's what we'd rather be checking for here anyway. This is a fine alternative, but actually identical items will result in only one being kept when dying in a non-keep-inventory situation. 2018-04-22 10:25:44 -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
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
785cbea08f I could not use "breaK" as advised as that would completely break the loop and cease checking for duplicates among the remaining items. However, we are only checking against 5 additional slots here, so I've stated them each and made them return if a match is a bit better than setting a variable and all that, this is also more clear about what is going on here. I will state that the previous patch does introduce a limitation: identical soulbound items would be lost. Having exactly duplicated soulbound items prior to a death is a rather extreme situation, but during my testing I actually was using some I duplicated in creative mode and noticed that I would only retrieve one of each, and not the copies. It might be desireable to integrate an option here to only use this logic IF keep inventory regions will be in use somewhere, although not entirely necessary. 2018-04-20 17:53:36 -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
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
VoidAngel
f595cb06a8 Fix for players getting stuck in elevator books/teleporter guis 2018-04-19 14:11:23 -07:00
VoidAngel
19f4666235 Slimefun book GUI dupe fix 
Adds a player to a List when they have the guide open and cancels all inventory clicks until the menu is closed.
 2018-04-17 23:35:33 -07:00
SoSeDiK
c8ab30a485
Removed changes 
Move RecipeType to the ExoticGarden
 2018-04-17 00:47:05 +03:00
SoSeDiK
3edba533c9
Added a new Category for ExoticGarden 2018-04-16 23:39:06 +03:00
SoSeDiK
b423c9bd87
Replaced deprecated method 2018-04-16 19:46:18 +03:00
SoSeDiK
111424bae4
Replaced deprecated method 2018-04-16 19:45:09 +03:00
SoSeDiK
eb7388c613
Replaced deprecated method 2018-04-16 19:43:03 +03:00
SoSeDiK
2f7d4b619b
Replaced deprecated method 2018-04-16 19:41:50 +03:00