Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
LemADEC 2017-12-02 13:23:55 +01:00
parent b37e453ac4
commit f911304c6e
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/cr0s/warpdrive/block/BlockAbstractBase.java
View file

@ -12,6 +12,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -48,8 +49,25 @@ public abstract class BlockAbstractBase extends Block implements IBlockBase {
@SideOnly(Side.CLIENT)
@Override
public void modelInitialisation() {
Item item = Item.getItemFromBlock(this);
final Item item = Item.getItemFromBlock(this);
ClientProxy.modelInitialisation(item);
// Force a single model through through a custom state mapper
/*
final StateMapperBase stateMapperBase = new StateMapperBase() {
@Nonnull
@Override
protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState blockState) {
return modelResourceLocation;
}
};
ModelLoader.setCustomStateMapper(this, stateMapperBase);
/**/
// Bind our TESR to our tile entity
/*
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityXXXX.class, new TileEntityXXXRenderer());
/**/
}
@Override

35
src/main/java/cr0s/warpdrive/block/forcefield/BlockForceFieldProjector.java
View file

@ -90,14 +90,23 @@ public class BlockForceFieldProjector extends BlockAbstractForceField {
.withProperty(IS_DOUBLE_SIDED, metadata > 7);
}
@Override
public int getMetaFromState(IBlockState blockState) {
return blockState.getValue(BlockProperties.FACING).getIndex()
+ (blockState.getValue(IS_DOUBLE_SIDED) ? 8 : 0);
}
@Nonnull
@Override
public IBlockState getExtendedState(@Nonnull IBlockState blockState, IBlockAccess world, BlockPos blockPos) {
TileEntity tileEntity = world.getTileEntity(blockPos);
public IBlockState getExtendedState(@Nonnull IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos) {
if (!(blockState instanceof IExtendedBlockState)) {
return blockState;
}
final TileEntity tileEntity = blockAccess.getTileEntity(blockPos);
EnumForceFieldShape forceFieldShape = EnumForceFieldShape.NONE;
EnumForceFieldState forceFieldState = EnumForceFieldState.NOT_CONNECTED;
if (tileEntity instanceof TileEntityForceFieldProjector) {
TileEntityForceFieldProjector tileEntityForceFieldProjector = (TileEntityForceFieldProjector) tileEntity;
final TileEntityForceFieldProjector tileEntityForceFieldProjector = (TileEntityForceFieldProjector) tileEntity;
forceFieldShape = tileEntityForceFieldProjector.getShape();
forceFieldState = tileEntityForceFieldProjector.getState();
}
@ -107,28 +116,12 @@ public class BlockForceFieldProjector extends BlockAbstractForceField {
.withProperty(STATE, forceFieldState);
}
@Override
public int getMetaFromState(IBlockState blockState) {
return blockState.getValue(BlockProperties.FACING).getIndex()
+ (blockState.getValue(IS_DOUBLE_SIDED) ? 8 : 0);
}
@SideOnly(Side.CLIENT)
@Override
public void modelInitialisation() {
Item item = Item.getItemFromBlock(this);
final Item item = Item.getItemFromBlock(this);
ClientProxy.modelInitialisation(item);
/*
// Force a single model through through a custom state mapper
StateMapperBase stateMapperBase = new StateMapperBase() {
@Nonnull
@Override
protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState iBlockState) {
return ForceFieldProjectorBakedModel.MODEL_RESOURCE_LOCATION;
}
};
ModelLoader.setCustomStateMapper(this, stateMapperBase);
/**/
// Bind our TESR to our tile entity
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForceFieldProjector.class, new TileEntityForceFieldProjectorRenderer());
}

2
src/main/java/cr0s/warpdrive/data/EnumLiftMode.java
View file

@ -31,7 +31,7 @@ public enum EnumLiftMode implements IStringSerializable {
public static EnumLiftMode get(final int damage) {
return ID_MAP.get(damage);
}
public String getUnlocalizedName() {
return unlocalizedName;
}