diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 07806a91..d04c07ff 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,7 +4,7 @@ Version 2.1.9 Changes - Updated Build Craft API to v6.1.5. NB: EIO will no longer work with pre 6.1 BC versions - +- Added tool blacklist to prevent broken spawners dropping when using those tools ------------------------------------------------------ Version 2.1.8 diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 88583601..5354112c 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -40,6 +40,8 @@ public abstract class TileEntityEio extends TileEntity { protected abstract void readCustomNBT(NBTTagCompound root); protected void updateBlock() { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if (worldObj != null) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } } } diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 08a52cc9..9a144712 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -261,6 +261,9 @@ public final class Config { public static int poweredSpawnerMaxPlayerDistance = 0; public static boolean poweredSpawnerUseVanillaSpawChecks = false; public static double brokenSpawnerDropChance = 1; + public static String[] brokenSpawnerToolBlacklist = new String[] { + "RotaryCraft:rotarycraft_item_bedpick" + }; public static int powerSpawnerAddSpawnerCost = 30; public static int painterEnergyPerTaskRF = 2000; @@ -842,7 +845,10 @@ public final class Config { poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner.name, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks, "If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs").getBoolean(poweredSpawnerUseVanillaSpawChecks); brokenSpawnerDropChance = (float) config.get(sectionSpawner.name, "brokenSpawnerDropChance", brokenSpawnerDropChance, - "The chance a broken spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance").getDouble(brokenSpawnerDropChance); + "The chance a broken spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance").getDouble(brokenSpawnerDropChance); + brokenSpawnerToolBlacklist = config.getStringList("brokenSpawnerToolBlacklist", sectionSpawner.name, brokenSpawnerToolBlacklist, + "When a spawner is broken with these tools they will not drop a broken spawner"); + powerSpawnerAddSpawnerCost = config.get(sectionSpawner.name, "powerSpawnerAddSpawnerCost", powerSpawnerAddSpawnerCost, "The number of levels it costs to add a broken spawner").getInt(powerSpawnerAddSpawnerCost); diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index b1183dfc..12c1ee84 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -20,6 +20,8 @@ import net.minecraftforge.event.world.BlockEvent.BreakEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; @@ -33,7 +35,7 @@ import crazypants.util.Lang; import crazypants.util.Util; public class BlockPoweredSpawner extends AbstractMachineBlock implements IAdvancedTooltipProvider { - + public static void writeMobTypeToNBT(NBTTagCompound nbt, String type) { if(nbt == null) { return; @@ -44,7 +46,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock dropQueue = new ArrayList(); - + } + + private final List dropQueue = new ArrayList(); + private final List toolBlackList = new ArrayList(); + protected BlockPoweredSpawner() { - super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); + super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); + + String[] blackListNames = Config.brokenSpawnerToolBlacklist; + for (String name : blackListNames) { + toolBlackList.add(new UniqueIdentifier(name)); + } } @SubscribeEvent @@ -87,25 +95,35 @@ public class BlockPoweredSpawner extends AbstractMachineBlock Config.brokenSpawnerDropChance) { + + if(Math.random() > Config.brokenSpawnerDropChance) { return; } - TileEntityMobSpawner spawner = (TileEntityMobSpawner)tile; + ItemStack equipped = evt.getPlayer().getCurrentEquippedItem(); + if(equipped != null) { + for (UniqueIdentifier uid : toolBlackList) { + Item blackListItem = GameRegistry.findItem(uid.modId, uid.name); + if(blackListItem == equipped.getItem()) { + return; + } + } + } + + TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; MobSpawnerBaseLogic logic = spawner.func_145881_a(); if(logic != null) { String name = logic.getEntityNameToSpawn(); if(name != null && !isBlackListed(name)) { - ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); - dropQueue.add(new DropInfo(evt, drop)); + ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); + dropQueue.add(new DropInfo(evt, drop)); } } } } } } - + @SubscribeEvent public void onServerTick(TickEvent.ServerTickEvent event) { if(event.phase != TickEvent.Phase.END) { @@ -116,38 +134,38 @@ public class BlockPoweredSpawner extends AbstractMachineBlock tooltip, EntityPlayer player, World world, int x, int y, int z) { TilePoweredSpawner te = (TilePoweredSpawner) world.getTileEntity(x, y, z); @@ -213,26 +231,25 @@ public class BlockPoweredSpawner extends AbstractMachineBlock