Revert "Revert a shit load of stuff"

This reverts commit d25bb23e8e.
This commit is contained in:
modmuss50 2016-07-01 15:55:37 +01:00
parent d25bb23e8e
commit 315c0aa509
327 changed files with 1686 additions and 2476 deletions

View file

@ -0,0 +1,135 @@
package techreborn.tiles.generator;
import reborncore.common.IWrenchable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
{
public static final int euTick = ConfigTechReborn.HeatGeneratorOutput;
public TileHeatGenerator()
{
super(1);
}
@Override
public void updateEntity()
{
super.updateEntity();
if (!worldObj.isRemote)
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ()))
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1))
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1))
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ()))
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ()))
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
}
}
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side)
{
return false;
}
@Override
public EnumFacing getFacing()
{
return getFacingEnum();
}
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
return entityPlayer.isSneaking();
}
@Override
public float getWrenchDropRate()
{
return 1.0F;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer)
{
return new ItemStack(ModBlocks.heatGenerator, 1);
}
public boolean isComplete()
{
return false;
}
@Override
public double getMaxPower()
{
return 10000;
}
@Override
public boolean canAcceptEnergy(EnumFacing direction)
{
return false;
}
@Override
public boolean canProvideEnergy(EnumFacing direction)
{
return true;
}
@Override
public double getMaxOutput()
{
return 64;
}
@Override
public double getMaxInput()
{
return 0;
}
@Override
public EnumPowerTier getTier()
{
return EnumPowerTier.LOW;
}
// @Override
// public void addWailaInfo(List<String> info)
// {
// super.addWailaInfo(info);
// info.add("Power Generarating " + euTick +" EU/t");
//
// }
}

View file

@ -21,7 +21,7 @@ import reborncore.common.util.Tank;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider
public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider
{
public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput;
@ -136,13 +136,13 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrencha
}
@Override
// TODO optimise this code
public void updateEntity()
{
super.updateEntity();
if (!worldObj.isRemote)
{
FluidUtils.drainContainers(this, inventory, 0, 1);
boolean didFindLava = false;
for (EnumFacing direction : EnumFacing.values())
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
@ -150,11 +150,22 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrencha
.getBlock() == Blocks.LAVA)
{
addEnergy(1);
didFindLava = true;
}
}
if (worldObj.getTotalWorldTime() % 40 == 0) {
if (worldObj.getTotalWorldTime() % 40 == 0)
{
BlockMachineBase bmb = (BlockMachineBase) worldObj.getBlockState(pos).getBlock();
boolean didFindLava = false;
for (EnumFacing direction : EnumFacing.values())
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(),
getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA)
{
didFindLava = true;
}
}
bmb.setActive(didFindLava, worldObj, pos);
}
}
@ -213,4 +224,4 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrencha
public Inventory getInventory() {
return inventory;
}
}
}