From 748837e0aa01cc70af0da32be3246fcd4e24cab0 Mon Sep 17 00:00:00 2001 From: Robert S Date: Sat, 31 May 2014 22:36:28 -0400 Subject: [PATCH] Converted quantum assembler to java, lowered required power fixing input issues --- .../particle/quantum/GuiQuantumAssembler.java | 6 +- .../quantum/RenderQuantumAssembler.java | 10 +- .../quantum/TileQuantumAssembler.java | 269 ++++++++++++++++++ .../quantum/TileQuantumAssembler.scala | 239 ---------------- 4 files changed, 277 insertions(+), 247 deletions(-) create mode 100644 atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java delete mode 100644 atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.scala diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java index 5de6fede..401a9ea3 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/GuiQuantumAssembler.java @@ -33,9 +33,9 @@ public class GuiQuantumAssembler extends GuiContainerBase this.fontRenderer.drawString(this.tileEntity.getInvName(), 65 - this.tileEntity.getInvName().length(), 6, 4210752); String displayText = ""; - if (this.tileEntity.time() > 0) + if (this.tileEntity.time > 0) { - displayText = "Process: " + (int) (100 - ((float) this.tileEntity.time() / (float) this.tileEntity.MAX_TIME()) * 100) + "%"; + displayText = "Process: " + (int) (100 - ((float) this.tileEntity.time / (float) this.tileEntity.MAX_TIME) * 100) + "%"; } else if (this.tileEntity.canProcess()) { @@ -48,7 +48,7 @@ public class GuiQuantumAssembler extends GuiContainerBase this.fontRenderer.drawString(displayText, 9, this.ySize - 106, 4210752); this.renderUniversalDisplay(100, this.ySize - 94, this.tileEntity.getVoltageInput(null), mouseX, mouseY, Unit.VOLTAGE); - this.renderUniversalDisplay(8, this.ySize - 95, tileEntity.MAX_TIME(), mouseX, mouseY, Unit.WATT); + this.renderUniversalDisplay(8, this.ySize - 95, tileEntity.MAX_TIME, mouseX, mouseY, Unit.WATT); } /** Draw the background layer for the GuiContainer (everything behind the items) */ diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java index 9d7d9934..58da33ac 100644 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java +++ b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/RenderQuantumAssembler.java @@ -40,21 +40,21 @@ public class RenderQuantumAssembler extends TileEntitySpecialRenderer bindTexture(TEXTURE); GL11.glPushMatrix(); - GL11.glRotatef(-tileEntity.rotationYaw1(), 0, 1f, 0); + GL11.glRotatef(-tileEntity.rotationYaw1, 0, 1f, 0); MODEL.renderOnly(hands); MODEL.renderOnly("Resonance_Crystal"); GL11.glPopMatrix(); /** Small Laser Arm */ GL11.glPushMatrix(); - GL11.glRotatef(tileEntity.rotationYaw2(), 0, 1f, 0); + GL11.glRotatef(tileEntity.rotationYaw2, 0, 1f, 0); MODEL.renderOnly(arms); GL11.glPopMatrix(); /** Large Laser Arm */ GL11.glPushMatrix(); - GL11.glRotatef(-tileEntity.rotationYaw3(), 0, 1f, 0); + GL11.glRotatef(-tileEntity.rotationYaw3, 0, 1f, 0); MODEL.renderOnly(largeArms); GL11.glPopMatrix(); @@ -66,9 +66,9 @@ public class RenderQuantumAssembler extends TileEntitySpecialRenderer GL11.glPushMatrix(); - if (tileEntity.entityItem() != null) + if (tileEntity.entityItem != null) { - renderItem.doRenderItem(tileEntity.entityItem(), x + 0.5, y + 0.4, z + 0.5, 0, 0); + renderItem.doRenderItem(tileEntity.entityItem, x + 0.5, y + 0.4, z + 0.5, 0, 0); } GL11.glPopMatrix(); diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java new file mode 100644 index 00000000..8d84397d --- /dev/null +++ b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.java @@ -0,0 +1,269 @@ +package resonantinduction.atomic.particle.quantum; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet; +import net.minecraftforge.common.ForgeDirection; +import resonant.api.recipe.QuantumAssemblerRecipes; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.prefab.tile.TileElectricalInventory; +import resonantinduction.atomic.Atomic; +import resonantinduction.core.Reference; +import resonantinduction.core.ResonantInduction; +import universalelectricity.api.electricity.IVoltageInput; +import universalelectricity.api.energy.EnergyStorageHandler; +import universalelectricity.api.vector.Vector3; + +import com.google.common.io.ByteArrayDataInput; + +import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; + +/** Atomic assembler of items * + * + * @author Calclavia, Darkguardsman */ +public class TileQuantumAssembler extends TileElectricalInventory implements IPacketReceiver, IVoltageInput +{ + long ENERGY = 1000000000L; + int MAX_TIME = 20 * 120; + int time = 0; + + /** Used for rendering. */ + float rotationYaw1 = 0; + float rotationYaw2 = 0; + float rotationYaw3 = 0; + + /** Used for rendering. */ + EntityItem entityItem = null; + + public TileQuantumAssembler() + { + super(Material.iron); + energy = new EnergyStorageHandler(ENERGY, ENERGY / 10); + maxSlots = 7; + isOpaqueCube = false; + normalRender = false; + customItemRender = true; + textureName = "machine"; + } + + /** Called when the block is right clicked by the player */ + @Override + public boolean use(EntityPlayer player, int side, Vector3 hit) + { + if (!world().isRemote) + player.openGui(Atomic.INSTANCE, 0, world(), x(), y(), z()); + + return true; + } + + @Override + public void updateEntity() + { + super.updateEntity(); + + //Server side processing of items + if (!this.worldObj.isRemote) + { + if (this.canProcess()) + { + if (energy.checkExtract()) + { + if (this.time == 0) + { + this.time = this.MAX_TIME; + } + if (this.time > 0) + { + this.time -= 1; + if (this.time < 1) + { + this.process(); + this.time = 0; + } + } + else + { + this.time = 0; + } + this.energy.extractEnergy(ENERGY, true); + } + } + else + { + this.time = 0; + } + if (this.ticks % 10 == 0) + { + for (EntityPlayer player : this.getPlayersUsing()) + { + PacketDispatcher.sendPacketToPlayer(getDescriptionPacket(), (Player) player); + } + } + } //Client side animation + else if (this.time > 0) + { + ItemStack middleStack = this.getStackInSlot(6); + if (middleStack != null) + { + middleStack = middleStack.copy(); + middleStack.stackSize = 1; + if (this.entityItem == null) + { + this.entityItem = new EntityItem(this.worldObj, 0, 0, 0, middleStack); + } + else if (!middleStack.isItemEqual(this.entityItem.getEntityItem())) + { + this.entityItem = new EntityItem(this.worldObj, 0, 0, 0, middleStack); + } + this.entityItem.age += 1; + } + else + { + this.entityItem = null; + } + + //Audio update + if (this.ticks % 600 == 0) + { + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, Reference.PREFIX + "assembler", 0.7f, 1f); + } + + //Animation frame update + this.rotationYaw1 += 3; + this.rotationYaw2 += 2; + this.rotationYaw3 += 1; + } + } + + @Override + public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive) + { + if (this.canProcess()) + { + return super.onReceiveEnergy(from, receive, doReceive); + } + return 0; + } + + @Override + public void onReceivePacket(ByteArrayDataInput data, EntityPlayer player, Object... obj) + { + try + { + this.time = data.readInt(); + int itemID = data.readInt(); + int itemAmount = data.readInt(); + int itemMeta = data.readInt(); + if (itemID != -1 && itemAmount != -1 && itemMeta != -1) + { + this.setInventorySlotContents(6, new ItemStack(Item.itemsList[itemID], itemAmount, itemMeta)); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + @Override + public Packet getDescriptionPacket() + { + if (this.getStackInSlot(6) != null) + { + return ResonantInduction.PACKET_TILE.getPacket(this, time, getStackInSlot(6).itemID, getStackInSlot(6).stackSize, getStackInSlot(6).getItemDamage()); + } + return ResonantInduction.PACKET_TILE.getPacket(this, time, -1, -1, -1); + } + + @Override + public void openChest() + { + if (!this.worldObj.isRemote) + { + for (EntityPlayer player : this.getPlayersUsing()) + { + PacketDispatcher.sendPacketToPlayer(getDescriptionPacket(), (Player) player); + } + } + } + + /** Checks to see if the assembler can run */ + public boolean canProcess() + { + if (getStackInSlot(6) != null) + { + if (QuantumAssemblerRecipes.hasItemStack(getStackInSlot(6))) + { + for (int i = 0; i < 6; i++) + { + if (getStackInSlot(i) == null) + return false; + if (getStackInSlot(i).itemID != Atomic.itemDarkMatter.itemID) + return false; + } + return getStackInSlot(6).stackSize < 64; + } + } + return false; + } + + /** Turn one item from the furnace source stack into the appropriate smelted item in the furnace + * result stack */ + public void process() + { + if (this.canProcess()) + { + for (int i = 0; i < 6; i++) + { + if (getStackInSlot(i) != null) + { + decrStackSize(i, 1); + } + } + if (getStackInSlot(6) != null) + { + getStackInSlot(6).stackSize += 1; + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbt) + { + super.readFromNBT(nbt); + this.time = nbt.getInteger("smeltingTicks"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) + { + super.writeToNBT(nbt); + nbt.setInteger("smeltingTicks", this.time); + } + + @Override + public boolean isItemValidForSlot(int slotID, ItemStack itemStack) + { + if (slotID == 6) + { + return true; + } + return itemStack.itemID == Atomic.itemDarkMatter.itemID; + } + + @Override + public long getVoltageInput(ForgeDirection from) + { + return 1000; + } + + @Override + public void onWrongVoltage(ForgeDirection d, long voltage) + { + } +} diff --git a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.scala b/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.scala deleted file mode 100644 index ce11c5ac..00000000 --- a/atomic/src/main/scala/resonantinduction/atomic/particle/quantum/TileQuantumAssembler.scala +++ /dev/null @@ -1,239 +0,0 @@ -package resonantinduction.atomic.particle.quantum - -import resonantinduction.atomic -import resonant.api.recipe.QuantumAssemblerRecipes -import resonant.lib.network.IPacketReceiver -import com.google.common.io.ByteArrayDataInput -import cpw.mods.fml.common.network.PacketDispatcher -import cpw.mods.fml.common.network.Player -import net.minecraft.entity.item.EntityItem -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.Item -import net.minecraft.item.ItemStack -import net.minecraft.nbt.NBTTagCompound -import net.minecraft.network.packet.Packet -import net.minecraftforge.common.ForgeDirection -import universalelectricity.api.electricity.IVoltageInput -import universalelectricity.api.energy.EnergyStorageHandler -import resonant.lib.content.prefab.TraitInventory -import net.minecraft.block.material.Material -import universalelectricity.api.vector.Vector3 -import resonant.lib.prefab.tile.TileElectrical -import resonantinduction.atomic.Atomic -import resonantinduction.core.ResonantInduction -import resonantinduction.core.Reference - -class TileQuantumAssembler extends TileElectrical(Material.iron) with TraitInventory with IPacketReceiver with IVoltageInput { - val ENERGY: Long = 10000000000000L - val MAX_TIME: Int = 20 * 120 - var time: Int = 0 - /** - * Used for rendering. - */ - var rotationYaw1: Float = 0 - var rotationYaw2: Float = 0 - var rotationYaw3: Float = 0 - /** - * Used for rendering. - */ - var entityItem: EntityItem = null - - energy = new EnergyStorageHandler(ENERGY) - maxSlots = 6 + 1 - isOpaqueCube = false; - normalRender = false; - customItemRender = true; - textureName = "machine" - - /** - * Called when the block is right clicked by the player - */ - override def use(player: EntityPlayer, side: Int, hit: Vector3): Boolean = - { - if (!world().isRemote) { - player.openGui(Atomic.INSTANCE, 0, world, x, y, z) - return true - } - - return true - } - - override def updateEntity { - super.updateEntity - if (!this.worldObj.isRemote) { - if (this.canProcess) { - if (energy.checkExtract) { - if (this.time == 0) { - this.time = this.MAX_TIME - } - if (this.time > 0) { - this.time -= 1 - if (this.time < 1) { - this.process - this.time = 0 - } - } else { - this.time = 0 - } - this.energy.extractEnergy(ENERGY, true) - } - } else { - this.time = 0 - } - if (this.ticks % 10 == 0) { - import scala.collection.JavaConversions._ - for (player <- this.getPlayersUsing) { - PacketDispatcher.sendPacketToPlayer(getDescriptionPacket, player.asInstanceOf[Player]) - } - } - } else if (this.time > 0) { - if (this.ticks % 600 == 0) { - this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, Reference.PREFIX + "assembler", 0.7f, 1f) - } - this.rotationYaw1 += 3 - this.rotationYaw2 += 2 - this.rotationYaw3 += 1 - var itemStack: ItemStack = this.getStackInSlot(6) - if (itemStack != null) { - itemStack = itemStack.copy - itemStack.stackSize = 1 - if (this.entityItem == null) { - this.entityItem = new EntityItem(this.worldObj, 0, 0, 0, itemStack) - } else if (!itemStack.isItemEqual(this.entityItem.getEntityItem)) { - this.entityItem = new EntityItem(this.worldObj, 0, 0, 0, itemStack) - } - this.entityItem.age += 1 - } else { - this.entityItem = null - } - } - } - - override def onReceiveEnergy(from: ForgeDirection, receive: Long, doReceive: Boolean): Long = - { - if (this.canProcess) { - return super.onReceiveEnergy(from, receive, doReceive) - } - return 0 - } - - def onReceivePacket(data: ByteArrayDataInput, player: EntityPlayer, extra: AnyRef*) { - try { - this.time = data.readInt - val itemID: Int = data.readInt - val itemAmount: Int = data.readInt - val itemMeta: Int = data.readInt - if (itemID != -1 && itemAmount != -1 && itemMeta != -1) { - this.setInventorySlotContents(6, new ItemStack(Item.itemsList(itemID), itemAmount, itemMeta)) - } - } catch { - case e: Exception => - { - e.printStackTrace - } - } - } - - override def getDescriptionPacket: Packet = - { - if (this.getStackInSlot(6) != null) { - return ResonantInduction.PACKET_TILE.getPacket(this, Int.box(time), Int.box(getStackInSlot(6).itemID), Int.box(getStackInSlot(6).stackSize), Int.box(getStackInSlot(6).getItemDamage)) - } - return ResonantInduction.PACKET_TILE.getPacket(this, Int.box(time), Int.box(-1), Int.box(-1), Int.box(-1)) - } - - override def openChest { - if (!this.worldObj.isRemote) { - import scala.collection.JavaConversions._ - for (player <- this.getPlayersUsing) { - PacketDispatcher.sendPacketToPlayer(getDescriptionPacket, player.asInstanceOf[Player]) - } - } - } - - def canProcess: Boolean = - { - if (getStackInSlot(6) != null) { - if (QuantumAssemblerRecipes.hasItemStack(getStackInSlot(6))) { - { - var i: Int = 0 - while (i < 6) { - { - if (getStackInSlot(i) == null) { - return false - } - if (getStackInSlot(i).itemID != Atomic.itemDarkMatter.itemID) { - return false - } - } - ({ - i += 1; - i - 1 - }) - } - } - return getStackInSlot(6).stackSize < 64 - } - } - return false - } - - /** - * Turn one item from the furnace source stack into the appropriate smelted item in the furnace - * result stack - */ - def process { - if (this.canProcess) { - { - var i: Int = 0 - while (i < 5) { - { - if (getStackInSlot(i) != null) { - decrStackSize(i, 1) - } - } - ({ - i += 1; - i - 1 - }) - } - } - if (getStackInSlot(6) != null) { - getStackInSlot(6).stackSize += 1 - } - } - } - - /** - * Reads a tile entity from NBT. - */ - override def readFromNBT(par1NBTTagCompound: NBTTagCompound) { - super.readFromNBT(par1NBTTagCompound) - this.time = par1NBTTagCompound.getInteger("smeltingTicks") - } - - /** - * Writes a tile entity to NBT. - */ - override def writeToNBT(par1NBTTagCompound: NBTTagCompound) { - super.writeToNBT(par1NBTTagCompound) - par1NBTTagCompound.setInteger("smeltingTicks", this.time) - } - - override def isItemValidForSlot(slotID: Int, itemStack: ItemStack): Boolean = - { - if (slotID == 6) { - return true - } - return itemStack.itemID == Atomic.itemDarkMatter.itemID - } - - def getVoltageInput(from: ForgeDirection): Long = - { - return 1000 - } - - def onWrongVoltage(direction: ForgeDirection, voltage: Long) { - } - -} \ No newline at end of file