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-11-16 03:38:47 +01:00
parent 23bf10b0f6
commit 1a4bb2817d
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/cr0s/warpdrive/block/decoration/BlockAbstractLamp.java
View file

@ -58,12 +58,6 @@ public class BlockAbstractLamp extends BlockAbstractBase {
.withProperty(BlockProperties.FACING, EnumFacing.getFront(metadata & 7));
}
@Nonnull
@Override
public IBlockState getExtendedState(@Nonnull IBlockState blockState, IBlockAccess world, BlockPos blockPos) {
return blockState;
}
@Override
public int getMetaFromState(IBlockState blockState) {
return blockState.getValue(BlockProperties.FACING).getIndex();

2
src/main/java/cr0s/warpdrive/block/hull/BlockHullGlass.java
View file

@ -105,7 +105,7 @@ public class BlockHullGlass extends BlockColored implements IBlockBase, IDamageR
@SideOnly(Side.CLIENT)
@Override
public BlockRenderLayer getBlockLayer() {
return BlockRenderLayer.TRANSLUCENT; // .CUTOUT;
return BlockRenderLayer.TRANSLUCENT;
}
@SuppressWarnings("deprecation")

1
src/main/java/cr0s/warpdrive/block/hull/ItemBlockHullSlab.java
View file

@ -100,6 +100,7 @@ public class ItemBlockHullSlab extends ItemBlockHull {
final BlockPos blockPosSide = blockPos.offset(facing);
final IBlockState blockStateSide = world.getBlockState(blockPosSide);
final EnumVariant variantSide = blockStateSide.getBlock() == blockSlab ? blockStateSide.getValue(BlockHullSlab.VARIANT) : EnumVariant.PLAIN_FULL;
if ( blockStateSide.getBlock() == blockSlab
&& !variantItem.getIsDouble()
&& !variantSide.getIsDouble()

7
src/main/java/cr0s/warpdrive/client/ClientProxy.java
View file

@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.common.MinecraftForge;
public class ClientProxy extends CommonProxy {
@ -50,13 +49,15 @@ public class ClientProxy extends CommonProxy {
IModelInitialisation(WarpDrive.blockCloakingCore);
IModelInitialisation(WarpDrive.blockCloakingCoil);
IModelInitialisation(WarpDrive.blockTransporter);
IModelInitialisation(WarpDrive.blockBedrockGlass);
// if (WarpDriveConfig.isIndustrialCraft2Loaded) {
// IModelInitialisation(WarpDrive.blockIC2reactorLaserMonitor);
// }
// IModelInitialisation(WarpDrive.blockEnanReactorCore);
// IModelInitialisation(WarpDrive.blockEnanReactorLaser);
// IModelInitialisation(WarpDrive.blockEnergyBank);
IModelInitialisation(WarpDrive.blockEnergyBank);
IModelInitialisation(WarpDrive.blockAir);
// AirSource, AirFlow, AirShield
IModelInitialisation(WarpDrive.blockGas);
IModelInitialisation(WarpDrive.blockIridium);
IModelInitialisation(WarpDrive.blockLamp_bubble);
@ -91,7 +92,7 @@ public class ClientProxy extends CommonProxy {
IModelInitialisation(WarpDrive.blockHulls_plain[index][enumHullPlainType.ordinal()]);
}
IModelInitialisation(WarpDrive.blockHulls_glass[index]);
for (EnumDyeColor enumDyeColor : EnumDyeColor.values()) {
for (final EnumDyeColor enumDyeColor : EnumDyeColor.values()) {
IModelInitialisation(WarpDrive.blockHulls_stairs[index][enumDyeColor.getMetadata()]);
// IModelInitialisation(WarpDrive.blockHulls_slab[index][enumDyeColor.getMetadata()]);
// IModelInitialisation(WarpDrive.blockHulls_omnipanel[index][enumDyeColor.getMetadata()]);