03f9436ef9
If a feature dependency of ItemMultiMaterial was disabled, the returned value was never assigned with the constructed. Pulling out the construction and setting it before checking it, prevents the NPE and also matches the behaviour in ItemMultiPart, where parts are constructed, but never registered.
55 lines
1.6 KiB
Java
55 lines
1.6 KiB
Java
/*
|
|
* This file is part of Applied Energistics 2.
|
|
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
|
|
*
|
|
* Applied Energistics 2 is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Applied Energistics 2 is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
|
|
*/
|
|
|
|
package appeng.core.features;
|
|
|
|
|
|
import net.minecraft.tileentity.TileEntity;
|
|
|
|
import com.google.common.base.Optional;
|
|
import com.google.common.base.Preconditions;
|
|
|
|
import appeng.api.definitions.ITileDefinition;
|
|
import appeng.block.AEBaseBlock;
|
|
|
|
|
|
public final class TileDefinition extends BlockDefinition implements ITileDefinition
|
|
{
|
|
private final AEBaseBlock block;
|
|
|
|
public TileDefinition( AEBaseBlock block, ActivityState state )
|
|
{
|
|
super( block, state );
|
|
|
|
Preconditions.checkNotNull( block );
|
|
Preconditions.checkNotNull( state );
|
|
|
|
Preconditions.checkState( !block.hasBlockTileEntity() || block.getTileEntityClass() != null );
|
|
|
|
this.block = block;
|
|
}
|
|
|
|
@Override
|
|
public Optional<? extends Class<? extends TileEntity>> maybeEntity()
|
|
{
|
|
final Class<? extends TileEntity> entity = this.block.getTileEntityClass();
|
|
|
|
return Optional.of( entity );
|
|
}
|
|
}
|