tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Quantum Gate teleporting now works

Browse source
This commit is contained in:
Calclavia 2014-03-10 03:40:57 +08:00
parent a14d9b9dc2
commit ded5f53816
5 changed files with 99 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrical/src/main/java/resonantinduction/electrical/MultipartElectrical.java
View file

@ -24,7 +24,7 @@ public class MultipartElectrical implements IPartFactory
{
MultiPartRegistry.registerParts(this, PART_TYPES);
MultipartGenerator.registerPassThroughInterface("universalelectricity.api.electricity.IVoltageOutput");
MultipartGenerator.registerTrait("icbm.api.IBlockFrequency", "resonantinduction.quantum.gate.TraitFrequency");
MultipartGenerator.registerTrait("resonantinduction.quantum.gate.IQuantumGate", "resonantinduction.quantum.gate.TraitQuantumGate");
MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "resonantinduction.electrical.wire.trait.TraitConductor");
MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "resonantinduction.electrical.wire.trait.TraitEnergyHandler");
MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.electrical.wire.trait.TraitEnergySink");

15
electrical/src/main/java/resonantinduction/quantum/gate/IQuantumGate.java Normal file
View file

@ -0,0 +1,15 @@
package resonantinduction.quantum.gate;
import net.minecraft.entity.Entity;
import icbm.api.IBlockFrequency;
/**
* Only TileEntities should implement this.
*
* @author Calclavia
*
*/
public interface IQuantumGate extends IBlockFrequency
{
public void transport(Entity entity);
}

73
electrical/src/main/java/resonantinduction/quantum/gate/PartQuantumGlyph.java
View file

@ -5,13 +5,18 @@ import icbm.api.IBlockFrequency;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import mffs.api.fortron.FrequencyGrid;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import resonantinduction.core.ResonantInduction;
import resonantinduction.electrical.Electrical;
import universalelectricity.api.vector.VectorWorld;
import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput;
import codechicken.lib.vec.Cuboid6;
@ -21,7 +26,7 @@ import codechicken.multipart.JNormalOcclusion;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PartQuantumGlyph extends JCuboidPart implements JNormalOcclusion, IBlockFrequency
public class PartQuantumGlyph extends JCuboidPart implements JNormalOcclusion, IQuantumGate
{
public static final int MAX_GLYPH = 4;
static final Cuboid6[] bounds = new Cuboid6[8];
@ -48,6 +53,52 @@ public class PartQuantumGlyph extends JCuboidPart implements JNormalOcclusion, I
this.number = (byte) itemDamage;
}
@Override
public void onWorldJoin()
{
if (((IQuantumGate) tile()).getFrequency() != -1)
FrequencyGrid.instance().register((IQuantumGate) tile());
}
@Override
public void onWorldSeparate()
{
FrequencyGrid.instance().unregister((IQuantumGate) tile());
}
@Override
public void onEntityCollision(Entity entity)
{
transport(entity);
}
@Override
public void transport(Entity entity)
{
if (((IQuantumGate) tile()).getFrequency() != -1)
{
Set<IBlockFrequency> frequencyBlocks = FrequencyGrid.instance().get(((IQuantumGate) tile()).getFrequency());
List<IQuantumGate> gates = new ArrayList<IQuantumGate>();
for (IBlockFrequency frequencyBlock : frequencyBlocks)
{
if (frequencyBlock instanceof IQuantumGate)
{
gates.add((IQuantumGate) frequencyBlock);
}
}
gates.remove((IQuantumGate) tile());
if (gates.size() > 0)
{
IQuantumGate gate = gates.get(gates.size() > 1 ? entity.worldObj.rand.nextInt(gates.size() - 1) : 0);
VectorWorld position = new VectorWorld((TileEntity) gate).translate(0.5, 2, 0.5);
QuantumGateManager.moveEntity(entity, position);
}
}
}
@Override
public void update()
{
@ -57,9 +108,10 @@ public class PartQuantumGlyph extends JCuboidPart implements JNormalOcclusion, I
if (frequency > 0)
{
float deviation = 1;
// Spawn particle effects.
universalelectricity.api.vector.Vector3 center = new universalelectricity.api.vector.Vector3(x() + 0.5, y() + 0.5, z() + 0.5);
Electrical.proxy.renderElectricShock(world(), center, center.clone().translate(Math.random() * 1 - 0.5, Math.random() * 1 - 0.5, Math.random() * 1 - 0.5));
Electrical.proxy.renderElectricShock(world(), center, center.clone().translate(Math.random() * deviation - deviation / 2, Math.random() * deviation - deviation / 2, Math.random() * deviation - deviation / 2));
}
}
}
@ -69,15 +121,22 @@ public class PartQuantumGlyph extends JCuboidPart implements JNormalOcclusion, I
{
if (!world().isRemote)
{
int frequency = ((IBlockFrequency) tile()).getFrequency();
if (frequency > -1)
if (player.isSneaking())
{
player.addChatMessage("Quantum Gate Frequency: " + frequency);
transport(player);
}
else
{
player.addChatMessage("Quantum Gate not set up.");
int frequency = ((IBlockFrequency) tile()).getFrequency();
if (frequency > -1)
{
player.addChatMessage("Quantum Gate Frequency: " + frequency);
}
else
{
player.addChatMessage("Quantum Gate not set up.");
}
}
}

1
electrical/src/main/java/resonantinduction/quantum/gate/QuantumGateManager.java
View file

@ -91,6 +91,7 @@ public class QuantumGateManager
if (entity != null && location != null)
{
location.world.markBlockForUpdate((int) location.x, (int) location.y, (int) location.z);
if (entity instanceof EntityPlayerMP)
{
if (coolDown.get(((EntityPlayerMP) entity).username) == null || (System.currentTimeMillis() - coolDown.get(((EntityPlayerMP) entity).username) > 30))

22
electrical/src/main/java/resonantinduction/quantum/gate/TraitFrequency.java → electrical/src/main/java/resonantinduction/quantum/gate/TraitQuantumGate.java
View file

@ -2,16 +2,26 @@ package resonantinduction.quantum.gate;
import icbm.api.IBlockFrequency;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import net.minecraft.block.Block;
import scala.collection.Seq;
import universalelectricity.api.vector.Vector3;
import mffs.api.fortron.FrequencyGrid;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.api.vector.VectorWorld;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
public class TraitFrequency extends TileMultipart implements IBlockFrequency
public class TraitQuantumGate extends TileMultipart implements IQuantumGate
{
@Override
public void transport(Entity entity)
{
}
@Override
public int getFrequency()
{
@ -29,7 +39,7 @@ public class TraitFrequency extends TileMultipart implements IBlockFrequency
}
if (i >= 8)
return frequency;
return -1;
}