Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."

This reverts commit be4f10b975.

# Conflicts:
#	src/main/java/techreborn/init/ModBlocks.java
This commit is contained in:
modmuss50 2016-08-10 00:29:47 +01:00
parent 91945c8dc9
commit 22fd152ec9
63 changed files with 2123 additions and 2154 deletions

View file

@ -1,12 +0,0 @@
package techreborn.tiles.transformers;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
public class TileEVTransformer extends TileTransformer {
public TileEVTransformer() {
super("EVTransformer", ModBlocks.evt, EnumPowerTier.EXTREME, 8192, 2048, 8192);
}
}

View file

@ -12,7 +12,7 @@ public class TileHVTransformer extends TileTransformer
public TileHVTransformer()
{
super("HVTransformer", ModBlocks.hvt, EnumPowerTier.HIGH, 2048, 512, 2048);
super("HVTransformer", ModBlocks.hvt, EnumPowerTier.EXTREME, ConfigTechReborn.HVTransformerMaxInput, ConfigTechReborn.HVTransformerMaxOutput, ConfigTechReborn.HVTransformerMaxInput*2);
}
}

View file

@ -10,8 +10,9 @@ import techreborn.init.ModBlocks;
public class TileLVTransformer extends TileTransformer
{
public TileLVTransformer() {
super("LVTransformer", ModBlocks.lvt, EnumPowerTier.MEDIUM, 128, 32, 128);
public TileLVTransformer()
{
super("LVTransformer", ModBlocks.lvt, EnumPowerTier.LOW, ConfigTechReborn.LVTransformerMaxInput, ConfigTechReborn.LVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput*2);
}
}

View file

@ -7,10 +7,29 @@ import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 16/03/2016.
*/
public class TileMVTransformer extends TileTransformer {
public class TileMVTransformer extends TileTransformer
{
public TileMVTransformer() {
super("MVTransformer", ModBlocks.mvt, EnumPowerTier.HIGH, 512, 128, 512);
}
public TileMVTransformer()
{
super("MVTransformer", ModBlocks.mvt, EnumPowerTier.HIGH, ConfigTechReborn.MVTransformerMaxInput, ConfigTechReborn.MVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput*2);
}
@Override
public double getMaxOutput()
{
return 128;
}
@Override
public double getMaxInput()
{
return 512;
}
@Override
public EnumPowerTier getTier()
{
return EnumPowerTier.HIGH;
}
}

View file

@ -7,105 +7,101 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.tile.TilePowerAcceptor;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.blocks.transformers.BlockTransformer;
/**
* Created by Rushmead
*
* @deprecated ? If wires limited to transfer rate and doesn't burn out, what's use of the transformers?
* TODO: Rewrite, find use or remove
*/
public class TileTransformer extends TilePowerAcceptor implements IWrenchable, ITickable {
@Deprecated
public class TileTransformer extends TilePowerAcceptor implements IWrenchable, ITickable
{
public String name;
public Block wrenchDrop;
public EnumPowerTier tier;
public int maxInput;
public int maxOutput;
public int maxStorage;
public String name;
public Block wrenchDrop;
public EnumPowerTier tier;
public int maxInput;
public int maxOutput;
public int maxStorage;
public TileTransformer(String name, Block wrenchDrop, EnumPowerTier tier, int maxInput, int maxOuput, int maxStorage) {
this.wrenchDrop = wrenchDrop;
this.tier = tier;
this.name = name;
this.maxInput = maxInput;
this.maxOutput = maxOuput;
this.maxStorage = maxStorage;
}
public TileTransformer(String name, Block wrenchDrop, EnumPowerTier tier, int maxInput, int maxOuput, int maxStorage)
{
super(1);
this.wrenchDrop = wrenchDrop;
this.tier = tier;
this.name = name;
this.maxInput = maxInput;
this.maxOutput = maxOuput;
this.maxStorage = maxStorage;
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer p0, EnumFacing p1) {
return true;
}
@Override public boolean wrenchCanSetFacing(EntityPlayer p0, EnumFacing p1)
{
return true;
}
@Override
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override public EnumFacing getFacing()
{
return getFacingEnum();
}
@Override
public void setFacing(EnumFacing facing) {
@Override public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
return entityPlayer.isSneaking();
}
}
@Override public float getWrenchDropRate()
{
return 1.0F;
}
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
return entityPlayer.isSneaking();
}
@Override public ItemStack getWrenchDrop(EntityPlayer p0)
{
return new ItemStack(wrenchDrop);
}
@Override
public float getWrenchDropRate() {
return 1.0F;
}
@Override public double getMaxPower()
{
return maxStorage;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer p0) {
return new ItemStack(wrenchDrop);
}
@Override public boolean canAcceptEnergy(EnumFacing direction)
{
@Override
public double getMaxPower() {
return maxStorage;
}
return getFacingEnum() != direction;
}
@Override
public boolean canAcceptEnergy(EnumFacing direction) {
@Override public EnumFacing getFacingEnum()
{
Block block = worldObj.getBlockState(pos).getBlock();
if (block instanceof BlockTransformer)
{
return ((BlockTransformer) block).getFacing(worldObj.getBlockState(pos));
}
return null;
}
return getFacingEnum() != direction;
}
@Override
public EnumFacing getFacingEnum() {
Block block = worldObj.getBlockState(pos).getBlock();
if (block instanceof BlockTransformer) {
return ((BlockTransformer) block).getFacing(worldObj.getBlockState(pos));
}
return null;
}
@Override
public boolean canProvideEnergy(EnumFacing direction) {
return getFacing() == direction;
}
@Override public boolean canProvideEnergy(EnumFacing direction)
{
return getFacing() == direction;
}
@Override
public double getMaxOutput() {
return maxOutput;
}
@Override public double getMaxOutput()
{
return maxOutput;
}
@Override
public double getMaxInput() {
return maxInput;
}
@Override
public EnumPowerTier getTier() {
return tier;
}
@Override
public void update() {
}
@Override public double getMaxInput()
{
return maxInput;
}
@Override public EnumPowerTier getTier()
{
return tier;
}
}