fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted glass blocks that used ibaked

Browse Source 
Reverted glass blocks that used ibaked.
This commit is contained in:
elix-x
2016-08-20 11:54:07 +02:00
parent d7f32a985d
commit 0c4cb295f3
29 changed files with 10 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/decorative/solid/BlockQuartzGlass.java
+4 -45
View File
@@ -22,29 +22,19 @@ package appeng.decorative.solid;
import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import appeng.block.AEBaseBlock;
import appeng.block.IHasSpecialItemModel;
import appeng.core.features.AEFeature;
import appeng.helpers.AEGlassMaterial;
public class BlockQuartzGlass extends AEBaseBlock implements IHasSpecialItemModel
public class BlockQuartzGlass extends AEBaseBlock
{
// This unlisted property is used to determine the actual block that should be rendered
public static final UnlistedGlassStateProperty GLASS_STATE = new UnlistedGlassStateProperty();
public BlockQuartzGlass()
{
super( Material.GLASS );
@@ -53,35 +43,6 @@ public class BlockQuartzGlass extends AEBaseBlock implements IHasSpecialItemMode
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
}
@Override
protected BlockStateContainer createBlockState()
{
IProperty[] listedProperties = new IProperty[0];
IUnlistedProperty[] unlistedProperties = new IUnlistedProperty[] { GLASS_STATE };
return new ExtendedBlockState( this, listedProperties, unlistedProperties );
}
@Override
public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
{
EnumSet<EnumFacing> flushWith = EnumSet.noneOf( EnumFacing.class );
// Test every direction for another glass block
for( EnumFacing facing : EnumFacing.values() )
{
if( isGlassBlock( world, pos, facing ) )
{
flushWith.add( facing );
}
}
GlassState glassState = new GlassState( pos.getX(), pos.getY(), pos.getZ(), flushWith );
IExtendedBlockState extState = (IExtendedBlockState) state;
return extState.withProperty( GLASS_STATE, glassState );
}
private static boolean isGlassBlock( IBlockAccess world, BlockPos pos, EnumFacing facing )
{
return world.getBlockState( pos.offset( facing ) ).getBlock() instanceof BlockQuartzGlass;
@@ -96,12 +57,10 @@ public class BlockQuartzGlass extends AEBaseBlock implements IHasSpecialItemMode
@Override
public boolean shouldSideBeRendered( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side )
{
BlockPos adjacentPos = pos.offset( side );
final Material mat = w.getBlockState( adjacentPos ).getBlock().getMaterial( state );
final Material mat = w.getBlockState( pos ).getBlock().getMaterial( state );
if( mat == Material.GLASS || mat == AEGlassMaterial.INSTANCE )
{
if( w.getBlockState( adjacentPos ).getBlock().getRenderType( state ) == this.getRenderType( state ) )
if( w.getBlockState( pos ).getBlock().getRenderType( state ) == this.getRenderType( state ) )
{
return false;
}
@@ -115,4 +74,4 @@ public class BlockQuartzGlass extends AEBaseBlock implements IHasSpecialItemMode
return false;
}
}
}
src/main/java/appeng/decorative/solid/GlassState.java
-67
View File
@@ -1,67 +0,0 @@
/*
* 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.decorative.solid;
import java.util.EnumSet;
import net.minecraft.util.EnumFacing;
/**
* Immutable (and thus thread-safe) class that encapsulates the rendering state required for a connected texture
* glass block.
*/
public final class GlassState
{
private final int x;
private final int y;
private final int z;
private final EnumSet<EnumFacing> flushWith = EnumSet.noneOf( EnumFacing.class );
public GlassState( int x, int y, int z, EnumSet<EnumFacing> flushWith )
{
this.x = x;
this.y = y;
this.z = z;
this.flushWith.addAll( flushWith );
}
public int getX()
{
return x;
}
public int getY()
{
return y;
}
public int getZ()
{
return z;
}
public boolean isFlushWith( EnumFacing side )
{
return flushWith.contains( side );
}
}
src/main/java/appeng/decorative/solid/UnlistedGlassStateProperty.java
-54
View File
@@ -1,54 +0,0 @@
/*
* 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.decorative.solid;
import net.minecraftforge.common.property.IUnlistedProperty;
/**
* This unlisted property is used to transport the connected texture state into our model class.
*/
public class UnlistedGlassStateProperty implements IUnlistedProperty<GlassState>
{
@Override
public String getName()
{
return "glass_state";
}
@Override
public boolean isValid( GlassState value )
{
return true;
}
@Override
public Class<GlassState> getType()
{
return GlassState.class;
}
@Override
public String valueToString( GlassState value )
{
return null;
}
}