mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Fix drops in 1.15
This commit is contained in:
parent
f6057bf24d
commit
8b177df6c8
@ -27,6 +27,9 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
public class ExplosivePickaxe extends SimpleSlimefunItem<BlockBreakHandler> implements NotPlaceable, DamageableItem {
|
||||
|
||||
// Determines the drops an ExplosivePickaxe will get
|
||||
private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
|
||||
|
||||
private String[] blacklist;
|
||||
private boolean damageOnUse;
|
||||
|
||||
@ -77,7 +80,7 @@ public class ExplosivePickaxe extends SimpleSlimefunItem<BlockBreakHandler> impl
|
||||
b.breakNaturally();
|
||||
}
|
||||
else {
|
||||
for (ItemStack drop: b.getDrops()) {
|
||||
for (ItemStack drop: b.getDrops(EFFECTIVE_PICKAXE)) {
|
||||
b.getWorld().dropItemNaturally(b.getLocation(), (b.getType().toString().endsWith("_ORE") && b.getType() != Material.IRON_ORE && b.getType() != Material.GOLD_ORE) ? new CustomItem(drop, fortune): drop);
|
||||
}
|
||||
b.setType(Material.AIR);
|
||||
|
@ -20,6 +20,9 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
public class ExplosiveShovel extends SimpleSlimefunItem<BlockBreakHandler> implements NotPlaceable, DamageableItem {
|
||||
|
||||
// Determines the drops an ExplosiveShovel will get
|
||||
private static final ItemStack EFFECTIVE_SHOVEL = new ItemStack(Material.DIAMOND_SHOVEL);
|
||||
|
||||
private boolean damageOnUse;
|
||||
|
||||
public ExplosiveShovel(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) {
|
||||
@ -52,7 +55,7 @@ public class ExplosiveShovel extends SimpleSlimefunItem<BlockBreakHandler> imple
|
||||
|
||||
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType());
|
||||
|
||||
for (ItemStack drop: b.getDrops()) {
|
||||
for (ItemStack drop: b.getDrops(EFFECTIVE_SHOVEL)) {
|
||||
if (drop != null) {
|
||||
b.getWorld().dropItemNaturally(b.getLocation(), drop);
|
||||
}
|
||||
|
@ -13,6 +13,9 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
public class HerculesPickaxe extends SimpleSlimefunItem<BlockBreakHandler> {
|
||||
|
||||
// Determines the drops a HerculesPickaxe will get
|
||||
private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
|
||||
|
||||
public HerculesPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
@ -33,7 +36,7 @@ public class HerculesPickaxe extends SimpleSlimefunItem<BlockBreakHandler> {
|
||||
drops.add(new CustomItem(SlimefunItems.GOLD_DUST, 2));
|
||||
}
|
||||
else {
|
||||
for (ItemStack drop: e.getBlock().getDrops()) {
|
||||
for (ItemStack drop: e.getBlock().getDrops(EFFECTIVE_PICKAXE)) {
|
||||
drops.add(new CustomItem(drop, drop.getAmount() * 2));
|
||||
}
|
||||
}
|
||||
|
@ -20,6 +20,9 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements NotPlaceable {
|
||||
|
||||
// Determines the drops a LumberAxe will get
|
||||
private static final ItemStack EFFECTIVE_AXE = new ItemStack(Material.DIAMOND_AXE);
|
||||
|
||||
public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
@ -44,7 +47,7 @@ public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements
|
||||
if (SlimefunPlugin.getProtectionManager().hasPermission(e.getPlayer(), b, ProtectableAction.BREAK_BLOCK)) {
|
||||
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType());
|
||||
|
||||
for (ItemStack drop: b.getDrops()) {
|
||||
for (ItemStack drop: b.getDrops(EFFECTIVE_AXE)) {
|
||||
b.getWorld().dropItemNaturally(b.getLocation(), drop);
|
||||
}
|
||||
|
||||
|
@ -19,6 +19,8 @@ import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler;
|
||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
public class PickaxeOfVeinMining extends SimpleSlimefunItem<BlockBreakHandler> {
|
||||
// Determines the drops a PickaxeOfVeinMining will get
|
||||
private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
|
||||
|
||||
public PickaxeOfVeinMining(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
@ -40,7 +42,7 @@ public class PickaxeOfVeinMining extends SimpleSlimefunItem<BlockBreakHandler> {
|
||||
if (SlimefunPlugin.getProtectionManager().hasPermission(e.getPlayer(), b.getLocation(), ProtectableAction.BREAK_BLOCK)) {
|
||||
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType());
|
||||
|
||||
for (ItemStack drop: b.getDrops()) {
|
||||
for (ItemStack drop: b.getDrops(EFFECTIVE_PICKAXE)) {
|
||||
b.getWorld().dropItemNaturally(b.getLocation(), drop.getType().isBlock() ? drop: new CustomItem(drop, fortune));
|
||||
}
|
||||
|
||||
|
@ -18,7 +18,8 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
public class SmeltersPickaxe extends SimpleSlimefunItem<BlockBreakHandler> {
|
||||
|
||||
// Determines the drops a SmeltersPickaxe will get
|
||||
private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
|
||||
public SmeltersPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
@ -35,7 +36,7 @@ public class SmeltersPickaxe extends SimpleSlimefunItem<BlockBreakHandler> {
|
||||
if (BlockStorage.hasBlockInfo(e.getBlock())) return true;
|
||||
if (e.getBlock().getType() == Material.PLAYER_HEAD) return true;
|
||||
|
||||
Collection<ItemStack> blockDrops = e.getBlock().getDrops();
|
||||
Collection<ItemStack> blockDrops = e.getBlock().getDrops(EFFECTIVE_PICKAXE);
|
||||
for (ItemStack drop: blockDrops) {
|
||||
if (drop != null) {
|
||||
ItemStack output = drop;
|
||||
|
@ -1092,7 +1092,8 @@ public final class SlimefunSetup {
|
||||
new ItemStack[] {SlimefunItems.SOLAR_PANEL, new ItemStack(Material.CHEST), SlimefunItems.SOLAR_PANEL, SlimefunItems.GOLD_24K_BLOCK, new ItemStack(Material.DISPENSER), SlimefunItems.GOLD_24K_BLOCK, SlimefunItems.GOLD_24K_BLOCK, new ItemStack(Material.HOPPER), SlimefunItems.GOLD_24K_BLOCK},
|
||||
new ItemStack[0], BlockFace.SELF)
|
||||
.register(true, new MultiBlockInteractionHandler() {
|
||||
|
||||
// Determines the drops an Advanced Digital Miner will get
|
||||
private final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
|
||||
@Override
|
||||
public boolean onInteract(final Player p, MultiBlock mb, final Block b) {
|
||||
if (mb.isMultiBlock(SlimefunItem.getByID("ADVANCED_DIGITAL_MINER"))) {
|
||||
@ -1128,7 +1129,7 @@ public final class SlimefunSetup {
|
||||
else if (ore == Material.NETHER_QUARTZ_ORE) drop = new ItemStack(Material.QUARTZ, 4);
|
||||
else if (ore == Material.LAPIS_ORE) drop = new ItemStack(Material.LAPIS_LAZULI, 12);
|
||||
else {
|
||||
for (ItemStack drops: ores.get(0).getBlock().getDrops()) {
|
||||
for (ItemStack drops: ores.get(0).getBlock().getDrops(EFFECTIVE_PICKAXE)) {
|
||||
if (!drops.getType().isBlock()) drop = new CustomItem(drops, 2);
|
||||
}
|
||||
}
|
||||
|
@ -74,6 +74,9 @@ import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||
|
||||
public abstract class ProgrammableAndroid extends SlimefunItem implements InventoryBlock {
|
||||
|
||||
// Determines the drops a miner android will get
|
||||
private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
|
||||
|
||||
private static final int[] border = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 18, 24, 25, 26, 27, 33, 35, 36, 42, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53};
|
||||
private static final int[] border_out = {10, 11, 12, 13, 14, 19, 23, 28, 32, 37, 38, 39, 40, 41};
|
||||
|
||||
@ -497,7 +500,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent
|
||||
}
|
||||
|
||||
private void mine(Block b, BlockMenu menu, Block block) {
|
||||
Collection<ItemStack> drops = block.getDrops();
|
||||
Collection<ItemStack> drops = block.getDrops(EFFECTIVE_PICKAXE);
|
||||
if (!MaterialCollections.getAllUnbreakableBlocks().contains(block.getType()) && !drops.isEmpty() && SlimefunPlugin.getProtectionManager().hasPermission(Bukkit.getOfflinePlayer(UUID.fromString(BlockStorage.getLocationInfo(b.getLocation(), "owner"))), block.getLocation(), ProtectableAction.BREAK_BLOCK)) {
|
||||
String item = BlockStorage.checkID(block);
|
||||
|
||||
@ -532,7 +535,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent
|
||||
|
||||
|
||||
private void movedig(Block b, BlockMenu menu, BlockFace face, Block block) {
|
||||
Collection<ItemStack> drops = block.getDrops();
|
||||
Collection<ItemStack> drops = block.getDrops(EFFECTIVE_PICKAXE);
|
||||
if (!MaterialCollections.getAllUnbreakableBlocks().contains(block.getType()) && !drops.isEmpty() && SlimefunPlugin.getProtectionManager().hasPermission(Bukkit.getOfflinePlayer(UUID.fromString(BlockStorage.getLocationInfo(b.getLocation(), "owner"))), block.getLocation(), ProtectableAction.BREAK_BLOCK)) {
|
||||
SlimefunItem item = BlockStorage.check(block);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user