From 96864a899173d76466df556497fc06d0dd797f1b Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 31 Aug 2014 01:08:10 +0800 Subject: [PATCH] Added first cut of 'Soul Fuser' (needs a name!) --- .../textures/blocks/blockSoulFuser.png | Bin 0 -> 1535 bytes .../textures/blocks/blockSoulFuserOn.png | Bin 0 -> 1552 bytes .../assets/enderio/textures/gui/soulFuser.png | Bin 0 -> 4921 bytes src/main/java/crazypants/enderio/EnderIO.java | 12 +-- .../java/crazypants/enderio/GuiHandler.java | 1 + .../java/crazypants/enderio/ModObject.java | 1 + .../crazypants/enderio/config/Config.java | 5 + .../enderio/item/ItemSoulVessel.java | 38 ++++--- .../enderio/machine/soul/BlockSoulFuser.java | 70 +++++++++++++ .../machine/soul/ContainerSoulFuser.java | 43 ++++++++ .../enderio/machine/soul/GuiSoulFuser.java | 56 ++++++++++ .../machine/soul/SoulFuserSpawnerRecipe.java | 99 ++++++++++++++++++ .../enderio/machine/soul/TileSoulFuser.java | 83 +++++++++++++++ 13 files changed, 385 insertions(+), 23 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/blockSoulFuser.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulFuserOn.png create mode 100644 resources/assets/enderio/textures/gui/soulFuser.png create mode 100644 src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java diff --git a/resources/assets/enderio/textures/blocks/blockSoulFuser.png b/resources/assets/enderio/textures/blocks/blockSoulFuser.png new file mode 100644 index 0000000000000000000000000000000000000000..40273d2156cee8eeae00b0ca470a4816b419355e GIT binary patch literal 1535 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 tR|9n)&zdHdLo)r#E`qw6Hv2{myS=1jVDEhPmzu guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 728ae479..437f40c5 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -51,6 +51,7 @@ public enum ModObject { blockVacuumChest, blockWirelessCharger, blockEnchanter, + blockSoulFuser, blockPoweredSpawner, itemBrokenSpawner, diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 39fff7c0..ec3db57a 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -257,6 +257,11 @@ public final class Config { public static String[] soulVesselBlackList = new String[0]; public static boolean soulVesselCapturesBosses = false; + public static double soulFuserLevelOnePowerPerTick = 50; + public static double soulFuserLevelTwoPowerPerTick = 100; + public static double soulFuserLevelThreePowerPerTick = 200; + public static int soulFuserMjForBrokenSpawner = 250000; + public static void load(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new Config()); diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 04bd918b..30e0fa46 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -5,6 +5,7 @@ import java.util.List; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitDisplayMode; @@ -186,6 +187,26 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { } return false; } + + public boolean containsSoul(ItemStack item) { + if(item == null) { + return false; + } + if(item.getItem() != this) { + return false; + } + return item.stackTagCompound != null && item.stackTagCompound.hasKey("id"); + } + + public String getMobTypeFromStack(ItemStack item) { + if(!containsSoul(item)) { + return null; + } + if(item == null || item.stackTagCompound == null || !item.stackTagCompound.hasKey("id")) { + return null; + } + return item.stackTagCompound.getString("id"); + } private boolean isBlackListed(String entityId) { for(String str : Config.soulVesselBlackList) { @@ -196,16 +217,6 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { return false; } - private boolean containsSoul(ItemStack item) { - if(item == null) { - return false; - } - if(item.getItem() != this) { - return false; - } - return item.stackTagCompound != null && item.stackTagCompound.hasKey("id"); - } - @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(itemStack); @@ -224,11 +235,6 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { } } - private String getMobTypeFromStack(ItemStack item) { - if(item == null || item.stackTagCompound == null || !item.stackTagCompound.hasKey("id")) { - return null; - } - return item.stackTagCompound.getString("id"); - } + } diff --git a/src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java new file mode 100644 index 00000000..e8bc48a3 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java @@ -0,0 +1,70 @@ +package crazypants.enderio.machine.soul; + +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.farm.BlockFarmStation; +import crazypants.enderio.machine.farm.PacketFarmAction; +import crazypants.enderio.machine.farm.PacketUpdateNotification; +import crazypants.enderio.machine.farm.TileFarmStation; +import crazypants.enderio.machine.painter.GuiPainter; +import crazypants.enderio.machine.painter.PainterContainer; +import crazypants.enderio.machine.painter.TileEntityPainter; +import crazypants.enderio.network.PacketHandler; + +public class BlockSoulFuser extends AbstractMachineBlock { + + + public static BlockSoulFuser create() { + BlockSoulFuser result = new BlockSoulFuser(); + result.init(); + return result; + } + + protected BlockSoulFuser() { + super(ModObject.blockSoulFuser, TileSoulFuser.class); + } + + @Override + protected void init() { + super.init(); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulFuser.unlocalisedName, SoulFuserSpawnerRecipe.instance); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileSoulFuser) { + return new ContainerSoulFuser(player.inventory, (AbstractMachineEntity) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileSoulFuser) { + return new GuiSoulFuser(player.inventory, (AbstractMachineEntity) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_SOUL_FUSER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:blockSoulFuserOn"; + } + return "enderio:blockSoulFuser"; + } +} diff --git a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java new file mode 100644 index 00000000..ec7874c1 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java @@ -0,0 +1,43 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.AbstractMachineEntity; + +public class ContainerSoulFuser extends AbstractMachineContainer { + + public ContainerSoulFuser(InventoryPlayer playerInv, AbstractMachineEntity te) { + super(playerInv, te); + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(tileEntity, 0, 38, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 1, 59, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 2, 112, 34) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + addSlotToContainer(new Slot(tileEntity, 3, 134, 34) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java new file mode 100644 index 00000000..e2cb97c0 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java @@ -0,0 +1,56 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.painter.PainterContainer; +import crazypants.render.RenderUtil; +import crazypants.vecmath.Vector4f; + +public class GuiSoulFuser extends GuiMachineBase { + + private AbstractMachineEntity tileEntity; + + public GuiSoulFuser(InventoryPlayer par1InventoryPlayer, AbstractMachineEntity te) { + super(te, new ContainerSoulFuser(par1InventoryPlayer, te)); + tileEntity = te; + } + + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/soulFuser.png"); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + + drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + int i1; + + i1 = tileEntity.getProgressScaled(24); + drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + @Override + protected boolean showRecipeButton() { + return false; + } + +// @Override +// protected void renderSlotHighlight(int slot, Vector4f col) { +// if(tileEntity.getSlotDefinition().isOutputSlot(slot)) { +// renderSlotHighlight(col, 117,31,24,24); +// } else if(slot != 1) { +// super.renderSlotHighlight(slot, col); +// } +// } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java new file mode 100644 index 00000000..e6e92281 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java @@ -0,0 +1,99 @@ +package crazypants.enderio.machine.soul; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.IMachineRecipe; +import crazypants.enderio.machine.MachineRecipeInput; + +public class SoulFuserSpawnerRecipe implements IMachineRecipe { + + public static SoulFuserSpawnerRecipe instance = new SoulFuserSpawnerRecipe(); + + @Override + public String getUid() { + return "SoulFuserSpawnerRecipe"; + } + + @Override + public float getEnergyRequired(MachineRecipeInput... inputs) { + return Config.soulFuserMjForBrokenSpawner; + } + + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + int validCount = 0; + for(MachineRecipeInput input : inputs) { + if(isValidInput(input)) { + validCount++; + } else { + return false; + } + } + return validCount == 2; + } + + @Override + public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { + String mobType = null; + for(MachineRecipeInput input : inputs) { + if(input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { + mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); + } + } + if(mobType == null) { + return new ResultStack[0]; + } + ItemStack spawner = EnderIO.itemBrokenSpawner.createStackForMobType(mobType); + if(spawner == null) { + return new ResultStack[0]; + } + ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); + return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(spawner)}; + } + + @Override + public float getExperianceForOutput(ItemStack output) { + return 0; + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if(input == null || input.item == null) { + return false; + } + int slot = input.slotNumber; + ItemStack item = input.item; + if(slot == 0) { + return EnderIO.itemSoulVessel.containsSoul(item); + } + if(slot == 1) { + return item.getItem() == EnderIO.itemBrokenSpawner; + } + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockSoulFuser.unlocalisedName; + } + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + List result = new ArrayList(inputs.length); + for(MachineRecipeInput input : inputs) { + if(input != null && input.item != null) { + ItemStack resStack = input.item.copy(); + resStack.stackSize = 1; + MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); + result.add(mri); + } + } + return result; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java new file mode 100644 index 00000000..aa5dd3c5 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java @@ -0,0 +1,83 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.PowerHandlerUtil; + +public class TileSoulFuser extends AbstractPoweredTaskEntity { + + public static final float POWER_PER_TICK_ONE = (float)Config.soulFuserLevelOnePowerPerTick; + private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 1.25), + Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); + + public static final float POWER_PER_TICK_TWO = (float)Config.soulFuserLevelTwoPowerPerTick; + private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 1.25), + Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); + + public static final float POWER_PER_TICK_THREE = (float)Config.soulFuserLevelThreePowerPerTick; + private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 1.25), + Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); + + public TileSoulFuser() { + super(new SlotDefinition(2, 2, 1)); + } + + @Override + public String getMachineName() { + return ModObject.blockSoulFuser.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack item) { + return SoulFuserSpawnerRecipe.instance.isValidInput(new MachineRecipeInput(slot, item)); + } + + public void setCapacitor(Capacitors capacitorType) { + this.capacitorType = capacitorType; + switch (capacitorType) { + case BASIC_CAPACITOR: + PowerHandlerUtil.configure(powerHandler, CAP_ONE); + break; + case ACTIVATED_CAPACITOR: + PowerHandlerUtil.configure(powerHandler, CAP_TWO); + break; + case ENDER_CAPACITOR: + PowerHandlerUtil.configure(powerHandler, CAP_THREE); + break; + default: + PowerHandlerUtil.configure(powerHandler, CAP_ONE); + break; + } + forceClientUpdate = true; + } + + @Override + public float getPowerUsePerTick() { + if(capacitorType.ordinal() == 0) { + return POWER_PER_TICK_ONE; + } else if(capacitorType.ordinal() == 1) { + return POWER_PER_TICK_TWO; + } + return POWER_PER_TICK_THREE; + } + + @Override + public int getProgressScaled(int scale) { + int res = super.getProgressScaled(scale); + if(currentTask != null) { + res = Math.max(1, res); + } + return res; + } + + + + +}