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

Re-implement slabs.

Browse Source
This commit is contained in:
eutropius225
2020-06-02 01:17:40 +01:00
committed by covers1624
parent 19cdea7eb5
commit 6b40fda793
50 changed files with 98 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+34 -51
View File
@@ -34,11 +34,14 @@ import appeng.decorative.AEDecorativeBlock;
import appeng.decorative.solid.*;
import appeng.tile.storage.TileSkyChest;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.RenderType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import static appeng.decorative.solid.BlockSkyStone.SkystoneType;
@@ -438,14 +441,37 @@ public final class ApiBlocks implements IBlocks
// .bootstrap( ( block, item ) -> (IPostInitComponent) side -> ( (BlockCableBus) block ).setupTile() )
// .build();
// this.skyStoneSlab = makeSlab( "sky_stone_slab", "sky_stone_double_slab", registry, this.skyStoneBlock() );
// this.smoothSkyStoneSlab = makeSlab( "smooth_sky_stone_slab", "smooth_sky_stone_double_slab", registry, this.smoothSkyStoneBlock() );
// this.skyStoneBrickSlab = makeSlab( "sky_stone_brick_slab", "sky_stone_brick_double_slab", registry, this.skyStoneBrick() );
// this.skyStoneSmallBrickSlab = makeSlab( "sky_stone_small_brick_slab", "sky_stone_small_brick_double_slab", registry, this.skyStoneSmallBrick() );
// this.fluixSlab = makeSlab( "fluix_slab", "fluix_double_slab", registry, this.fluixBlock() );
// this.quartzSlab = makeSlab( "quartz_slab", "quartz_double_slab", registry, this.quartzBlock() );
// this.chiseledQuartzSlab = makeSlab( "chiseled_quartz_slab", "chiseled_quartz_double_slab", registry, this.chiseledQuartzBlock() );
// this.quartzPillarSlab = makeSlab( "quartz_pillar_slab", "quartz_pillar_double_slab", registry, this.quartzPillar() );
Block.Properties skystoneSlabProperties = Block.Properties.create( Material.ROCK )
.hardnessAndResistance( 50, 150 );
this.skyStoneSlab = deco.block( "sky_stone_slab", () -> new SlabBlock( skystoneSlabProperties ) )
.addFeatures( AEFeature.SKY_STONE )
.build();
this.smoothSkyStoneSlab = deco.block( "smooth_sky_stone_slab", () -> new SlabBlock( skystoneSlabProperties ) )
.addFeatures( AEFeature.SKY_STONE )
.build();
this.skyStoneBrickSlab = deco.block( "sky_stone_brick_slab", () -> new SlabBlock( skystoneSlabProperties ) )
.addFeatures( AEFeature.SKY_STONE )
.build();
this.skyStoneSmallBrickSlab = deco.block( "sky_stone_small_brick_slab", () -> new SlabBlock( skystoneSlabProperties ) )
.addFeatures( AEFeature.SKY_STONE )
.build();
Block.Properties quartzSlabProperties = Block.Properties.create( Material.ROCK )
.hardnessAndResistance( 2.0F, 6.0F );
this.fluixSlab = deco.block( "fluix_slab", () -> new SlabBlock( quartzSlabProperties ) )
.addFeatures( AEFeature.FLUIX )
.build();
this.quartzSlab = deco.block( "quartz_slab", () -> new SlabBlock( quartzSlabProperties ) )
.addFeatures( AEFeature.CERTUS )
.build();
this.chiseledQuartzSlab = deco.block( "chiseled_quartz_slab", () -> new SlabBlock( quartzSlabProperties ) )
.addFeatures( AEFeature.CERTUS )
.build();
this.quartzPillarSlab = deco.block( "quartz_pillar_slab", () -> new SlabBlock( quartzSlabProperties ) )
.addFeatures( AEFeature.CERTUS )
.build();
// this.itemGen = registry.block( "debug_item_gen", BlockItemGen::new )
// .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE )
@@ -478,49 +504,6 @@ public final class ApiBlocks implements IBlocks
return new BlockQuartzOre(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5));
}
// FIXME redo slabs
// private static IBlockDefinition makeSlab( String slabId, String doubleSlabId, FeatureFactory registry, IBlockDefinition blockDef )
// {
// if( !blockDef.maybeBlock().isPresent() )
// {
// return new BlockDefinition( slabId, null, null );
// }
//
// Block block = blockDef.maybeBlock().get();
//
// IBlockDefinition slabDef = registry.block( slabId, () -> new BlockSlabCommon.Half( block ) )
// .features( AEFeature.DECORATIVE_BLOCKS )
// .disableItem()
// .build();
//
// if( !slabDef.maybeBlock().isPresent() )
// {
// return new BlockDefinition( slabId, null, null );
// }
//
// SlabBlock slabBlock = (SlabBlock) slabDef.maybeBlock().get();
//
// // Reigster the double slab variant as well
// IBlockDefinition doubleSlabDef = registry.block( doubleSlabId, () -> new CommonSlabBlock.Double( slabBlock, block ) )
// .features( AEFeature.DECORATIVE_BLOCKS )
// .disableItem()
// .build();
//
// Verify.verify( doubleSlabDef.maybeBlock().isPresent() );
//
// SlabBlock doubleSlabBlock = (SlabBlock) doubleSlabDef.maybeBlock().get();
//
// // Make the slab item
// IItemDefinition itemDef = registry.item( slabId, () -> new ItemSlab( slabBlock, slabBlock, doubleSlabBlock ) )
// .features( AEFeature.DECORATIVE_BLOCKS )
// .build();
//
// Verify.verify( itemDef.maybeItem().isPresent() );
//
// // Return a new composite block definition that combines the single slab block with the slab item
// return new BlockDefinition( slabId, slabBlock, (BlockItem) itemDef.maybeItem().get() );
// }
// private static IBlockDefinition makeStairs( String registryName, FeatureFactory registry, IBlockDefinition block )
// {
// return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
src/main/java/appeng/decorative/slab/CommonSlabBlock.java
-170
View File
@@ -1,170 +0,0 @@
package appeng.decorative.slab;
import java.util.Random;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.BlockStateContainer;
import net.minecraft.block.BlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.state.IProperty;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public abstract class CommonSlabBlock extends SlabBlock
{
private CommonSlabBlock( Block block )
{
super( block.getMaterial( block.getDefaultState() ) );
this.setHardness( block.getBlockHardness( block.getDefaultState(), null, null ) );
this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F );
BlockState BlockState = this.blockState.getBaseState();
if( !this.isDouble() )
{
BlockState = BlockState.with( HALF, BlockSlab.EnumBlockHalf.BOTTOM );
}
this.setDefaultState( BlockState.with( VARIANT, Variant.DEFAULT ) );
this.setCreativeTab( CreativeTabs.BUILDING_BLOCKS );
this.useNeighborBrightness = true;
}
/**
* Convert the given metadata into a BlockState for this Block
*/
@Override
public BlockState getStateFromMeta( int meta )
{
BlockState BlockState = this.getDefaultState().with( VARIANT, Variant.DEFAULT );
if( !this.isDouble() )
{
BlockState = BlockState.with( HALF, ( meta & 8 ) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP );
}
return BlockState;
}
/**
* Convert the BlockState into the correct metadata value
*/
@Override
public int getMetaFromState( BlockState state )
{
int i = 0;
if( !this.isDouble() && state.getValue( HALF ) == BlockSlab.EnumBlockHalf.TOP )
{
i |= 8;
}
return i;
}
@Override
protected BlockStateContainer createBlockState()
{
return this.isDouble() ? new BlockStateContainer( this, VARIANT ) : new BlockStateContainer( this, HALF, VARIANT );
}
@Override
@Nullable
public Item getItemDropped( BlockState state, Random rand, int fortune )
{
return Item.getItemFromBlock( this );
}
@Override
public ItemStack getItem( World worldIn, BlockPos pos, BlockState state )
{
return new ItemStack( this, 1, 0 );
}
@Override
public String getTranslationKey( int meta )
{
return this.getTranslationKey();
}
@Override
public IProperty<?> getVariantProperty()
{
return VARIANT;
}
@Override
public Comparable<?> getTypeForItem( ItemStack stack )
{
return Variant.DEFAULT;
}
public static class Double extends CommonSlabBlock
{
private final Block halfSlabBlock;
public Double( Block halfSlabBlock, Block block )
{
super( block );
this.halfSlabBlock = halfSlabBlock;
}
@Override
public boolean isDouble()
{
return true;
}
@Override
@Nullable
public Item getItemDropped( BlockState state, Random rand, int fortune )
{
return Item.getItemFromBlock( this.halfSlabBlock );
}
@Override
public ItemStack getItem( World worldIn, BlockPos pos, BlockState state )
{
return new ItemStack( this.halfSlabBlock, 1, 0 );
}
}
public static class Half extends CommonSlabBlock
{
public Half( Block block )
{
super( block );
}
@Override
public boolean isDouble()
{
return false;
}
}
public enum Variant implements IStringSerializable
{
DEFAULT;
@Override
public String getName()
{
return "default";
}
}
}