Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed register EnergyTileLoadEvent multiple times

Browse source
This commit is contained in:
Calclavia 2013-12-24 16:18:16 +08:00
parent 5164f86590
commit 6df2b0421f
4 changed files with 47 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/resonantinduction/base/PartAdvanced.java
View file

@ -11,12 +11,12 @@ public abstract class PartAdvanced extends TMultiPart
@Override
public void update()
{
if(ticks == 0)
if (ticks == 0)
{
initiate();
}
if(ticks >= Long.MAX_VALUE)
if (ticks >= Long.MAX_VALUE)
{
ticks = 1;
}
@ -24,14 +24,10 @@ public abstract class PartAdvanced extends TMultiPart
ticks++;
}
@Override
public void onAdded()
{
world().notifyBlocksOfNeighborChange(x(), y(), z(), ((Block)MultipartProxy.block()).blockID);
}
/**
* Called on the TileEntity's first tick.
*/
public void initiate() {}
public void initiate()
{
}
}

4
src/resonantinduction/gui/GuiMultimeter.java
View file

@ -92,8 +92,8 @@ public class GuiMultimeter extends GuiContainerBase
protected void drawGuiContainerBackgroundLayer(float f, int x, int y)
{
super.drawGuiContainerBackgroundLayer(f, x, y);
int length = Math.min((int) (this.multimeter.getDetectedEnergy() / this.multimeter.getPeak()) * 115, 115);
this.drawTexturedModalRect(this.containerWidth + 14, this.containerHeight + 126 - length, 176, 115 - length, 6, length);
/*int length = Math.min((int) (this.multimeter.getDetectedEnergy() / this.multimeter.getPeak()) * 115, 115);
this.drawTexturedModalRect(this.containerWidth + 14, this.containerHeight + 126 - length, 176, 115 - length, 6, length);*/
}
@Override

4
src/resonantinduction/multimeter/PartMultimeter.java
View file

@ -226,12 +226,12 @@ public class PartMultimeter extends JCuboidPart implements TFacePart, JNormalOcc
peakDetection = Math.max(peakDetection, detectedEnergy);
}
public float getDetectedEnergy()
public long getDetectedEnergy()
{
return detectedEnergy;
}
public float getAverageDetectedEnergy()
public long getAverageDetectedEnergy()
{
return detectedAverageEnergy;
}

41
src/resonantinduction/wire/part/PartConductor.java
View file

@ -1,5 +1,6 @@
package resonantinduction.wire.part;
import codechicken.multipart.TMultiPart;
import ic2.api.energy.event.EnergyTileLoadEvent;
import ic2.api.energy.event.EnergyTileUnloadEvent;
import ic2.api.energy.tile.IEnergyTile;
@ -115,7 +116,24 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
{
if (tile() instanceof IEnergyTile && !world().isRemote)
{
MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) tile()));
// Check if there's another part that's an IEnergyTile
boolean foundAnotherPart = false;
for (int i = 0; i < tile().partList().size(); i++)
{
TMultiPart part = tile().partMap(i);
if (part instanceof IEnergyTile)
{
foundAnotherPart = true;
break;
}
}
if (!foundAnotherPart)
{
MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) tile()));
}
}
}
@ -125,10 +143,27 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
if (!world().isRemote)
{
this.getNetwork().split(this);
if (tile() instanceof IEnergyTile)
{
MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) tile()));
// Check if there's another part that's an IEnergyTile
boolean foundAnotherPart = false;
for (int i = 0; i < tile().partList().size(); i++)
{
TMultiPart part = tile().partMap(i);
if (part instanceof IEnergyTile)
{
foundAnotherPart = true;
break;
}
}
if (!foundAnotherPart)
{
MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) tile()));
}
}
}