mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Fixes #1914
This commit is contained in:
parent
13b1a7f947
commit
29d2aaf055
@ -47,6 +47,7 @@
|
|||||||
* Fixed #1829
|
* Fixed #1829
|
||||||
* Fixed some mojang.com connection errors
|
* Fixed some mojang.com connection errors
|
||||||
* Fixed some very weird SkullMeta serialization problems in 1.15
|
* Fixed some very weird SkullMeta serialization problems in 1.15
|
||||||
|
* Fixed #1914
|
||||||
|
|
||||||
## Release Candidate 11 (25 Apr 2020)
|
## Release Candidate 11 (25 Apr 2020)
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ public class OreWasher extends MultiBlockMachine {
|
|||||||
|
|
||||||
return;
|
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;
|
ItemStack output = SlimefunItems.SALT;
|
||||||
Inventory outputInv = findOutputInventory(output, dispBlock, inv);
|
Inventory outputInv = findOutputInventory(output, dispBlock, inv);
|
||||||
|
|
||||||
@ -82,7 +82,7 @@ public class OreWasher extends MultiBlockMachine {
|
|||||||
ItemStack removing = current.clone();
|
ItemStack removing = current.clone();
|
||||||
removing.setAmount(2);
|
removing.setAmount(2);
|
||||||
inv.removeItem(removing);
|
inv.removeItem(removing);
|
||||||
outputInv.addItem(output);
|
outputInv.addItem(output.clone());
|
||||||
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.WATER);
|
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.WATER);
|
||||||
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1, 1);
|
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1, 1);
|
||||||
}
|
}
|
||||||
@ -98,7 +98,7 @@ public class OreWasher extends MultiBlockMachine {
|
|||||||
ItemStack removing = current.clone();
|
ItemStack removing = current.clone();
|
||||||
removing.setAmount(1);
|
removing.setAmount(1);
|
||||||
inv.removeItem(removing);
|
inv.removeItem(removing);
|
||||||
outputInv.addItem(output);
|
outputInv.addItem(output.clone());
|
||||||
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.WATER);
|
p.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.WATER);
|
||||||
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1, 1);
|
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);
|
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() {
|
public ItemStack getRandomDust() {
|
||||||
int index = ThreadLocalRandom.current().nextInt(shownRecipes.size() / 2);
|
int index = ThreadLocalRandom.current().nextInt(shownRecipes.size() / 2);
|
||||||
return shownRecipes.get(index * 2 + 1).clone();
|
return shownRecipes.get(index * 2 + 1).clone();
|
||||||
|
Loading…
Reference in New Issue
Block a user