Merge pull request #2221 from halvors/development

Cleanup, cleared some warnings.
This commit is contained in:
Aidan 2015-03-18 08:55:37 -04:00
commit 12b6b4610b
13 changed files with 28 additions and 0 deletions

View file

@ -224,6 +224,8 @@ public class ItemBalloon extends ItemMekanism
case EAST:
pos.translate(0.5, -1, 0);
break;
default:
break;
}
if(!source.getWorld().isRemote)

View file

@ -125,6 +125,8 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
fluidStack = (FluidStack)data[0];
didFluidTransfer = (Boolean)data[1];
break;
default:
break;
}
}
@ -153,6 +155,8 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
dataStream.writeInt(fluidStack != null ? fluidStack.amount : 0);
dataStream.writeBoolean(didFluidTransfer);
break;
default:
break;
}
}

View file

@ -222,6 +222,8 @@ public abstract class TileEntityBasicMachine<INPUT extends MachineInput<INPUT>,
case ENERGY: //and SPEED fall-through.
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -479,6 +479,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock
case ENERGY:
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -468,6 +468,8 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri
case ENERGY:
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -535,6 +535,8 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
{
case ENERGY:
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -390,6 +390,8 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp
case ENERGY:
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -636,6 +636,8 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
{
case ENERGY:
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -1474,6 +1474,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
case ENERGY:
energyUsage = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}
}

View file

@ -711,6 +711,8 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
{
case ENERGY:
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}

View file

@ -1038,6 +1038,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
case ENERGY:
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}
}

View file

@ -529,6 +529,8 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
case ENERGY:
energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}
}

View file

@ -646,6 +646,8 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
{
case ENERGY:
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
default:
break;
}
}