diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 6c9bc00e..8629576a 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -231,6 +231,14 @@ enderio.tank.tank=Tank tile.blockCrafter.name=Crafter +tile.blockPoweredSpawner.name=Powered Spawner +tile.blockPoweredSpawner.tooltip.empty=Empty +tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Combine with a broken +tile.blockPoweredSpawner.empty.tooltip.detailed.line2=spawner in an anvil +tile.blockPoweredSpawner.tooltip.detailed.line1=Supply with power to +tile.blockPoweredSpawner.tooltip.detailed.line2=activate +item.itemBrokenSpawner.name=Broken Spawner + enderio.machine.tooltip.configured=(Configured) //Blocks diff --git a/resources/assets/enderio/textures/items/itemBrokenSpawner.png b/resources/assets/enderio/textures/items/itemBrokenSpawner.png new file mode 100644 index 00000000..c12700de Binary files /dev/null and b/resources/assets/enderio/textures/items/itemBrokenSpawner.png differ diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 2fb36604..d455ff08 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -64,6 +64,7 @@ import crazypants.enderio.machine.power.CapBankRenderer2; import crazypants.enderio.machine.power.CapacitorBankRenderer; import crazypants.enderio.machine.reservoir.ReservoirRenderer; import crazypants.enderio.machine.reservoir.TileReservoir; +import crazypants.enderio.machine.spawner.BrokenSpawnerRenderer; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRenderer; import crazypants.enderio.machine.tank.TankFluidRenderer; @@ -144,6 +145,8 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPainter), machRen); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrafter), machRen); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemBrokenSpawner, new BrokenSpawnerRenderer()); + BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index d2992aae..b2400581 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -153,11 +153,13 @@ public final class Config { public static int poweredSpawnerMinDelayTicks = 200; public static int poweredSpawnerMaxDelayTicks = 800; - public static float poweredSpawnerLevelOnePowerPerTick = 4; - public static float poweredSpawnerLevelTwoPowerPerTick = 16; - public static float poweredSpawnerLevelThreePowerPerTick = 64; + public static float poweredSpawnerLevelOnePowerPerTick = 16; + public static float poweredSpawnerLevelTwoPowerPerTick = 48; + public static float poweredSpawnerLevelThreePowerPerTick = 96; public static int poweredSpawnerMaxPlayerDistance = 0; public static boolean poweredSpawnerUseVanillaSpawChecks = false; + public static double brokenSpawnerDropChance = 1; + public static int powerSpawnerAddSpawnerCost = 30; public static void load(FMLPreInitializationEvent event) { configDirectory = new File(event.getModConfigurationDirectory(), "enderio"); @@ -475,7 +477,11 @@ public final class Config { "Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance); poweredSpawnerUseVanillaSpawChecks = config.get("PoweredSpawner Settings", "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("PoweredSpawner Settings", "brokenSpawnerDropChance", brokenSpawnerDropChance, + "The chance a brokne spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance").getDouble(brokenSpawnerDropChance); + powerSpawnerAddSpawnerCost = config.get("PoweredSpawner Settings", "powerSpawnerAddSpawnerCost", powerSpawnerAddSpawnerCost, + "The number of levels it costs to add a broken spawner").getInt(powerSpawnerAddSpawnerCost); + } private Config() { diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index dbbff232..44cf0fd1 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -79,6 +79,7 @@ import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.reservoir.BlockReservoir; import crazypants.enderio.machine.solar.BlockSolarPanel; import crazypants.enderio.machine.spawner.BlockPoweredSpawner; +import crazypants.enderio.machine.spawner.ItemBrokenSpawner; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; @@ -168,6 +169,7 @@ public class EnderIO { public static BlockTank blockTank; public static BlockCrafter blockCrafter; public static BlockPoweredSpawner blockPoweredSpawner; + public static ItemBrokenSpawner itemBrokenSpawner; public static BlockElectricLight blockElectricLight; public static BlockLightNode blockLightNode; @@ -233,8 +235,7 @@ public class EnderIO { blockAlloySmelter = BlockAlloySmelter.create(); blockVat = BlockVat.create(); blockPowerMonitor = BlockPowerMonitor.create(); - blockFarmStation = BlockFarmStation.create(); - blockPoweredSpawner = BlockPoweredSpawner.create(); + blockFarmStation = BlockFarmStation.create(); blockCapacitorBank = BlockCapacitorBank.create(); blockPainter = BlockPainter.create(); @@ -264,6 +265,9 @@ public class EnderIO { blockConduitBundle = BlockConduitBundle.create(); blockConduitFacade = BlockConduitFacade.create(); itemConduitFacade = ItemConduitFacade.create(); + + blockPoweredSpawner = BlockPoweredSpawner.create(); + itemBrokenSpawner = ItemBrokenSpawner.create(); itemRedstoneConduit = ItemRedstoneConduit.create(); itemPowerConduit = ItemPowerConduit.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 2e71a9f1..f9720584 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -47,7 +47,9 @@ public enum ModObject { blockFarmStation, blockTank, blockCrafter, + blockPoweredSpawner, + itemBrokenSpawner, blockElectricLight, blockLightNode, diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 109e5bdf..2c6870e8 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -71,13 +71,13 @@ public class TooltipAddera { } Block blk = Block.getBlockFromItem(evt.itemStack.getItem()); - if(blk instanceof IResourceTooltipProvider) { - addInformation((IResourceTooltipProvider)blk, evt); - return; - } else if(blk instanceof IAdvancedTooltipProvider) { + if(blk instanceof IAdvancedTooltipProvider) { addInformation((IAdvancedTooltipProvider)blk, evt.itemStack, evt.entityPlayer, evt.toolTip, false); return; - } + } else if(blk instanceof IResourceTooltipProvider) { + addInformation((IResourceTooltipProvider)blk, evt); + return; + } if(Config.addFuelTooltipsToAllFluidContainers) { addTooltipForFluid(evt.toolTip, evt.itemStack); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 278a3d37..b48df7eb 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -31,7 +31,8 @@ import crazypants.util.ItemUtil; import crazypants.util.Lang; import crazypants.vecmath.VecmathUtil; -public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IInternalPowerReceptor, IMachine, IRedstoneModeControlable, IIoConfigurable { +public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IInternalPowerReceptor, IMachine, IRedstoneModeControlable, + IIoConfigurable { public short facing; @@ -73,7 +74,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi redstoneControlMode = RedstoneControlMode.IGNORE; allSlots = new int[slotDefinition.getNumSlots()]; - for(int i=0;i> ents = faceModes.entrySet(); - for(Entry ent : ents) { + for (Entry ent : ents) { IoMode mode = ent.getValue(); if(mode.pulls()) { res = res | doPull(ent.getKey()); @@ -381,8 +380,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); if(te == null) { return false; - } - for(int i=slotDefinition.minOutputSlot; i<= slotDefinition.maxOutputSlot;i++) { + } + for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { ItemStack item = inventory[i]; if(item != null) { int num = ItemUtil.doInsertItem(te, item, dir.getOpposite()); @@ -392,7 +391,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi item = null; } inventory[i] = item; - markDirty(); + markDirty(); } } } @@ -409,7 +408,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } boolean hasSpace = false; - for(int slot=slotDefinition.minInputSlot; slot <= slotDefinition.maxInputSlot && !hasSpace;slot++) { + for (int slot = slotDefinition.minInputSlot; slot <= slotDefinition.maxInputSlot && !hasSpace; slot++) { hasSpace = inventory[slot] == null ? true : inventory[slot].stackSize < inventory[slot].getMaxStackSize(); } if(!hasSpace) { @@ -421,14 +420,14 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(te == null) { return false; } - if( !(te instanceof IInventory)) { + if(!(te instanceof IInventory)) { return false; } ISidedInventory target; if(te instanceof ISidedInventory) { - target = (ISidedInventory)te; + target = (ISidedInventory) te; } else { - target = new InventoryWrapper((IInventory)te); + target = new InventoryWrapper((IInventory) te); } int[] targetSlots = target.getAccessibleSlotsFromSide(dir.getOpposite().ordinal()); @@ -436,7 +435,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi return false; } - for(int inputSlot=slotDefinition.minInputSlot; inputSlot <= slotDefinition.maxInputSlot;inputSlot++) { + for (int inputSlot = slotDefinition.minInputSlot; inputSlot <= slotDefinition.maxInputSlot; inputSlot++) { if(doPull(inputSlot, target, targetSlots, dir)) { return false; } @@ -446,7 +445,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi protected boolean doPull(int inputSlot, ISidedInventory target, int[] targetSlots, ForgeDirection side) { ItemStack curStack = inventory[inputSlot]; - for(int i=0;i= 0 && slot < inventory.length) { - inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + if(itemList != null) { + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if(slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } } } @@ -524,7 +525,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(stack == null || stack.stackTagCompound == null) { return; } - NBTTagCompound root = stack.stackTagCompound ; + NBTTagCompound root = stack.stackTagCompound; if(!root.hasKey("eio.abstractMachine")) { return; } @@ -591,8 +592,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi stack.setStackDisplayName(name); } - - // ---- Inventory // ------------------------------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 68667dc8..8ef4abba 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -1,31 +1,136 @@ package crazypants.enderio.machine.spawner; +import java.util.List; + +import scala.tools.nsc.settings.AdvancedScalaSettings; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; +import net.minecraft.block.BlockMobSpawner; +import net.minecraft.block.BlockSponge; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.MobSpawnerBaseLogic; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.AnvilUpdateEvent; +import net.minecraftforge.event.world.BlockEvent; +import crazypants.enderio.Config; +import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.crusher.BlockCrusher; import crazypants.enderio.machine.crusher.PacketGrindingBall; +import crazypants.enderio.machine.power.BlockItemCapacitorBank; +import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.util.Lang; +import crazypants.util.Util; -public class BlockPoweredSpawner extends AbstractMachineBlock { +public class BlockPoweredSpawner extends AbstractMachineBlock implements IAdvancedTooltipProvider { - public static BlockPoweredSpawner create() { - +// public static ItemStack createItemStackForSpawnerType(String type) { +// ItemStack res = new ItemStack(EnderIO.blockPoweredSpawner); +// res.stackTagCompound = new NBTTagCompound(); +// res.stackTagCompound.setString("mobType", type); +// return res; +// } + + public static void writeMobTypeToNBT(NBTTagCompound nbt, String type) { + if(nbt == null) { + return; + } + if(type == null) { + nbt.removeTag("mobType"); + } else { + nbt.setString("mobType", type); + } + } + + public static String readMobTypeFromNBT(NBTTagCompound nbt) { + if(nbt == null) { + return null; + } + if(!nbt.hasKey("mobType")) { + return null; + } + return nbt.getString("mobType"); + } + + public static String getSpawnerTypeFromItemStack(ItemStack stack) { + if(stack == null || stack.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner)) { + return null; + } + return readMobTypeFromNBT(stack.stackTagCompound); + } + + public static BlockPoweredSpawner create() { MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPoweredSpawner.unlocalisedName, new DummyRecipe()); BlockPoweredSpawner res = new BlockPoweredSpawner(); + MinecraftForge.EVENT_BUS.register(res); res.init(); return res; - } + } protected BlockPoweredSpawner() { super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); } + @SubscribeEvent + public void onBreakEvent(BlockEvent.BreakEvent evt) { + if(evt.block instanceof BlockMobSpawner) { + if(evt.getPlayer() != null && !evt.getPlayer().capabilities.isCreativeMode) { + TileEntity tile = evt.getPlayer().worldObj.getTileEntity(evt.x, evt.y, evt.z); + if(tile instanceof TileEntityMobSpawner) { + + if(Math.random() > Config.brokenSpawnerDropChance) { + return; + } + + TileEntityMobSpawner spawner = (TileEntityMobSpawner)tile; + MobSpawnerBaseLogic logic = spawner.func_145881_a(); + if(logic != null) { + String name = logic.getEntityNameToSpawn(); + if(name != null) { + ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); + Util.dropItems(evt.getPlayer().worldObj, drop, evt.x, evt.y, evt.z, true); + } + } + } + } + } + } + + @SubscribeEvent + public void handleAnvilEvent(AnvilUpdateEvent evt) { + if(evt.left == null || evt.left.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner) || + evt.right == null || ItemBrokenSpawner.getMobTypeFromStack(evt.right) == null) { + return; + } + evt.cost = Config.powerSpawnerAddSpawnerCost; + evt.output = evt.left.copy(); + if(evt.output.stackTagCompound == null) { + evt.output.stackTagCompound = new NBTTagCompound(); + } + evt.output.stackTagCompound.setBoolean("eio.abstractMachine", true); + writeMobTypeToNBT(evt.output.stackTagCompound, ItemBrokenSpawner.getMobTypeFromStack(evt.right)); + + } + @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { return null; @@ -54,4 +159,30 @@ public class BlockPoweredSpawner extends AbstractMachineBlock