mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #1914

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-05-16 12:42:46 +02:00
parent 13b1a7f947
commit 29d2aaf055
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -47,6 +47,7 @@
* Fixed #1829
* Fixed some mojang.com connection errors
* Fixed some very weird SkullMeta serialization problems in 1.15
* Fixed #1914
## Release Candidate 11 (25 Apr 2020)

11
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java
View File

@ -74,7 +74,7 @@ public class OreWasher extends MultiBlockMachine {
return;
}
else if (SlimefunUtils.isItemSimilar(current, new ItemStack(Material.SAND, 4), false)) {
else if (SlimefunUtils.isItemSimilar(current, new ItemStack(Material.SAND, 2), false)) {
ItemStack output = SlimefunItems.SALT;
Inventory outputInv = findOutputInventory(output, dispBlock, inv);
@ -82,7 +82,7 @@ public class OreWasher extends MultiBlockMachine {
ItemStack removing = current.clone();
removing.setAmount(2);
inv.removeItem(removing);
outputInv.addItem(output);
outputInv.addItem(output.clone());
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.WATER);
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1, 1);
}
@ -98,7 +98,7 @@ public class OreWasher extends MultiBlockMachine {
ItemStack removing = current.clone();
removing.setAmount(1);
inv.removeItem(removing);
outputInv.addItem(output);
outputInv.addItem(output.clone());
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.WATER);
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1, 1);
}
@ -111,6 +111,11 @@ public class OreWasher extends MultiBlockMachine {
SlimefunPlugin.getLocal().sendMessage(p, "machines.unknown-material", true);
}
/**
* This returns a random dust item from Slimefun.
*
* @return A randomly picked dust item
*/
public ItemStack getRandomDust() {
int index = ThreadLocalRandom.current().nextInt(shownRecipes.size() / 2);
return shownRecipes.get(index * 2 + 1).clone();