Teslas are FIXED! :)
This commit is contained in:
parent
e44519dc7d
commit
cc46bebc43
7 changed files with 32 additions and 38 deletions
|
@ -1009,7 +1009,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
TELEPORTER(Mekanism.machineBlockID, 11, "Teleporter", 13, 5000000, TileEntityTeleporter.class, false),
|
||||
ELECTRIC_PUMP(Mekanism.machineBlockID, 12, "ElectricPump", 17, 10000, TileEntityElectricPump.class, true),
|
||||
ELECTRIC_CHEST(Mekanism.machineBlockID, 13, "ElectricChest", -1, 12000, TileEntityElectricChest.class, true),
|
||||
CHARGEPAD(Mekanism.machineBlockID, 14, "Chargepad", -1, 9000, TileEntityChargepad.class, true),
|
||||
CHARGEPAD(Mekanism.machineBlockID, 14, "Chargepad", -1, 10000, TileEntityChargepad.class, true),
|
||||
LOGISTICAL_SORTER(Mekanism.machineBlockID, 15, "LogisticalSorter", -1, 0, TileEntityLogisticalSorter.class, true);
|
||||
|
||||
public int typeId;
|
||||
|
|
|
@ -19,6 +19,7 @@ import mekanism.common.IActiveState;
|
|||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.PacketHandler.Transmission;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.network.PacketTileEntity;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
|
@ -45,7 +46,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct
|
|||
|
||||
public TileEntityChargepad()
|
||||
{
|
||||
super("Chargepad", 9000);
|
||||
super("Chargepad", MachineType.CHARGEPAD.baseEnergy);
|
||||
inventory = new ItemStack[0];
|
||||
}
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ import mekanism.api.transmitters.TransmissionType;
|
|||
import mekanism.common.EnergyNetwork;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.tileentity.TileEntityElectricBlock;
|
||||
import mekanism.induction.common.tileentity.TileEntityTesla;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import universalelectricity.core.block.IConductor;
|
||||
|
|
|
@ -29,7 +29,6 @@ public class InductionCommonProxy implements IGuiHandler
|
|||
{
|
||||
Mekanism.configuration.load();
|
||||
MekanismInduction.FURNACE_WATTAGE = (float)Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Furnace Wattage Per Tick", MekanismInduction.FURNACE_WATTAGE).getDouble(MekanismInduction.FURNACE_WATTAGE);
|
||||
MekanismInduction.SOUND_FXS = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Tesla Sound FXs", MekanismInduction.SOUND_FXS).getBoolean(MekanismInduction.SOUND_FXS);
|
||||
MekanismInduction.MAX_CONTRACTOR_DISTANCE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MekanismInduction.MAX_CONTRACTOR_DISTANCE).getInt(MekanismInduction.MAX_CONTRACTOR_DISTANCE);
|
||||
|
||||
TileEntityEMContractor.ACCELERATION = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", TileEntityEMContractor.ACCELERATION).getDouble(TileEntityEMContractor.ACCELERATION);
|
||||
|
|
|
@ -39,10 +39,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
|||
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
|
||||
public class MekanismInduction implements IModule
|
||||
{
|
||||
/**
|
||||
* Mod Information
|
||||
*/
|
||||
|
||||
public static final String MAJOR_VERSION = "@MAJOR@";
|
||||
public static final String MINOR_VERSION = "@MINOR@";
|
||||
public static final String REVISION_VERSION = "@REVIS@";
|
||||
|
@ -74,7 +70,6 @@ public class MekanismInduction implements IModule
|
|||
* Settings
|
||||
*/
|
||||
public static float FURNACE_WATTAGE = 10;
|
||||
public static boolean SOUND_FXS = true;
|
||||
|
||||
/** Block ID by Jyzarc */
|
||||
private static final int BLOCK_ID_PREFIX = 3200;
|
||||
|
|
|
@ -579,6 +579,7 @@ public class TileEntityEMContractor extends TileEntityAdvanced implements ITileN
|
|||
if(thread == null && linked != null && lastCalcTime <= 0)
|
||||
{
|
||||
pathfinder = null;
|
||||
|
||||
Vector3 start = new Vector3(this).modifyPositionFromSide(getFacing());
|
||||
Vector3 target = new Vector3(linked).modifyPositionFromSide(linked.getFacing());
|
||||
|
||||
|
|
|
@ -95,10 +95,6 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
*/
|
||||
if(isController())
|
||||
{
|
||||
if(!worldObj.isRemote)
|
||||
{
|
||||
System.out.println(getEnergy());
|
||||
}
|
||||
CableUtils.emit(this);
|
||||
|
||||
if(ticker % (5 + worldObj.rand.nextInt(2)) == 0 && ((worldObj.isRemote && doTransfer) || (getEnergy() > 0 && !worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord))))
|
||||
|
@ -123,20 +119,18 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
{
|
||||
transfer(((TileEntityTesla)transferTile), getMaxEnergy()-getEnergy());
|
||||
|
||||
if(zapCounter % 5 == 0 && MekanismInduction.SOUND_FXS)
|
||||
if(zapCounter % 5 == 0)
|
||||
{
|
||||
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "mekanism:etc/Shock", (float)getEnergy() / 25, 1.3f - 0.5f * (dyeID / 16f));
|
||||
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "mekanism:etc.Shock", (float)getEnergy() / 25000, 1.3f - 0.5f * (dyeID / 16f));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
MekanismInduction.proxy.renderElectricShock(worldObj, topTeslaVector.clone().translate(0.5), topTeslaVector.clone().translate(new Vector3(0.5, Double.POSITIVE_INFINITY, 0.5)), false);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
List<ITesla> transferTeslaCoils = new ArrayList<ITesla>();
|
||||
|
||||
for(ITesla tesla : TeslaGrid.instance().get())
|
||||
|
@ -199,9 +193,9 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
|
||||
for(ITesla tesla : transferTeslaCoils)
|
||||
{
|
||||
if(zapCounter % 5 == 0 && MekanismInduction.SOUND_FXS)
|
||||
if(zapCounter % 5 == 0)
|
||||
{
|
||||
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "mekanism:etc/Shock", (float)getEnergy() / 25, 1.3f - 0.5f * (dyeID / 16f));
|
||||
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "mekanism:etc.Shock", (float)getEnergy() / 25000, 1.3f - 0.5f * (dyeID / 16f));
|
||||
}
|
||||
|
||||
Vector3 targetVector = new Vector3((TileEntity)tesla);
|
||||
|
@ -213,6 +207,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
}
|
||||
|
||||
double distance = topTeslaVector.distance(targetVector);
|
||||
|
||||
MekanismInduction.proxy.renderElectricShock(worldObj, new Vector3(topTesla).translate(new Vector3(0.5)), targetVector.translate(new Vector3(0.5)), (float)MekanismInduction.DYE_COLORS[dyeID].x, (float)MekanismInduction.DYE_COLORS[dyeID].y,
|
||||
(float)MekanismInduction.DYE_COLORS[dyeID].z);
|
||||
|
||||
|
@ -262,7 +257,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
|
||||
private void transfer(ITesla tesla, double transferEnergy)
|
||||
{
|
||||
transfer(-tesla.transfer(transferEnergy * (1 - (worldObj.rand.nextFloat() * 0.1f)), true), true);
|
||||
transfer(-tesla.transfer(transferEnergy, true), true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -311,20 +306,21 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
}
|
||||
|
||||
@Override
|
||||
public void handlePacketData(ByteArrayDataInput input)
|
||||
public void handlePacketData(ByteArrayDataInput dataStream)
|
||||
{
|
||||
super.handlePacketData(input);
|
||||
super.handlePacketData(dataStream);
|
||||
|
||||
switch(input.readByte())
|
||||
switch(dataStream.readByte())
|
||||
{
|
||||
case 1:
|
||||
dyeID = input.readInt();
|
||||
canReceive = input.readBoolean();
|
||||
attackEntities = input.readBoolean();
|
||||
isLinkedClient = input.readBoolean();
|
||||
dyeID = dataStream.readInt();
|
||||
canReceive = dataStream.readBoolean();
|
||||
attackEntities = dataStream.readBoolean();
|
||||
isLinkedClient = dataStream.readBoolean();
|
||||
break;
|
||||
case 2:
|
||||
doTransfer = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -354,8 +350,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
sendPacket(1);
|
||||
return transferEnergy;
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
if(getEnergy() > 0)
|
||||
{
|
||||
transferEnergy += getEnergy();
|
||||
|
@ -384,8 +379,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
{
|
||||
worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 2, 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 3);
|
||||
}
|
||||
}
|
||||
|
@ -415,8 +409,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
connectedTeslas.add((TileEntityTesla)t);
|
||||
returnTile = (TileEntityTesla)t;
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -450,8 +443,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
{
|
||||
returnTile = (TileEntityTesla)t;
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -481,8 +473,7 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
connectedTeslas.add((TileEntityTesla)t);
|
||||
y++;
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -599,6 +590,12 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getMaxOutput()
|
||||
{
|
||||
return TRANSFER_CAP;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ForgeDirection getOutputtingSide()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue