More stuff ingame and showing up.

This commit is contained in:
Sebastian Hartte
2020-06-01 01:01:32 +02:00
parent 6a88728544
commit 077ff17078
864 changed files with 11515 additions and 11761 deletions
@@ -30,28 +30,31 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import appeng.api.definitions.IBlockDefinition;
import net.minecraftforge.fml.RegistryObject;
public class BlockDefinition extends ItemDefinition implements IBlockDefinition
{
private final Optional<Block> block;
private final RegistryObject<Block> block;
public BlockDefinition( String registryName, Block block, BlockItem item )
{
super( registryName, item );
this.block = Optional.ofNullable( block );
this.block = null; // FIXME // Optional.ofNullable( block );
}
@Override
public final Optional<Block> maybeBlock()
public final RegistryObject<Block> maybeBlock()
{
return this.block;
}
@Override
public Optional<BlockItem> maybeBlockItem()
public RegistryObject<BlockItem> maybeBlockItem()
{
return this.block.map( BlockItem::new );
// FIXME
return null;
// return this.block.map( BlockItem::new );
}
@Override